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 re...@apache.org on 2019/10/31 12:58:00 UTC
svn commit: r1869211 - in /jackrabbit/oak/branches/1.4: ./ oak-core/
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/document/
Author: reschke
Date: Thu Oct 31 12:57:59 2019
New Revision: 1869211
URL: http://svn.apache.org/viewvc?rev=1869211&view=rev
Log:
OAK-5215 remove use of deprecated guava methods (merged r1772672 into 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1772672
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-core:r1772672
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java?rev=1869211&r1=1869210&r2=1869211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/ObserverTracker.java Thu Oct 31 12:57:59 2019
@@ -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/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java?rev=1869211&r1=1869210&r2=1869211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractBlob.java Thu Oct 31 12:57:59 2019
@@ -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/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java?rev=1869211&r1=1869210&r2=1869211&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java Thu Oct 31 12:57:59 2019
@@ -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+"\" : {}";