Merge ca088b2 into 2f71963

resilience4j · May 19, 2017 · b5b0724 · b5b0724
2 parents 2f71963 + ca088b2
commit b5b0724
Show file tree

Hide file tree

Showing 12 changed files with 962 additions and 7 deletions.
diff --git a/resilience4j-all/build.gradle b/resilience4j-all/build.gradle
@@ -10,5 +10,6 @@ dependencies {
     compile project(':resilience4j-retry')
     compile project(':resilience4j-consumer')
     compile project(':resilience4j-cache')
+    compile project(':resilience4j-timeout')
     testCompile project(':resilience4j-test')
 }
diff --git a/resilience4j-all/src/main/java/io/github/resilience4j/decorators/Decorators.java b/resilience4j-all/src/main/java/io/github/resilience4j/decorators/Decorators.java
@@ -1,21 +1,22 @@
 package io.github.resilience4j.decorators;
 
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
 import io.github.resilience4j.bulkhead.Bulkhead;
 import io.github.resilience4j.cache.Cache;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.ratelimiter.RateLimiter;
 import io.github.resilience4j.retry.AsyncRetry;
 import io.github.resilience4j.retry.Retry;
+import io.github.resilience4j.timeout.Timeout;
 import io.vavr.CheckedFunction0;
 import io.vavr.CheckedFunction1;
 import io.vavr.CheckedRunnable;
 
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
 /**
  * A Decorator builder which can be used to apply multiple decorators to a (Checked-)Supplier, (Checked-)Function,
  * (Checked-)Runnable, (Checked-)CompletionStage or (Checked-)Consumer
@@ -86,6 +87,11 @@ public DecorateSupplier<T> withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateSupplier<T> withTimeout(Timeout timeout) {
+            supplier = Timeout.decorateSupplier(timeout, supplier);
+            return this;
+        }
+
         public Supplier<T> decorate() {
             return supplier;
         }
@@ -122,6 +128,11 @@ public DecorateFunction<T, R> withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateFunction<T, R> withTimeout(Timeout timeout) {
+            function = Timeout.decorateFunction(timeout, function);
+            return this;
+        }
+
         public Function<T, R> decorate() {
             return function;
         }
@@ -158,6 +169,11 @@ public DecorateRunnable withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateRunnable withTimeout(Timeout timeout) {
+            runnable = Timeout.decorateRunnable(timeout, runnable);
+            return this;
+        }
+
         public Runnable decorate() {
             return runnable;
         }
@@ -199,6 +215,11 @@ public DecorateCheckedSupplier<T> withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateCheckedSupplier<T> withTimeout(Timeout timeout) {
+            supplier = Timeout.decorateCheckedSupplier(timeout, supplier);
+            return this;
+        }
+
         public CheckedFunction0<T> decorate() {
             return supplier;
         }
@@ -235,6 +256,11 @@ public DecorateCheckedFunction<T, R> withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateCheckedFunction<T, R> withTimeout(Timeout timeout) {
+            function = Timeout.decorateCheckedFunction(timeout, function);
+            return this;
+        }
+
         public CheckedFunction1<T, R> decorate() {
             return function;
         }
@@ -271,6 +297,11 @@ public DecorateCheckedRunnable withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateCheckedRunnable withTimeout(Timeout timeout) {
+            runnable = Timeout.decorateCheckedRunnable(timeout, runnable);
+            return this;
+        }
+
         public CheckedRunnable decorate() {
             return runnable;
         }
@@ -340,6 +371,11 @@ public DecorateConsumer<T> withBulkhead(Bulkhead bulkhead) {
             return this;
         }
 
+        public DecorateConsumer<T> withTimeout(Timeout timeout) {
+            consumer = Timeout.decorateConsumer(timeout, consumer);
+            return this;
+        }
+
         public Consumer<T> decorate() {
             return consumer;
         }

diff --git a/resilience4j-timeout/build.gradle b/resilience4j-timeout/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    compile ( libraries.rxjava2)
+}