aboutsummaryrefslogtreecommitdiff
path: root/android/guava/src/com/google/common/util/concurrent/Futures.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/guava/src/com/google/common/util/concurrent/Futures.java')
-rw-r--r--android/guava/src/com/google/common/util/concurrent/Futures.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/android/guava/src/com/google/common/util/concurrent/Futures.java b/android/guava/src/com/google/common/util/concurrent/Futures.java
index 0e174bcae..e8441519b 100644
--- a/android/guava/src/com/google/common/util/concurrent/Futures.java
+++ b/android/guava/src/com/google/common/util/concurrent/Futures.java
@@ -161,7 +161,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
public static <V extends @Nullable Object> ListenableFuture<V> immediateFailedFuture(
Throwable throwable) {
checkNotNull(throwable);
- return new ImmediateFailedFuture<V>(throwable);
+ return new ImmediateFailedFuture<>(throwable);
}
/**
@@ -584,7 +584,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
@SafeVarargs
public static <V extends @Nullable Object> FutureCombiner<V> whenAllComplete(
ListenableFuture<? extends V>... futures) {
- return new FutureCombiner<V>(false, ImmutableList.copyOf(futures));
+ return new FutureCombiner<>(false, ImmutableList.copyOf(futures));
}
/**
@@ -597,7 +597,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
*/
public static <V extends @Nullable Object> FutureCombiner<V> whenAllComplete(
Iterable<? extends ListenableFuture<? extends V>> futures) {
- return new FutureCombiner<V>(false, ImmutableList.copyOf(futures));
+ return new FutureCombiner<>(false, ImmutableList.copyOf(futures));
}
/**
@@ -610,7 +610,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
@SafeVarargs
public static <V extends @Nullable Object> FutureCombiner<V> whenAllSucceed(
ListenableFuture<? extends V>... futures) {
- return new FutureCombiner<V>(true, ImmutableList.copyOf(futures));
+ return new FutureCombiner<>(true, ImmutableList.copyOf(futures));
}
/**
@@ -622,7 +622,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
*/
public static <V extends @Nullable Object> FutureCombiner<V> whenAllSucceed(
Iterable<? extends ListenableFuture<? extends V>> futures) {
- return new FutureCombiner<V>(true, ImmutableList.copyOf(futures));
+ return new FutureCombiner<>(true, ImmutableList.copyOf(futures));
}
/**
@@ -684,7 +684,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
*/
public <C extends @Nullable Object> ListenableFuture<C> callAsync(
AsyncCallable<C> combiner, Executor executor) {
- return new CombinedFuture<C>(futures, allMustSucceed, executor, combiner);
+ return new CombinedFuture<>(futures, allMustSucceed, executor, combiner);
}
/**
@@ -709,7 +709,7 @@ public final class Futures extends GwtFuturesCatchingSpecialization {
*/
public <C extends @Nullable Object> ListenableFuture<C> call(
Callable<C> combiner, Executor executor) {
- return new CombinedFuture<C>(futures, allMustSucceed, executor, combiner);
+ return new CombinedFuture<>(futures, allMustSucceed, executor, combiner);
}
/**