Fix RetryOptions.addDoNotRetry (#520)

* Remove unnecessary validations in RetryOptions.addDoNotRetry
* Add basic test on RetryOptions.addDoNotRetry

Co-authored-by: Liang Mei <[email protected]>

Author: sokada1221

src/main/java/com/uber/cadence/common/RetryOptions.java

@@ -92,22 +92,9 @@ public final RetryOptions addDoNotRetry(Class<? extends Throwable>... doNotRetry
       return this;
     }
 
-    double backoffCoefficient = getBackoffCoefficient();
-    if (backoffCoefficient == 0) {
-      backoffCoefficient = DEFAULT_BACKOFF_COEFFICIENT;
-    }
-
-    RetryOptions.Builder builder =
-        new RetryOptions.Builder()
-            .setInitialInterval(getInitialInterval())
-            .setExpiration(getExpiration())
-            .setMaximumInterval(getMaximumInterval())
-            .setBackoffCoefficient(backoffCoefficient)
-            .setDoNotRetry(merge(getDoNotRetry(), Arrays.asList(doNotRetry)));
+    RetryOptions.Builder builder = new RetryOptions.Builder(this);
+    builder.setDoNotRetry(merge(getDoNotRetry(), Arrays.asList(doNotRetry)));
 
-    if (getMaximumAttempts() > 0) {
-      builder.setMaximumAttempts(getMaximumAttempts());
-    }
     return builder.validateBuildWithDefaults();
   }
 

src/test/java/com/uber/cadence/internal/common/RetryerTest.java

@@ -107,6 +107,32 @@ public void testInterruptedException() throws InterruptedException {
     assertTrue(System.currentTimeMillis() - start < 100000);
   }
 
+  @Test
+  public void testAddDoNotRetry() throws InterruptedException {
+    RetryOptions options =
+        new RetryOptions.Builder()
+            .setInitialInterval(Duration.ofMillis(10))
+            .setExpiration(Duration.ofSeconds(100))
+            .validateBuildWithDefaults();
+    options = options.addDoNotRetry(InterruptedException.class);
+    long start = System.currentTimeMillis();
+    try {
+      Retryer.retryWithResultAsync(
+              options,
+              () -> {
+                CompletableFuture<Void> result = new CompletableFuture<>();
+                result.completeExceptionally(new InterruptedException("simulated"));
+                return result;
+              })
+          .get();
+      fail("unreachable");
+    } catch (ExecutionException e) {
+      assertTrue(e.getCause() instanceof InterruptedException);
+      assertEquals("simulated", e.getCause().getMessage());
+    }
+    assertTrue(System.currentTimeMillis() - start < 100000);
+  }
+
   @Test
   public void testMaxAttempt() throws InterruptedException {
     RetryOptions options =