Move listener related config to Listeners class

failsafe-lib · Dec 27, 2018 · a13545d · a13545d
1 parent 9cec978
commit a13545d
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 167 deletions.
diff --git a/src/main/java/net/jodah/failsafe/AbstractExecution.java b/src/main/java/net/jodah/failsafe/AbstractExecution.java
@@ -42,7 +42,7 @@ public abstract class AbstractExecution extends ExecutionContext {
    */
   AbstractExecution(FailsafeConfig<Object, ?> config) {
     super(new Duration(System.nanoTime(), TimeUnit.NANOSECONDS));
-    eventHandler = config.eventHandler;
+    eventHandler = config.listeners;
 
     PolicyExecutor next = null;
     if (config.policies == null || config.policies.isEmpty()) {

diff --git a/src/main/java/net/jodah/failsafe/AsyncFailsafe.java b/src/main/java/net/jodah/failsafe/AsyncFailsafe.java
@@ -175,7 +175,7 @@ public Future<Void> runAsync(AsyncRunnable runnable) {
    */
   @SuppressWarnings("unchecked")
   private <T> CompletableFuture<T> call(Function<AsyncExecution, Callable<T>> callableFn) {
-    FailsafeFuture<T> future = new FailsafeFuture(eventHandler);
+    FailsafeFuture<T> future = new FailsafeFuture(listeners);
     CompletableFuture<T> response = CancellableFuture.of(future);
     future.inject(response);
     call(callableFn, future);
@@ -195,7 +195,7 @@ private <T> CompletableFuture<T> call(Function<AsyncExecution, Callable<T>> call
   @SuppressWarnings("unchecked")
   private <T> FailsafeFuture<T> call(Function<AsyncExecution, Callable<T>> callableFn, FailsafeFuture<T> future) {
     if (future == null)
-      future = new FailsafeFuture(eventHandler);
+      future = new FailsafeFuture(listeners);
 
     AsyncExecution execution = new AsyncExecution(scheduler, future, this);
     Callable<T> callable = callableFn.apply(execution);

diff --git a/src/main/java/net/jodah/failsafe/AsyncFailsafeConfig.java b/src/main/java/net/jodah/failsafe/AsyncFailsafeConfig.java
@@ -48,7 +48,7 @@ public class AsyncFailsafeConfig<R, F> extends FailsafeConfig<R, F> {
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onAbortAsync(ContextualResultListener<? extends R, ? extends Throwable> listener) {
-    registry().abort().add(Listeners.of(listener, null, scheduler));
+    listeners.abort().add(Listeners.of(listener, null, scheduler));
     return (F) this;
   }
 
@@ -59,7 +59,7 @@ public F onAbortAsync(ContextualResultListener<? extends R, ? extends Throwable>
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onAbortAsync(CheckedConsumer<? extends Throwable> listener) {
-    registry().abort().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.abort().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -70,7 +70,7 @@ public F onAbortAsync(CheckedConsumer<? extends Throwable> listener) {
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onAbortAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().abort().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.abort().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -79,7 +79,7 @@ public F onAbortAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listen
    * execution is completed.
    */
   public F onCompleteAsync(ContextualResultListener<? extends R, ? extends Throwable> listener) {
-    registry().complete().add(Listeners.of(listener, null, scheduler));
+    listeners.complete().add(Listeners.of(listener, null, scheduler));
     return (F) this;
   }
 
@@ -88,7 +88,7 @@ public F onCompleteAsync(ContextualResultListener<? extends R, ? extends Throwab
    * execution is completed.
    */
   public F onCompleteAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().complete().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.complete().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -97,7 +97,7 @@ public F onCompleteAsync(CheckedBiConsumer<? extends R, ? extends Throwable> lis
    * failed execution attempt.
    */
   public F onFailedAttemptAsync(ContextualResultListener<? extends R, ? extends Throwable> listener) {
-    registry().failedAttempt().add(Listeners.of(listener, null, scheduler));
+    listeners.failedAttempt().add(Listeners.of(listener, null, scheduler));
     return (F) this;
   }
 
@@ -106,7 +106,7 @@ public F onFailedAttemptAsync(ContextualResultListener<? extends R, ? extends Th
    * failed execution attempt.
    */
   public F onFailedAttemptAsync(CheckedConsumer<? extends Throwable> listener) {
-    registry().failedAttempt().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.failedAttempt().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -115,7 +115,7 @@ public F onFailedAttemptAsync(CheckedConsumer<? extends Throwable> listener) {
    * failed execution attempt.
    */
   public F onFailedAttemptAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().failedAttempt().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.failedAttempt().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -124,7 +124,7 @@ public F onFailedAttemptAsync(CheckedBiConsumer<? extends R, ? extends Throwable
    * failure occurs that cannot be retried.
    */
   public F onFailureAsync(ContextualResultListener<? extends R, ? extends Throwable> listener) {
-    registry().failure().add(Listeners.of(listener, null, scheduler));
+    listeners.failure().add(Listeners.of(listener, null, scheduler));
     return (F) this;
   }
 
@@ -133,7 +133,7 @@ public F onFailureAsync(ContextualResultListener<? extends R, ? extends Throwabl
    * failure occurs that cannot be retried.
    */
   public F onFailureAsync(CheckedConsumer<? extends Throwable> listener) {
-    registry().failure().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.failure().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -142,7 +142,7 @@ public F onFailureAsync(CheckedConsumer<? extends Throwable> listener) {
    * failure occurs that cannot be retried.
    */
   public F onFailureAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().failure().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.failure().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -153,7 +153,7 @@ public F onFailureAsync(CheckedBiConsumer<? extends R, ? extends Throwable> list
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onRetriesExceededAsync(CheckedConsumer<? extends Throwable> listener) {
-    registry().retriesExceeded().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.retriesExceeded().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -164,7 +164,7 @@ public F onRetriesExceededAsync(CheckedConsumer<? extends Throwable> listener) {
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onRetriesExceededAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().retriesExceeded().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.retriesExceeded().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -175,7 +175,7 @@ public F onRetriesExceededAsync(CheckedBiConsumer<? extends R, ? extends Throwab
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onRetryAsync(ContextualResultListener<? extends R, ? extends Throwable> listener) {
-    registry().retry().add(Listeners.of(listener, null, scheduler));
+    listeners.retry().add(Listeners.of(listener, null, scheduler));
     return (F) this;
   }
 
@@ -186,7 +186,7 @@ public F onRetryAsync(ContextualResultListener<? extends R, ? extends Throwable>
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onRetryAsync(CheckedConsumer<? extends Throwable> listener) {
-    registry().retry().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.retry().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -197,7 +197,7 @@ public F onRetryAsync(CheckedConsumer<? extends Throwable> listener) {
    * @throws IllegalStateException if a {@link RetryPolicy} is not configured
    */
   public F onRetryAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listener) {
-    registry().retry().add(Listeners.of(Listeners.of(listener), null, scheduler));
+    listeners.retry().add(Listeners.of(Listeners.of(listener), null, scheduler));
     return (F) this;
   }
 
@@ -206,7 +206,7 @@ public F onRetryAsync(CheckedBiConsumer<? extends R, ? extends Throwable> listen
    * successful execution.
    */
   public F onSuccessAsync(CheckedBiConsumer<? extends R, ExecutionContext> listener) {
-    registry().success().add(Listeners.of(Listeners.ofResult(listener), null, scheduler));
+    listeners.success().add(Listeners.of(Listeners.ofResult(listener), null, scheduler));
     return (F) this;
   }
 
@@ -215,7 +215,7 @@ public F onSuccessAsync(CheckedBiConsumer<? extends R, ExecutionContext> listene
    * successful execution.
    */
   public F onSuccessAsync(CheckedConsumer<? extends R> listener) {
-    registry().success().add(Listeners.of(Listeners.ofResult(listener), null, scheduler));
+    listeners.success().add(Listeners.of(Listeners.ofResult(listener), null, scheduler));
     return (F) this;
   }
 }