Updated Branches: refs/heads/JCLOUDS-427-1.6.x 17c11f2b2 -> 30dfdab77
Revert "Upgrade to Guava 15.0" This reverts commit 49491a56a43f48d2972139cb157213d7071f249d. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/476c0fb8 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/476c0fb8 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/476c0fb8 Branch: refs/heads/JCLOUDS-427-1.6.x Commit: 476c0fb89115a352bd9afffcc4f0f6ace8d39100 Parents: 17c11f2 Author: Andrew Phillips <[email protected]> Authored: Fri Jan 24 14:41:55 2014 -0500 Committer: Andrew Phillips <[email protected]> Committed: Fri Jan 24 14:43:29 2014 -0500 ---------------------------------------------------------------------- core/pom.xml | 2 +- .../concurrent/config/WithSubmissionTrace.java | 31 ++++++-------------- ...ctorAndReflectiveTypeAdapterFactoryTest.java | 3 +- 3 files changed, 11 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/476c0fb8/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index c4364bd..781f2e3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -90,7 +90,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>15.0</version> + <version>14.0.1</version> </dependency> <dependency> <groupId>org.osgi</groupId> http://git-wip-us.apache.org/repos/asf/jclouds/blob/476c0fb8/core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java b/core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java index ff2ebd6..0facd97 100644 --- a/core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java +++ b/core/src/main/java/org/jclouds/concurrent/config/WithSubmissionTrace.java @@ -26,7 +26,6 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.Delayed; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -114,8 +113,7 @@ public class WithSubmissionTrace { private static final Set<String> stackTracesToTrim = ImmutableSet.of(WithSubmissionTrace.class.getName(), ListeningExecutorService.class.getName(), ListenableFuture.class.getName(), - ListeningScheduledExecutorService.class.getName(), ScheduledFuture.class.getName(), - ListenableScheduledFuture.class.getName()); + ListeningScheduledExecutorService.class.getName(), ScheduledFuture.class.getName()); /** returns the stack trace at the caller */ private static StackTraceElement[] getStackTraceHere() { @@ -184,25 +182,25 @@ public class WithSubmissionTrace { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public ListenableScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) { - return new ListenableScheduledFuture(delegate().schedule(command, delay, unit)); + public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) { + return new ScheduledFuture(delegate().schedule(command, delay, unit)); } @Override - public <V> ListenableScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) { - return new ListenableScheduledFuture(delegate().schedule(callable, delay, unit)); + public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) { + return new ScheduledFuture<V>(delegate().schedule(callable, delay, unit)); } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public ListenableScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) { - return new ListenableScheduledFuture(delegate().scheduleAtFixedRate(command, initialDelay, period, unit)); + public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) { + return new ScheduledFuture(delegate().scheduleAtFixedRate(command, initialDelay, period, unit)); } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public ListenableScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) { - return new ListenableScheduledFuture(delegate().scheduleWithFixedDelay(command, initialDelay, delay, unit)); + public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) { + return new ScheduledFuture(delegate().scheduleWithFixedDelay(command, initialDelay, delay, unit)); } } @@ -252,15 +250,4 @@ public class WithSubmissionTrace { } } - private static class ListenableScheduledFuture<T> extends ScheduledFuture<T> - implements com.google.common.util.concurrent.ListenableScheduledFuture<T> { - private ListenableScheduledFuture(com.google.common.util.concurrent.ListenableScheduledFuture<T> delegate) { - super(delegate); - } - - @Override - public void addListener(Runnable listener, Executor executor) { - ((com.google.common.util.concurrent.ListenableScheduledFuture<T>) delegate()).addListener(listener, executor); - } - } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/476c0fb8/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java index 8a3e62c..0c57cef 100644 --- a/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java +++ b/core/src/test/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactoryTest.java @@ -116,8 +116,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest } } - @Test(expectedExceptions = IllegalArgumentException.class, - expectedExceptionsMessageRegExp = "Multiple entries with same key: foo.*") + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "duplicate key: foo") public void testNoDuplicateSerializedNamesRequiredOnAllParameters() { parameterizedCtorFactory.create(gson, TypeToken.get(DuplicateSerializedNames.class)); }
