diff --git a/src/main/java/io/vertx/core/Promise.java b/src/main/java/io/vertx/core/Promise.java index 9cab2735d..65d8b48a5 100644 --- a/src/main/java/io/vertx/core/Promise.java +++ b/src/main/java/io/vertx/core/Promise.java @@ -29,49 +29,6 @@ import static io.vertx.core.Future.factory; @VertxGen public interface Promise extends Handler> { - /** - * Create a succeeded promise with a {@code null} result - * - * @param the result type - * @return the promise - */ - static Promise succeededPromise() { - return factory.succeededPromise(); - } - - /** - * Created a succeeded promise with the specified {@code result}. - * - * @param result the result - * @param the result type - * @return the promise - */ - static Promise succeededPromise(T result) { - return factory.succeededPromise(result); - } - - /** - * Create a failed promise with the specified failure {@code cause}. - * - * @param cause the failure cause as a Throwable - * @param the result type - * @return the promise - */ - static Promise failedPromise(Throwable cause) { - return factory.failedPromise(cause); - } - - /** - * Create a failed promise with the specified {@code failureMessage}. - * - * @param failureMessage the failure message - * @param the result type - * @return the promise - */ - static Promise failedPromise(String failureMessage) { - return factory.failurePromise(failureMessage); - } - /** * Create a promise that hasn't completed yet * diff --git a/src/main/java/io/vertx/core/impl/FailedFuture.java b/src/main/java/io/vertx/core/impl/FailedFuture.java index 71f21a68f..2d36d9750 100644 --- a/src/main/java/io/vertx/core/impl/FailedFuture.java +++ b/src/main/java/io/vertx/core/impl/FailedFuture.java @@ -14,12 +14,11 @@ package io.vertx.core.impl; import io.vertx.core.AsyncResult; import io.vertx.core.Future; import io.vertx.core.Handler; -import io.vertx.core.Promise; /** * @author Julien Viet */ -public class FailedFuture implements Future, Promise { +public class FailedFuture implements Future { private final Throwable cause; @@ -55,46 +54,6 @@ public class FailedFuture implements Future, Promise { return null; } - @Override - public void complete(T result) { - throw new IllegalStateException("Result is already complete: failed"); - } - - @Override - public void complete() { - throw new IllegalStateException("Result is already complete: failed"); - } - - @Override - public void fail(Throwable cause) { - throw new IllegalStateException("Result is already complete: failed"); - } - - @Override - public void fail(String failureMessage) { - throw new IllegalStateException("Result is already complete: failed"); - } - - @Override - public boolean tryComplete(T result) { - return false; - } - - @Override - public boolean tryComplete() { - return false; - } - - @Override - public boolean tryFail(Throwable cause) { - return false; - } - - @Override - public boolean tryFail(String failureMessage) { - return false; - } - @Override public T result() { return null; @@ -115,16 +74,6 @@ public class FailedFuture implements Future, Promise { return true; } - @Override - public void handle(AsyncResult asyncResult) { - throw new IllegalStateException("Result is already complete: failed"); - } - - @Override - public Future future() { - return this; - } - @Override public String toString() { return "Future{cause=" + cause.getMessage() + "}"; diff --git a/src/main/java/io/vertx/core/impl/FutureFactoryImpl.java b/src/main/java/io/vertx/core/impl/FutureFactoryImpl.java index 3342c7687..332ef5562 100644 --- a/src/main/java/io/vertx/core/impl/FutureFactoryImpl.java +++ b/src/main/java/io/vertx/core/impl/FutureFactoryImpl.java @@ -27,28 +27,6 @@ public class FutureFactoryImpl implements FutureFactory { return new FutureImpl<>(); } - @Override - public Promise succeededPromise() { - @SuppressWarnings("unchecked") - Promise promise = EMPTY; - return promise; - } - - @Override - public Promise succeededPromise(T result) { - return new SucceededFuture<>(result); - } - - @Override - public Promise failedPromise(Throwable t) { - return new FailedFuture<>(t); - } - - @Override - public Promise failurePromise(String failureMessage) { - return new FailedFuture<>(failureMessage); - } - @Override public Future future() { return new FutureImpl<>(); diff --git a/src/main/java/io/vertx/core/impl/SucceededFuture.java b/src/main/java/io/vertx/core/impl/SucceededFuture.java index f6ca995c2..da855394a 100644 --- a/src/main/java/io/vertx/core/impl/SucceededFuture.java +++ b/src/main/java/io/vertx/core/impl/SucceededFuture.java @@ -19,7 +19,7 @@ import io.vertx.core.Promise; /** * @author Julien Viet */ -class SucceededFuture implements Future, Promise { +class SucceededFuture implements Future { private final T result; @@ -47,46 +47,6 @@ class SucceededFuture implements Future, Promise { return null; } - @Override - public void complete(T result) { - throw new IllegalStateException("Result is already complete: succeeded"); - } - - @Override - public void complete() { - throw new IllegalStateException("Result is already complete: succeeded"); - } - - @Override - public void fail(Throwable cause) { - throw new IllegalStateException("Result is already complete: succeeded"); - } - - @Override - public void fail(String failureMessage) { - throw new IllegalStateException("Result is already complete: succeeded"); - } - - @Override - public boolean tryComplete(T result) { - return false; - } - - @Override - public boolean tryComplete() { - return false; - } - - @Override - public boolean tryFail(Throwable cause) { - return false; - } - - @Override - public boolean tryFail(String failureMessage) { - return false; - } - @Override public T result() { return result; @@ -107,16 +67,6 @@ class SucceededFuture implements Future, Promise { return false; } - @Override - public void handle(AsyncResult asyncResult) { - throw new IllegalStateException("Result is already complete: succeeded"); - } - - @Override - public Future future() { - return this; - } - @Override public String toString() { return "Future{result=" + result + "}"; diff --git a/src/main/java/io/vertx/core/spi/FutureFactory.java b/src/main/java/io/vertx/core/spi/FutureFactory.java index 1042f544d..69fa5f9ab 100644 --- a/src/main/java/io/vertx/core/spi/FutureFactory.java +++ b/src/main/java/io/vertx/core/spi/FutureFactory.java @@ -21,14 +21,6 @@ public interface FutureFactory { Promise promise(); - Promise succeededPromise(); - - Promise succeededPromise(T result); - - Promise failedPromise(Throwable t); - - Promise failurePromise(String failureMessage); - Future future(); Future succeededFuture(); diff --git a/src/test/java/io/vertx/core/FutureTest.java b/src/test/java/io/vertx/core/FutureTest.java index 6ed0e202d..9144a02ed 100644 --- a/src/test/java/io/vertx/core/FutureTest.java +++ b/src/test/java/io/vertx/core/FutureTest.java @@ -89,37 +89,6 @@ public class FutureTest extends VertxTestBase { assertEquals(cause, future.cause()); } - @Test - public void testSetResultOnCompletedPromise() { - ArrayList> promises = new ArrayList<>(); - promises.add(Promise.succeededPromise()); - promises.add(Promise.succeededPromise()); - promises.add(Promise.succeededPromise(new Object())); - promises.add(Promise.succeededPromise(new Object())); - promises.add(Promise.failedPromise(new Exception())); - promises.add(Promise.failedPromise(new Exception())); - for (Promise promise : promises) { - try { - promise.complete(new Object()); - fail(); - } catch (IllegalStateException ignore) { - } - assertFalse(promise.tryComplete(new Object())); - try { - promise.complete(null); - fail(); - } catch (IllegalStateException ignore) { - } - assertFalse(promise.tryComplete(null)); - try { - promise.fail(new Exception()); - fail(); - } catch (IllegalStateException ignore) { - } - assertFalse(promise.tryFail(new Exception())); - } - } - @Test public void testCallSetHandlerBeforeCompletion() { AtomicBoolean called = new AtomicBoolean();