Fixed Issue ReactiveX#2

Author: Robert Winkler

src/main/java/io/github/robwin/retry/Retry.java

@@ -37,10 +37,20 @@ public interface Retry {
      */
     void handleRuntimeException(RuntimeException runtimeException);
 
+    /**
+     * Creates a RetryContext.Builder to configure a custom Retry.
+     *
+     * @return a RetryContext.Builder
+     */
     static RetryContext.Builder custom(){
         return new RetryContext.Builder();
     }
 
+    /**
+     * Creates a Retry with default configuration.
+     *
+     * @return a Retry with default configuration
+     */
     static Retry ofDefaults(){
         return Retry.custom().build();
     }
@@ -57,10 +67,11 @@ static <T> Try.CheckedSupplier<T> retryableCheckedSupplier(Try.CheckedSupplier<T
         };
     }
 
-    static <T> Try.CheckedRunnable retryableCheckedRunnable(Try.CheckedRunnable runnable, Retry retryContext){
+    static Try.CheckedRunnable retryableCheckedRunnable(Try.CheckedRunnable runnable, Retry retryContext){
         return () -> {
             do try {
                 runnable.run();
+                break;
             } catch (Exception exception) {
                 retryContext.handleException(exception);
             } while (retryContext.isRetryAllowedAfterException());
@@ -91,10 +102,11 @@ static <T> Supplier<T> retryableSupplier(Supplier<T> supplier, Retry retryContex
         };
     }
 
-    static <T> Runnable retryableRunnable(Runnable runnable, Retry retryContext){
+    static Runnable retryableRunnable(Runnable runnable, Retry retryContext){
         return () -> {
             do try {
                 runnable.run();
+                break;
             } catch (RuntimeException runtimeException) {
                 retryContext.handleRuntimeException(runtimeException);
             } while (retryContext.isRetryAllowedAfterRuntimeException());

src/test/java/io/github/robwin/circuitbreaker/CircuitBreakerTest.java

@@ -221,7 +221,7 @@ public void shouldChainDecoratedFunctions() throws ExecutionException, Interrupt
         // You can chain other functions with map and flatMap. The Try Monad returns a Success<String>, if the all
         // functions run successfully.
         Try<String> result = Try.of(decoratedSupplier)
-                .map(decoratedFunction);
+                .mapTry(decoratedFunction::apply);
 
         // Then
         assertThat(result.isSuccess()).isTrue();

src/test/java/io/github/robwin/retry/RunnableRetryTest.java

@@ -39,6 +39,22 @@ public void setUp(){
         helloWorldService = mock(HelloWorldService.class);
     }
 
+
+    @Test
+    public void shouldNotRetry() {
+        // Create a Retry with default configuration
+        Retry retryContext = Retry.ofDefaults();
+        // Decorate the invocation of the HelloWorldService
+        Try.CheckedRunnable retryableRunnable = Retry.retryableCheckedRunnable(helloWorldService::sayHelloWorld, retryContext);
+
+        // When
+        Try<Void> result = Try.run(retryableRunnable);
+        // Then the helloWorldService should be invoked 1 time
+        BDDMockito.then(helloWorldService).should(times(1)).sayHelloWorld();
+        // and the result should be a success
+        assertThat(result.isSuccess()).isTrue();
+    }
+
     @Test
     public void shouldReturnAfterThreeAttempts() {
         // Given the HelloWorldService throws an exception

src/test/java/io/github/robwin/retry/SupplierRetryTest.java

@@ -39,6 +39,24 @@ public void setUp(){
         helloWorldService = mock(HelloWorldService.class);
     }
 
+    @Test
+    public void shouldNotRetry() {
+        // Given the HelloWorldService returns Hello world
+        given(helloWorldService.returnHelloWorld()).willReturn("Hello world");
+        // Create a Retry with default configuration
+        Retry retryContext = Retry.ofDefaults();
+        // Decorate the invocation of the HelloWorldService
+        Try.CheckedSupplier<String> retryableSupplier = Retry.retryableCheckedSupplier(helloWorldService::returnHelloWorld, retryContext);
+
+        // When
+        Try<String> result = Try.of(retryableSupplier);
+        // Then the helloWorldService should be invoked 1 time
+        BDDMockito.then(helloWorldService).should(times(1)).returnHelloWorld();
+        // and the result should be a success
+        assertThat(result.isSuccess()).isTrue();
+        assertThat(result.get()).isEqualTo("Hello world");
+    }
+
     @Test
     public void shouldReturnSuccessfullyAfterSecondAttempt() {
         // Given the HelloWorldService throws an exception