OAK-11371: Remove usage of Guava UnsignedBytes.compare() (#1976)

Author: reschke

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

@@ -31,6 +31,7 @@
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -59,7 +60,6 @@
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.jackrabbit.guava.common.io.Closeables;
-import org.apache.jackrabbit.guava.common.io.Files;
 import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFutureTask;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.LineIterator;
@@ -514,7 +514,7 @@ protected long sweep(GarbageCollectorFileState fs, long markStart, boolean force
         long deletedSize = 0;
         int numDeletedSizeAvailable = 0;
         try {
-            removesWriter = Files.newWriter(fs.getGarbage(), StandardCharsets.UTF_8);
+            removesWriter = new BufferedWriter(new FileWriter(fs.getGarbage(), StandardCharsets.UTF_8));
             ArrayDeque<String> removesQueue = new ArrayDeque<String>();
             iterator =
                     FileUtils.lineIterator(fs.getGcCandidates(), StandardCharsets.UTF_8.name());
@@ -622,7 +622,7 @@ static void saveBatchToFile(List<String> ids, BufferedWriter writer) throws IOEx
      * @param logPath whether to log path in the file or not
      */
     protected void iterateNodeTree(GarbageCollectorFileState fs, final boolean logPath) throws IOException {
-        final BufferedWriter writer = Files.newWriter(fs.getMarkedRefs(), StandardCharsets.UTF_8);
+        final BufferedWriter writer = new BufferedWriter(new FileWriter(fs.getMarkedRefs(), StandardCharsets.UTF_8));
         final AtomicInteger count = new AtomicInteger();
         try {
             marker.collectReferences(

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java

@@ -21,6 +21,7 @@
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -49,7 +50,6 @@
 
 import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
 import static org.apache.jackrabbit.guava.common.io.Files.move;
-import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
 import static java.io.File.createTempFile;
 import static java.lang.System.currentTimeMillis;
 import static java.util.Collections.emptyIterator;
@@ -673,7 +673,7 @@ private synchronized void nextGeneration() throws IOException {
             close();
 
             processFile = new File(rootDir, prefix + IN_PROCESS.getFileNameSuffix());
-            writer = newWriter(processFile, StandardCharsets.UTF_8);
+            writer = new BufferedWriter(new FileWriter(processFile, StandardCharsets.UTF_8));
             LOG.info("Created new process file and writer over {} ", processFile.getAbsolutePath());
         }
 

oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java

@@ -20,6 +20,7 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -719,7 +720,7 @@ private void createUpgradeLoad(File home, File pendingUploadFile) throws IOExcep
     private void createGibberishLoad(File home, File pendingUploadFile) throws IOException {
         BufferedWriter writer = null;
         try {
-            writer = Files.newWriter(pendingUploadFile, StandardCharsets.UTF_8);
+            writer = new BufferedWriter(new FileWriter(pendingUploadFile, StandardCharsets.UTF_8));
             FileIOUtils.writeAsLine(writer, "jerhgiuheirghoeoorqehgsjlwjpfkkwpkf", false);
         } finally {
             Closeables.close(writer, true);

oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java

@@ -25,7 +25,6 @@
 import static org.apache.jackrabbit.guava.common.io.FileWriteMode.APPEND;
 import static org.apache.jackrabbit.guava.common.io.Files.asByteSink;
 import static org.apache.jackrabbit.guava.common.io.Files.move;
-import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
 import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
 import static org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
 import static org.apache.jackrabbit.oak.commons.sort.ExternalSort.mergeSortedFiles;
@@ -35,6 +34,7 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -232,7 +232,7 @@ public static int writeStrings(Iterator<String> iterator, File f, boolean escape
      */
     public static int writeStrings(Iterator<String> iterator, File f, boolean escape,
         @NotNull Function<String, String> transformer, @Nullable Logger logger, @Nullable String message) throws IOException {
-        BufferedWriter writer = newWriter(f, UTF_8);
+        BufferedWriter writer = new BufferedWriter(new FileWriter(f, UTF_8));
         boolean threw = true;
 
         int count = 0;

oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java

@@ -32,6 +32,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -488,7 +489,7 @@ public void customType() throws Exception {
 
         String testData = String.join("\n", transform(testLines, tl -> tl.line));
         File testFile = folder.newFile();
-        try (BufferedWriter bufferedWriter = Files.newWriter(testFile, charset)) {
+        try (BufferedWriter bufferedWriter = new BufferedWriter(new FileWriter(testFile, charset))) {
             bufferedWriter.write(testData);
         }
 

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java

@@ -22,6 +22,7 @@
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.ref.SoftReference;
 import java.nio.charset.StandardCharsets;
@@ -242,7 +243,7 @@ private void writeToFile(String fileName, Set<String> blobIds) throws IOExceptio
             return;
         }
         File file = new File(directory, fileName);
-        BufferedWriter bw = Files.newWriter(file, StandardCharsets.UTF_8);
+        BufferedWriter bw = new BufferedWriter(new FileWriter(file, StandardCharsets.UTF_8));
         for (String id : blobIds) {
             bw.write(id);
             bw.newLine();

oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -38,7 +39,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.jackrabbit.guava.common.io.Closeables;
-import org.apache.jackrabbit.guava.common.io.Files;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.io.filefilter.IOFileFilter;
@@ -217,7 +217,7 @@ public void purgeBlobsDeleted(long before, @NotNull GarbageCollectableBlobStore
             if (blobIdsTracked) {
                 try {
                     idTempDeleteFile = File.createTempFile("idTempDelete", null, rootDirectory);
-                    idTempDeleteWriter = Files.newWriter(idTempDeleteFile, StandardCharsets.UTF_8);
+                    idTempDeleteWriter = new BufferedWriter(new FileWriter(idTempDeleteFile, StandardCharsets.UTF_8));
                 } catch (Exception e) {
                     LOG.warn("Unable to open a writer to a temp file, will ignore tracker sync");
                     blobIdsTracked = false;

oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java

@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.exporter;
 
+import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -75,7 +76,7 @@ public void serialize(File dir) throws IOException {
             Validate.checkState(dir.mkdirs(), "Cannot create directory [%s]", dir.getAbsolutePath());
         }
         File file = new File(dir, getFileName());
-        try (Writer writer = Files.newWriter(file, StandardCharsets.UTF_8)){
+        try (Writer writer = new BufferedWriter(new FileWriter(file, StandardCharsets.UTF_8))) {
             serialize(writer, createBlobSerializer(dir));
         }
         closeSerializer();

oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileGenerator.java

@@ -19,14 +19,14 @@
 
 package org.apache.jackrabbit.oak.plugins.tika;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.jackrabbit.guava.common.collect.FluentIterable;
 import org.apache.jackrabbit.guava.common.io.Closer;
-import org.apache.jackrabbit.guava.common.io.Files;
-import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,8 +42,8 @@ public CSVFileGenerator(File outFile) {
     public void generate(FluentIterable<BinaryResource> binaries) throws IOException {
         Closer closer = Closer.create();
         int count = 0;
-        try{
-            CSVPrinter printer = new CSVPrinter(Files.newWriter(outFile, StandardCharsets.UTF_8),
+        try {
+            CSVPrinter printer = new CSVPrinter(new BufferedWriter(new FileWriter(outFile, StandardCharsets.UTF_8)),
                     CSVFileBinaryResourceProvider.FORMAT);
             closer.register(printer);
             for (BinaryResource br : binaries){

oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCheckCommand.java

@@ -32,6 +32,7 @@
 import java.io.BufferedWriter;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -48,7 +49,6 @@
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
 import org.apache.jackrabbit.guava.common.io.Closeables;
 import org.apache.jackrabbit.guava.common.io.Closer;
-import org.apache.jackrabbit.guava.common.io.Files;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
 import com.mongodb.MongoURI;
@@ -426,7 +426,7 @@ public String apply(@Nullable String input) {
 
     private static void retrieveBlobReferences(GarbageCollectableBlobStore blobStore, BlobReferenceRetriever marker,
         File marked, String dsType, boolean isVerbose) throws IOException {
-        final BufferedWriter writer = Files.newWriter(marked, StandardCharsets.UTF_8);
+        final BufferedWriter writer = new BufferedWriter(new FileWriter(marked, StandardCharsets.UTF_8));
         final AtomicInteger count = new AtomicInteger();
         boolean threw = true;
         try {
@@ -549,7 +549,7 @@ public void traverse(String ... paths) throws IOException {
             Stopwatch watch = createStarted();
 
             try {
-                writer = Files.newWriter(references, StandardCharsets.UTF_8);
+                writer = new BufferedWriter(new FileWriter(references, StandardCharsets.UTF_8));
                 if (paths.length == 0) {
                     traverseChildren(nodeStore.getRoot(), "/", writer, count);
                 } else {