More generics fixes

spotify · Nov 6, 2015 · ab6d452 · ab6d452
1 parent 3e30cc3
commit ab6d452
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/main/java/com/spotify/futures/CompletableFuturesExtra.java b/src/main/java/com/spotify/futures/CompletableFuturesExtra.java
@@ -97,14 +97,14 @@ public static <T> CompletableFuture<T> exceptionallyCompletedFuture(Throwable th
    */
   public static <T, U> CompletionStage<U> handleCompose(
           CompletionStage<T> future,
-          final BiFunction<? super T, Throwable, ? extends CompletionStage<? extends U>> fn) {
+          final BiFunction<? super T, Throwable, ? extends CompletionStage<U>> fn) {
 
     final CompletableFuture<U> result = new CompletableFuture<U>();
 
     future.whenComplete(new BiConsumer<T, Throwable>() {
       @Override
       public void accept(T value, Throwable throwable) {
-        final CompletionStage<? extends U> newStage;
+        final CompletionStage<U> newStage;
         try {
           newStage = fn.apply(value, throwable);
         } catch (Throwable e) {
@@ -149,10 +149,10 @@ public void accept(U value, Throwable throwable) {
    */
   public static <T> CompletionStage<T> exceptionallyCompose(
           CompletionStage<T> future,
-          final Function<Throwable, ? extends CompletionStage<? extends T>> fn) {
-    return handleCompose(future, new BiFunction<T, Throwable, CompletionStage<? extends T>>() {
+          final Function<Throwable, ? extends CompletionStage<T>> fn) {
+    return handleCompose(future, new BiFunction<T, Throwable, CompletionStage<T>>() {
       @Override
-      public CompletionStage<? extends T> apply(T value, Throwable throwable) {
+      public CompletionStage<T> apply(T value, Throwable throwable) {
         if (throwable != null) {
           return fn.apply(throwable);
         } else {
@@ -169,12 +169,12 @@ public CompletionStage<? extends T> apply(T value, Throwable throwable) {
    * @return the completion stage of a value
    */
   public static <T> CompletionStage<T> dereference(
-          CompletionStage<? extends CompletionStage<? extends T>> future) {
+          CompletionStage<? extends CompletionStage<T>> future) {
     return handleCompose(future,
-      new BiFunction<CompletionStage<? extends T>, Throwable, CompletionStage<? extends T>>() {
+      new BiFunction<CompletionStage<T>, Throwable, CompletionStage<T>>() {
         @Override
-        public CompletionStage<? extends T> apply(
-                CompletionStage<? extends T> value, Throwable throwable) {
+        public CompletionStage<T> apply(
+                CompletionStage<T> value, Throwable throwable) {
           return value;
         }
       });

diff --git a/src/test/java/com/spotify/futures/jdk8/CompletableFuturesExtraTest.java b/src/test/java/com/spotify/futures/jdk8/CompletableFuturesExtraTest.java
@@ -232,9 +232,9 @@ public CompletionStage<String> apply(Throwable throwable) {
   public void testHandleCompose() throws Exception {
     final CompletionStage<String> future = CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalArgumentException());
 
-    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<? extends String>>() {
+    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<String>>() {
       @Override
-      public CompletionStage<? extends String> apply(String s, Throwable throwable) {
+      public CompletionStage<String> apply(String s, Throwable throwable) {
         return CompletableFuture.completedFuture("hello");
       }
     });
@@ -247,9 +247,9 @@ public CompletionStage<? extends String> apply(String s, Throwable throwable) {
   public void testHandleComposeFailure() throws Exception {
     final CompletionStage<String> future = CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalArgumentException());
 
-    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<? extends String>>() {
+    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<String>>() {
       @Override
-      public CompletionStage<? extends String> apply(String s, Throwable throwable) {
+      public CompletionStage<String> apply(String s, Throwable throwable) {
         return CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalStateException());
       }
     });
@@ -261,9 +261,9 @@ public CompletionStage<? extends String> apply(String s, Throwable throwable) {
   public void testHandleComposeThrows() throws Exception {
     final CompletionStage<String> future = CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalArgumentException());
 
-    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<? extends String>>() {
+    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<String>>() {
       @Override
-      public CompletionStage<? extends String> apply(String s, Throwable throwable) {
+      public CompletionStage<String> apply(String s, Throwable throwable) {
         throw new IllegalStateException();
       }
     });
@@ -275,9 +275,9 @@ public CompletionStage<? extends String> apply(String s, Throwable throwable) {
   public void testHandleComposeReturnsNull() throws Exception {
     final CompletionStage<String> future = CompletableFuturesExtra.exceptionallyCompletedFuture(new IllegalArgumentException());
 
-    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<? extends String>>() {
+    final CompletionStage<String> composed = CompletableFuturesExtra.handleCompose(future, new BiFunction<String, Throwable, CompletionStage<String>>() {
       @Override
-      public CompletionStage<? extends String> apply(String s, Throwable throwable) {
+      public CompletionStage<String> apply(String s, Throwable throwable) {
         return null;
       }
     });