diff --git a/pom.xml b/pom.xml index 37822f6..dcd8916 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.spotify - 1.4.2-SNAPSHOT + 2.0.0-SNAPSHOT futures-extra jar diff --git a/src/main/java/com/spotify/futures/FuturesExtra.java b/src/main/java/com/spotify/futures/FuturesExtra.java index c6a9d94..f3458b3 100644 --- a/src/main/java/com/spotify/futures/FuturesExtra.java +++ b/src/main/java/com/spotify/futures/FuturesExtra.java @@ -153,20 +153,6 @@ public void onFailure(Throwable t) { return promise; } - /** - * @deprecated - * use {@link #syncTransform2(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.Function2)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - final Function2 function) { - return syncTransform2(a, b, function); - } - public static ListenableFuture syncTransform2( ListenableFuture a, ListenableFuture b, @@ -183,20 +169,6 @@ public interface Function2 { Z apply(A a, B b); } - /** - * @deprecated - * use {@link #asyncTransform2(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.AsyncFunction2)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - final AsyncFunction2 function) { - return asyncTransform2(a, b, function); - } - public static ListenableFuture asyncTransform2( ListenableFuture a, ListenableFuture b, @@ -213,22 +185,6 @@ public interface AsyncFunction2 { ListenableFuture apply(A a, B b); } - /** - * @deprecated - * use {@link #syncTransform3(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.Function3)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - final Function3 function) { - return syncTransform3(a, b, c, function); - } - public static ListenableFuture syncTransform3( ListenableFuture a, ListenableFuture b, @@ -246,22 +202,6 @@ public interface Function3 { Z apply(A a, B b, C c); } - /** - * @deprecated - * use {@link #asyncTransform3(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.AsyncFunction3)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - final AsyncFunction3 function) { - return asyncTransform3(a, b, c, function); - } - public static ListenableFuture asyncTransform3( ListenableFuture a, ListenableFuture b, @@ -279,24 +219,6 @@ public interface AsyncFunction3 { ListenableFuture apply(A a, B b, C c); } - /** - * @deprecated - * use {@link #syncTransform4(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.Function4)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - final Function4 function) { - return syncTransform4(a, b, c, d, function); - } - public static ListenableFuture syncTransform4( ListenableFuture a, ListenableFuture b, @@ -316,24 +238,6 @@ public interface Function4 { Z apply(A a, B b, C c, D d); } - /** - * @deprecated - * use {@link #asyncTransform4(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.AsyncFunction4)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - final AsyncFunction4 function) { - return asyncTransform4(a, b, c, d, function); - } - public static ListenableFuture asyncTransform4( ListenableFuture a, ListenableFuture b, @@ -353,26 +257,6 @@ public interface AsyncFunction4 { ListenableFuture apply(A a, B b, C c, D d); } - /** - * @deprecated - * use {@link #syncTransform5(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.Function5)} instead - */ - @Deprecated - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - ListenableFuture e, - final Function5 function) { - return syncTransform5(a, b, c, d, e, function); - } - public static ListenableFuture syncTransform5( ListenableFuture a, ListenableFuture b, @@ -394,26 +278,6 @@ public interface Function5 { Z apply(A a, B b, C c, D d, E e); } - /** - * @deprecated - * use {@link #asyncTransform5(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.AsyncFunction5)} instead - */ - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - ListenableFuture e, - final AsyncFunction5 function) { - return asyncTransform5(a, b, c, d, e, function); - } - public static ListenableFuture asyncTransform5( ListenableFuture a, ListenableFuture b, @@ -436,28 +300,6 @@ public interface AsyncFunction5 { ListenableFuture apply(A a, B b, C c, D d, E e); } - /** - * @deprecated - * use {@link #syncTransform6(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.Function6)} instead - */ - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - ListenableFuture e, - ListenableFuture f, - final Function6 function) { - return syncTransform6(a, b, c, d, e, f, function); - } - public static ListenableFuture syncTransform6( ListenableFuture a, ListenableFuture b, @@ -481,28 +323,6 @@ public interface Function6 { Z apply(A a, B b, C c, D d, E e, F f); } - /** - * @deprecated - * use {@link #asyncTransform6(com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.google.common.util.concurrent.ListenableFuture, - * com.spotify.futures.FuturesExtra.AsyncFunction6)} instead - */ - public static ListenableFuture transform( - ListenableFuture a, - ListenableFuture b, - ListenableFuture c, - ListenableFuture d, - ListenableFuture e, - ListenableFuture f, - final AsyncFunction6 function) { - return asyncTransform6(a, b, c, d, e, f, function); - } - public static ListenableFuture asyncTransform6( ListenableFuture a, ListenableFuture b,