Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated methods, bump version to 2.0.0-SNAPSHOT #4

Merged
merged 1 commit into from
Feb 22, 2015
Merged

Remove deprecated methods, bump version to 2.0.0-SNAPSHOT #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.spotify</groupId>
<version>1.4.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<artifactId>futures-extra</artifactId>
<packaging>jar</packaging>

Expand Down
180 changes: 0 additions & 180 deletions src/main/java/com/spotify/futures/FuturesExtra.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Z, A, B> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
final Function2<Z, ? super A, ? super B> function) {
return syncTransform2(a, b, function);
}

public static <Z, A, B> ListenableFuture<Z> syncTransform2(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -183,20 +169,6 @@ public interface Function2<Z, A, B> {
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 <Z, A, B> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
final AsyncFunction2<Z, ? super A, ? super B> function) {
return asyncTransform2(a, b, function);
}

public static <Z, A, B> ListenableFuture<Z> asyncTransform2(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -213,22 +185,6 @@ public interface AsyncFunction2<Z, A, B> {
ListenableFuture<Z> 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 <Z, A, B, C> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
final Function3<Z, ? super A, ? super B, ? super C> function) {
return syncTransform3(a, b, c, function);
}

public static <Z, A, B, C> ListenableFuture<Z> syncTransform3(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -246,22 +202,6 @@ public interface Function3<Z, A, B, C> {
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 <Z, A, B, C> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
final AsyncFunction3<Z, ? super A, ? super B, ? super C> function) {
return asyncTransform3(a, b, c, function);
}

public static <Z, A, B, C> ListenableFuture<Z> asyncTransform3(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -279,24 +219,6 @@ public interface AsyncFunction3<Z, A, B, C> {
ListenableFuture<Z> 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 <Z, A, B, C, D> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
final Function4<Z, ? super A, ? super B, ? super C, ? super D> function) {
return syncTransform4(a, b, c, d, function);
}

public static <Z, A, B, C, D> ListenableFuture<Z> syncTransform4(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -316,24 +238,6 @@ public interface Function4<Z, A, B, C, D> {
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 <Z, A, B, C, D> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
final AsyncFunction4<Z, ? super A, ? super B, ? super C, ? super D> function) {
return asyncTransform4(a, b, c, d, function);
}

public static <Z, A, B, C, D> ListenableFuture<Z> asyncTransform4(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -353,26 +257,6 @@ public interface AsyncFunction4<Z, A, B, C, D> {
ListenableFuture<Z> 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 <Z, A, B, C, D, E> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
ListenableFuture<E> e,
final Function5<Z, ? super A, ? super B, ? super C, ? super D, ? super E> function) {
return syncTransform5(a, b, c, d, e, function);
}

public static <Z, A, B, C, D, E> ListenableFuture<Z> syncTransform5(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -394,26 +278,6 @@ public interface Function5<Z, A, B, C, D, E> {
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 <Z, A, B, C, D, E> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
ListenableFuture<E> e,
final AsyncFunction5<Z, ? super A, ? super B, ? super C,
? super D, ? super E> function) {
return asyncTransform5(a, b, c, d, e, function);
}

public static <Z, A, B, C, D, E> ListenableFuture<Z> asyncTransform5(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -436,28 +300,6 @@ public interface AsyncFunction5<Z, A, B, C, D, E> {
ListenableFuture<Z> 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 <Z, A, B, C, D, E, F> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
ListenableFuture<E> e,
ListenableFuture<F> f,
final Function6<Z, ? super A, ? super B, ? super C,
? super D, ? super E, ? super F> function) {
return syncTransform6(a, b, c, d, e, f, function);
}

public static <Z, A, B, C, D, E, F> ListenableFuture<Z> syncTransform6(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand All @@ -481,28 +323,6 @@ public interface Function6<Z, A, B, C, D, E, F> {
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 <Z, A, B, C, D, E, F> ListenableFuture<Z> transform(
ListenableFuture<A> a,
ListenableFuture<B> b,
ListenableFuture<C> c,
ListenableFuture<D> d,
ListenableFuture<E> e,
ListenableFuture<F> f,
final AsyncFunction6<Z, ? super A, ? super B, ? super C,
? super D, ? super E, ? super F> function) {
return asyncTransform6(a, b, c, d, e, f, function);
}

public static <Z, A, B, C, D, E, F> ListenableFuture<Z> asyncTransform6(
ListenableFuture<A> a,
ListenableFuture<B> b,
Expand Down