OAK-11380: Remove usage of Guava Files.asByteSource - oak-upgrade (#1982)

Author: reschke

oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java

@@ -20,6 +20,7 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -35,7 +36,6 @@
 
 import javax.jcr.RepositoryException;
 
-import org.apache.jackrabbit.guava.common.io.Files;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
@@ -45,6 +45,7 @@
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStore;
 import org.apache.jackrabbit.core.data.DataStoreException;
+import org.apache.jackrabbit.guava.common.io.Files;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
 import org.apache.jackrabbit.oak.commons.conditions.Validate;
 import org.slf4j.Logger;
@@ -287,17 +288,13 @@ private void initializeDelegate(String homeDir) throws RepositoryException {
             File configFile = new File(delegateConfigFilePath);
             checkArgument(configFile.exists(), "Delegate DataStore config file %s does not exist", configFile.getAbsolutePath());
 
-            InputStream is = null;
-            try {
+            try (InputStream is = new FileInputStream(configFile)) {
                 Properties props = new Properties();
-                is = Files.asByteSource(configFile).openStream();
                 props.load(is);
                 PropertiesUtil.populate(delegate, propsToMap(props), false);
                 log.info("Configured the delegating DataStore via {}", configFile.getAbsolutePath());
             } catch (IOException e) {
                 throw new RepositoryException("Error reading from config file " + configFile.getAbsolutePath(), e);
-            } finally {
-                IOUtils.closeQuietly(is);
             }
         }
 

oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java

@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.upgrade.blob;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -32,7 +31,6 @@
 import java.util.Properties;
 import java.util.Random;
 
-import org.apache.jackrabbit.guava.common.io.ByteSource;
 import org.apache.jackrabbit.guava.common.io.Files;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
@@ -105,7 +103,7 @@ public void delegateRecordTest() throws Exception{
         assertEquals(dr, dr2);
 
         assertEquals(dr.getLength(), dr2.getLength());
-        assertTrue(supplier(dr).contentEquals(supplier(dr2)));
+        assertArrayEquals(streamAsByteArray(dr), streamAsByteArray(dr2));
     }
 
     @Test
@@ -180,16 +178,9 @@ private byte[] bytes(int size) {
         return data;
     }
 
-    private static ByteSource supplier(final DataRecord dr) {
-        return new ByteSource() {
-            @Override
-            public InputStream openStream() throws IOException {
-                try {
-                    return dr.getStream();
-                } catch (DataStoreException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        };
+    private static byte[] streamAsByteArray(final DataRecord dr) throws IOException, DataStoreException {
+        try (InputStream is = dr.getStream()) {
+            return is.readAllBytes();
+        }
     }
 }