You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2016/12/05 14:23:01 UTC
svn commit: r1772672 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/
oak-core/src/test/ja...
Author: alexparvulescu
Date: Mon Dec 5 14:23:01 2016
New Revision: 1772672
URL: http://svn.apache.org/viewvc?rev=1772672&view=rev
Log:
OAK-5215 remove use of deprecated guava methods
- patch by Torgeir Veimo
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java Mon Dec 5 14:23:01 2016
@@ -22,13 +22,13 @@ package org.apache.jackrabbit.oak.osgi;
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;
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 class ObserverTracker implements
public void removedService(ServiceReference reference, Object service) {
Closeable subscription = subscriptions.remove(reference);
if (subscription != null) {
- Closeables.closeQuietly(subscription);
+ closeQuietly(subscription);
bundleContext.ungetService(reference);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java Mon Dec 5 14:23:01 2016
@@ -26,8 +26,7 @@ import javax.annotation.Nonnull;
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 @@ import org.apache.jackrabbit.oak.api.Blo
*/
public abstract class AbstractBlob implements Blob {
- private static InputSupplier<InputStream> supplier(final Blob blob) {
- return new InputSupplier<InputStream>() {
+ 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 @@ public abstract class AbstractBlob imple
}
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 @@ public abstract class AbstractBlob imple
// 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);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCacheTest.java Mon Dec 5 14:23:01 2016
@@ -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 @@ public class CompositeDataStoreCacheTest
// 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();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java Mon Dec 5 14:23:01 2016
@@ -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 @@ public class UploadStagingCacheTest exte
// 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();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java Mon Dec 5 14:23:01 2016
@@ -203,7 +203,7 @@ public class DocumentMKCommitAddTest ext
@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+"\" : {}";
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStore.java Mon Dec 5 14:23:01 2016
@@ -292,7 +292,7 @@ public class LengthCachingDataStore exte
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());
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java?rev=1772672&r1=1772671&r2=1772672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java Mon Dec 5 14:23:01 2016
@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
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 @@ public class LengthCachingDataStoreTest
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 @@ public class LengthCachingDataStoreTest
return data;
}
- private static InputSupplier<InputStream> supplier(final DataRecord dr) {
- return new InputSupplier<InputStream>() {
+ 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) {