Index: oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java (revision 1772356) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java (working copy) @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.Maps.newHashMap; +import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly; import java.io.Closeable; import java.util.Map; @@ -28,7 +29,6 @@ import javax.annotation.Nonnull; -import com.google.common.io.Closeables; import org.apache.jackrabbit.oak.spi.commit.Observable; import org.apache.jackrabbit.oak.spi.commit.Observer; import org.osgi.framework.BundleContext; @@ -82,7 +82,7 @@ public void removedService(ServiceReference reference, Object service) { Closeable subscription = subscriptions.remove(reference); if (subscription != null) { - Closeables.closeQuietly(subscription); + closeQuietly(subscription); bundleContext.ungetService(reference); } } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java (revision 1772356) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java (working copy) @@ -26,8 +26,7 @@ import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; -import com.google.common.io.ByteStreams; -import com.google.common.io.InputSupplier; +import com.google.common.io.ByteSource; import org.apache.jackrabbit.oak.api.Blob; @@ -38,10 +37,10 @@ */ public abstract class AbstractBlob implements Blob { - private static InputSupplier supplier(final Blob blob) { - return new InputSupplier() { + private static ByteSource supplier(final Blob blob) { + return new ByteSource() { @Override - public InputStream getInput() throws IOException { + public InputStream openStream() throws IOException { return blob.getNewStream(); } }; @@ -65,7 +64,7 @@ } try { - return ByteStreams.equal(supplier(a), supplier(b)); + return supplier(a).contentEquals(supplier(b)); } catch (IOException e) { throw new IllegalStateException("Blob equality check failed", e); } @@ -105,7 +104,7 @@ // Blobs are immutable so we can safely cache the hash if (hashCode == null) { try { - hashCode = ByteStreams.hash(supplier(this), Hashing.sha256()); + hashCode = supplier(this).hash(Hashing.sha256()); } catch (IOException e) { throw new IllegalStateException("Hash calculation failed", e); } Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java (revision 1772356) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java (working copy) @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.blob; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.concurrent.CountDownLatch; @@ -506,7 +505,7 @@ // Get a handle to the file and open stream File fileOnUpload = cache.getIfPresent(ID_PREFIX + 0); assertNotNull(fileOnUpload); - final FileInputStream fStream = Files.newInputStreamSupplier(fileOnUpload).getInput(); + final InputStream fStream = Files.asByteSource(fileOnUpload).openStream(); thread1Start.countDown(); Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java (revision 1772356) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java (working copy) @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugins.blob; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Iterator; @@ -431,7 +430,7 @@ // Get a handle to the file and open stream File file = stagingCache.getIfPresent(ID_PREFIX + 0); - final FileInputStream fStream = Files.newInputStreamSupplier(file).getInput(); + final InputStream fStream = Files.asByteSource(file).openStream(); // task to copy the steam to a file simulating read from the stream File temp = folder.newFile(); Index: oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java =================================================================== --- oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (revision 1772356) +++ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (working copy) @@ -203,7 +203,7 @@ @Ignore("OAK-461") public void commitTime() throws Exception { boolean debug = false; - final Stopwatch watch = new Stopwatch(); + final Stopwatch watch = Stopwatch.createUnstarted(); for (int i = 0; i < 1000; i++) { watch.start(); String diff = "+\"a"+i+"\" : {} +\"b"+i+"\" : {} +\"c"+i+"\" : {}"; Index: oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java =================================================================== --- oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (revision 1772356) +++ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (working copy) @@ -292,7 +292,7 @@ InputStream is = null; try { Properties props = new Properties(); - is = Files.newInputStreamSupplier(configFile).getInput(); + is = Files.asByteSource(configFile).openStream(); props.load(is); PropertiesUtil.populate(delegate, propsToMap(props), false); log.info("Configured the delegating DataStore via {}", configFile.getAbsolutePath()); Index: oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java =================================================================== --- oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java (revision 1772356) +++ oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java (working copy) @@ -32,7 +32,7 @@ import java.util.Properties; import java.util.Random; -import com.google.common.io.ByteStreams; +import com.google.common.io.ByteSource; import com.google.common.io.Files; import com.google.common.io.InputSupplier; import org.apache.jackrabbit.core.data.DataIdentifier; @@ -106,7 +106,7 @@ assertEquals(dr, dr2); assertEquals(dr.getLength(), dr2.getLength()); - assertTrue(ByteStreams.equal(supplier(dr), supplier(dr2))); + assertTrue(supplier(dr).contentEquals(supplier(dr2))); } @Test @@ -181,10 +181,10 @@ return data; } - private static InputSupplier supplier(final DataRecord dr) { - return new InputSupplier() { + private static ByteSource supplier(final DataRecord dr) { + return new ByteSource() { @Override - public InputStream getInput() throws IOException { + public InputStream openStream() throws IOException { try { return dr.getStream(); } catch (DataStoreException e) {