mirror of https://github.com/apache/jclouds.git
Upgrade to Guava 15.0-rc1
Release notes: https://code.google.com/p/guava-libraries/wiki/Release15
This commit is contained in:
parent
0d6ef06076
commit
310a898bc3
|
@ -90,7 +90,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>14.0.1</version>
|
<version>15.0-rc1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.osgi</groupId>
|
<groupId>org.osgi</groupId>
|
||||||
|
|
|
@ -26,6 +26,7 @@ import java.util.Set;
|
||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
import java.util.concurrent.Delayed;
|
import java.util.concurrent.Delayed;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
|
|
||||||
|
@ -113,7 +114,8 @@ public class WithSubmissionTrace {
|
||||||
|
|
||||||
private static final Set<String> stackTracesToTrim = ImmutableSet.of(WithSubmissionTrace.class.getName(),
|
private static final Set<String> stackTracesToTrim = ImmutableSet.of(WithSubmissionTrace.class.getName(),
|
||||||
ListeningExecutorService.class.getName(), ListenableFuture.class.getName(),
|
ListeningExecutorService.class.getName(), ListenableFuture.class.getName(),
|
||||||
ListeningScheduledExecutorService.class.getName(), ScheduledFuture.class.getName());
|
ListeningScheduledExecutorService.class.getName(), ScheduledFuture.class.getName(),
|
||||||
|
ListenableScheduledFuture.class.getName());
|
||||||
|
|
||||||
/** returns the stack trace at the caller */
|
/** returns the stack trace at the caller */
|
||||||
private static StackTraceElement[] getStackTraceHere() {
|
private static StackTraceElement[] getStackTraceHere() {
|
||||||
|
@ -182,25 +184,25 @@ public class WithSubmissionTrace {
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
|
public ListenableScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
|
||||||
return new ScheduledFuture(delegate().schedule(command, delay, unit));
|
return new ListenableScheduledFuture(delegate().schedule(command, delay, unit));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
|
public <V> ListenableScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
|
||||||
return new ScheduledFuture<V>(delegate().schedule(callable, delay, unit));
|
return new ListenableScheduledFuture(delegate().schedule(callable, delay, unit));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) {
|
public ListenableScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) {
|
||||||
return new ScheduledFuture(delegate().scheduleAtFixedRate(command, initialDelay, period, unit));
|
return new ListenableScheduledFuture(delegate().scheduleAtFixedRate(command, initialDelay, period, unit));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||||
@Override
|
@Override
|
||||||
public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) {
|
public ListenableScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) {
|
||||||
return new ScheduledFuture(delegate().scheduleWithFixedDelay(command, initialDelay, delay, unit));
|
return new ListenableScheduledFuture(delegate().scheduleWithFixedDelay(command, initialDelay, delay, unit));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -250,4 +252,15 @@ 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,7 +116,8 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactoryTest
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "duplicate key: foo")
|
@Test(expectedExceptions = IllegalArgumentException.class,
|
||||||
|
expectedExceptionsMessageRegExp = "Multiple entries with same key: foo.*")
|
||||||
public void testNoDuplicateSerializedNamesRequiredOnAllParameters() {
|
public void testNoDuplicateSerializedNamesRequiredOnAllParameters() {
|
||||||
parameterizedCtorFactory.create(gson, TypeToken.get(DuplicateSerializedNames.class));
|
parameterizedCtorFactory.create(gson, TypeToken.get(DuplicateSerializedNames.class));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue