Replace util.Duration with java.time.Duration

jhalterman · Jul 29, 2019 · 36414a6 · 36414a6
1 parent 97df50c
commit 36414a6
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 261 deletions.
diff --git a/src/main/java/net/jodah/sarge/Directive.java b/src/main/java/net/jodah/sarge/Directive.java
@@ -1,7 +1,8 @@
 package net.jodah.sarge;
 
 import net.jodah.sarge.internal.RetryDirective;
-import net.jodah.sarge.util.Duration;
+
+import java.time.Duration;
 
 /**
  * Determine how failures should be handled.

diff --git a/src/main/java/net/jodah/sarge/PlanMaker.java b/src/main/java/net/jodah/sarge/PlanMaker.java
@@ -1,11 +1,11 @@
 package net.jodah.sarge;
 
+import net.jodah.sarge.internal.util.Assert;
+
+import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import net.jodah.sarge.internal.util.Assert;
-import net.jodah.sarge.util.Duration;
-
 /**
  * Makes a {@link Plan}.
  * 

diff --git a/src/main/java/net/jodah/sarge/Plans.java b/src/main/java/net/jodah/sarge/Plans.java
@@ -1,6 +1,6 @@
 package net.jodah.sarge;
 
-import net.jodah.sarge.util.Duration;
+import java.time.Duration;
 
 /**
  * Defines a strategy for supervising objects.

diff --git a/src/main/java/net/jodah/sarge/internal/RetryDirective.java b/src/main/java/net/jodah/sarge/internal/RetryDirective.java
@@ -1,7 +1,8 @@
 package net.jodah.sarge.internal;
 
 import net.jodah.sarge.Directive;
-import net.jodah.sarge.util.Duration;
+
+import java.time.Duration;
 
 /**
  * Directive that encapsulates retry information.

diff --git a/src/main/java/net/jodah/sarge/util/Duration.java b/src/main/java/net/jodah/sarge/util/Duration.java
diff --git a/src/test/java/net/jodah/sarge/functional/BackoffTest.java b/src/test/java/net/jodah/sarge/functional/BackoffTest.java
@@ -1,14 +1,13 @@
 package net.jodah.sarge.functional;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 import net.jodah.sarge.AbstractTest;
 import net.jodah.sarge.Plans;
-import net.jodah.sarge.util.Duration;
-
 import org.testng.annotations.Test;
 
+import java.time.Duration;
+
+import static org.testng.Assert.*;
+
 /**
  * @author Jonathan Halterman
  */
@@ -25,7 +24,7 @@ void doSomething() {
 
   public void shouldBackoff() {
     Foo foo = sarge.supervised(Foo.class, Plans.retryOn(IllegalStateException.class, 5,
-        Duration.inf(), Duration.millis(100), Duration.millis(800)));
+        Duration.ofDays(1), Duration.ofMillis(100), Duration.ofMillis(800)));
 
     long startTime = System.currentTimeMillis();
 

diff --git a/src/test/java/net/jodah/sarge/functional/HierarchicalSupervisionTest.java b/src/test/java/net/jodah/sarge/functional/HierarchicalSupervisionTest.java
@@ -6,18 +6,19 @@
 import net.jodah.sarge.Plan;
 import net.jodah.sarge.Plans;
 import net.jodah.sarge.Supervisor;
-import net.jodah.sarge.util.Duration;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.time.Duration;
+
 /**
  * @author Jonathan Halterman
  */
 @Test
 public class HierarchicalSupervisionTest extends AbstractTest {
   private static int counter;
-  private static final Plan RETRY_PLAN = Plans.retryOn(Throwable.class, 3, Duration.mins(10))
+  private static final Plan RETRY_PLAN = Plans.retryOn(Throwable.class, 3, Duration.ofMinutes(10))
       .make();
   private static final Plan ESCALATE_PLAN = Plans.escalateOn(Throwable.class).make();
 

diff --git a/src/test/java/net/jodah/sarge/functional/SelfSupervisionTest.java b/src/test/java/net/jodah/sarge/functional/SelfSupervisionTest.java
@@ -1,19 +1,18 @@
 package net.jodah.sarge.functional;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
 import net.jodah.sarge.AbstractTest;
 import net.jodah.sarge.Directive;
 import net.jodah.sarge.Plan;
 import net.jodah.sarge.SelfSupervisor;
-import net.jodah.sarge.util.Duration;
-
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
 /**
  * @author Jonathan Halterman
  */
@@ -22,7 +21,7 @@ public class SelfSupervisionTest extends AbstractTest {
   private static int counter;
   private static final Plan RETRY_PLAN = new Plan() {
     public Directive apply(Throwable cause) {
-      return Directive.Retry(3, Duration.mins(10));
+      return Directive.Retry(3, Duration.ofMinutes(10));
     }
   };
   private static final Plan ESCALATE_PLAN = new Plan() {
@@ -79,7 +78,7 @@ static class FooShortRetry implements SelfSupervisor {
     public Plan selfPlan() {
       return new Plan() {
         public Directive apply(Throwable cause) {
-          return Directive.Retry(2, Duration.millis(100));
+          return Directive.Retry(2, Duration.ofMillis(100));
         }
       };
     }

diff --git a/src/test/java/net/jodah/sarge/internal/RetryStatsTest.java b/src/test/java/net/jodah/sarge/internal/RetryStatsTest.java
@@ -1,20 +1,19 @@
 package net.jodah.sarge.internal;
 
+import org.testng.annotations.Test;
+
+import java.time.Duration;
+
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
-import net.jodah.sarge.internal.RetryDirective;
-import net.jodah.sarge.internal.RetryStats;
-import net.jodah.sarge.util.Duration;
-
-import org.testng.annotations.Test;
 
 /**
  * @author Jonathan Halterman
  */
 @Test
 public class RetryStatsTest {
   public void shouldAllowRetryWhenAttemptsNotExceeded() throws Exception {
-    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.millis(50)));
+    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.ofMillis(50)));
     assertTrue(stats.canRetry());
     stats.canRetry();
     stats.canRetry();
@@ -23,7 +22,7 @@ public void shouldAllowRetryWhenAttemptsNotExceeded() throws Exception {
   }
 
   public void shouldAllowRetryWhenAttemptsExceededOutsideOfWindow() throws Exception {
-    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.millis(50)));
+    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.ofMillis(50)));
     stats.canRetry();
     stats.canRetry();
     assertTrue(stats.canRetry());
@@ -34,7 +33,7 @@ public void shouldAllowRetryWhenAttemptsExceededOutsideOfWindow() throws Excepti
   }
 
   public void shouldNotAllowRetryWhenAttemptsExceededWithinWindow() throws Exception {
-    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.millis(50)));
+    RetryStats stats = new RetryStats(new RetryDirective(3, Duration.ofMillis(50)));
     stats.canRetry();
     assertTrue(stats.canRetry());
     stats.canRetry();