Merge pull request #20 from spotify/krka/joined-results-fix

Fix bug where compiler can't figure out how to call FuturesExtra.join
spotify · Dec 9, 2015 · d7a12d5 · d7a12d5
2 parents 9a0e959 + bc501e7
commit d7a12d5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/spotify/futures/CompletableFuturesExtra.java b/src/main/java/com/spotify/futures/CompletableFuturesExtra.java
@@ -142,7 +142,7 @@ public static <T> CompletionStage<T> exceptionallyCompose(
    * @param stage a {@link CompletionStage}.
    * @throws IllegalStateException if the stage is not completed.
    */
-  public static void checkCompleted(CompletionStage<?> stage) {
+  public static <T> void checkCompleted(CompletionStage<T> stage) {
     if (!stage.toCompletableFuture().isDone()) {
       throw new IllegalStateException("future was not completed");
     }

diff --git a/src/main/java/com/spotify/futures/FuturesExtra.java b/src/main/java/com/spotify/futures/FuturesExtra.java
@@ -606,7 +606,7 @@ private static <Z> ListenableFuture<Z> transform(final List<ListenableFuture<?>>
    * the join is accessed.</p>
    * @see #join(ListenableFuture...)
    */
-  public static ListenableFuture<JoinedResults> join(List<ListenableFuture<?>> inputs) {
+  public static <T> ListenableFuture<JoinedResults> join(List<ListenableFuture<T>> inputs) {
     return Futures.transform(Futures.allAsList(inputs), new JoinedResults.Transform(inputs));
   }
 
@@ -645,7 +645,7 @@ public static <I, O> ListenableFuture<O> asyncTransform(
    * @param future the future.
    * @throws IllegalStateException if the future is not completed.
    */
-  public static void checkCompleted(ListenableFuture<?> future) {
+  public static <T> void checkCompleted(ListenableFuture<T> future) {
     if (!future.isDone()) {
       throw new IllegalStateException("future was not completed");
     }
@@ -671,7 +671,7 @@ public static <T> T getCompleted(ListenableFuture<T> future) {
    * @return the exception of a future or null if no exception was thrown
    * @throws IllegalStateException if the future is not completed.
    */
-  public static Throwable getException(ListenableFuture<?> future) {
+  public static <T> Throwable getException(ListenableFuture<T> future) {
     checkCompleted(future);
     try {
       Uninterruptibles.getUninterruptibly(future);

diff --git a/src/main/java/com/spotify/futures/JoinedResults.java b/src/main/java/com/spotify/futures/JoinedResults.java
@@ -53,9 +53,9 @@ public <T> T get(ListenableFuture<T> future) {
     return t;
   }
 
-  static class Transform implements Function<List<Object>, JoinedResults> {
-    private final List<ListenableFuture<?>> futures;
-    public Transform(List<ListenableFuture<?>> list) {
+  static class Transform<T> implements Function<List<Object>, JoinedResults> {
+    private final List<ListenableFuture<T>> futures;
+    public Transform(List<ListenableFuture<T>> list) {
       futures = ImmutableList.copyOf(list);
     }
 

diff --git a/src/test/java/com/spotify/futures/jdk7/JoinedResultsTest.java b/src/test/java/com/spotify/futures/jdk7/JoinedResultsTest.java
@@ -49,7 +49,7 @@ public void testMixedTypes() throws Exception {
   public void testWithList() throws Exception {
     ListenableFuture<String> futureA = Futures.immediateFuture("a");
     ListenableFuture<String> futureB = Futures.immediateFuture("b");
-    List<ListenableFuture<?>> list = Arrays.<ListenableFuture<?>>asList(futureA, futureB);
+    List<ListenableFuture<String>> list = Arrays.asList(futureA, futureB);
     JoinedResults joined = FuturesExtra.join(list).get();
     assertEquals("a", joined.get(futureA));
     assertEquals("b", joined.get(futureB));