Generalize delay calculation checks for positive / negative case (though only positive is used)

Author: vsilaev

src/main/java/net/tascalate/concurrent/delays/ExponentialDelayPolicy.java

@@ -55,7 +55,7 @@ public Duration delay(RetryContext context) {
         double factor = Math.pow(multiplier, context.getRetryCount());
         return DurationCalcs.safeTransform(
             initialDelay, 
-            (amount, dimIdx) -> DurationCalcs.toBoolean((double)Long.MAX_VALUE / amount > factor),
+            (amount, dimIdx) -> DurationCalcs.toBoolean((double)Long.MAX_VALUE / Math.abs(amount) > Math.abs(factor)),
             (amount, dimIdx) -> (long)(amount * factor)
         );
     }

src/main/java/net/tascalate/concurrent/delays/ProportionalRandomDelayPolicy.java

@@ -59,14 +59,14 @@ public ProportionalRandomDelayPolicy(DelayPolicy target, double multiplier, Rand
     }
 
     @Override
-    long addRandomJitter(long initialDelay, double randomizer, int dimIdx) {
+    long addRandomJitter(long amount, double randomizer, int dimIdx) {
         double randomMultiplier = (1 - 2 * randomizer) * multiplier;
-        return Math.max(0, (long) (initialDelay * (1 + randomMultiplier)));
+        return Math.max(0, (long) (amount * (1 + randomMultiplier)));
     }
 
     @Override
-    boolean checkBounds(long initialDelay, double randomizer, int dimIdx) {
+    boolean checkBounds(long amount, double randomizer, int dimIdx) {
         double randomMultiplier = (1 - 2 * randomizer) * multiplier;
-        return (double)Long.MAX_VALUE / initialDelay > 1 + randomMultiplier;
+        return (double)Long.MAX_VALUE / Math.abs(amount) > Math.abs(1 + randomMultiplier);
     }
 }

src/main/java/net/tascalate/concurrent/delays/RandomDelayPolicy.java

@@ -48,17 +48,16 @@ private RandomDelayPolicy(DelayPolicy target, Supplier<Random> randomSource) {
 
     @Override
     public Duration delay(RetryContext context) {
-        Duration initialDelay = target.delay(context);
         double randomizer = random().nextDouble();
         return DurationCalcs.safeTransform(
-            initialDelay, 
+            target.delay(context), 
             (amount, dimIdx) -> DurationCalcs.toBoolean(checkBounds(amount, randomizer, (int)dimIdx)), 
             (amount, dimIdx) -> addRandomJitter(amount, randomizer, (int)dimIdx)
         );
     }
 
-    abstract long addRandomJitter(long initialDelay, double randomizer, int dimIdx);
-    abstract boolean checkBounds(long initialDelay, double randomizer, int dimIdx);
+    abstract long addRandomJitter(long amount, double randomizer, int dimIdx);
+    abstract boolean checkBounds(long amount, double randomizer, int dimIdx);
 
     protected Random random() {
         return randomSource.get();

src/main/java/net/tascalate/concurrent/delays/UniformRandomDelayPolicy.java

@@ -68,16 +68,20 @@ public UniformRandomDelayPolicy(DelayPolicy target, Duration range, Random rando
     }
 
     @Override
-    long addRandomJitter(long initialDelay, double randomizer, int dimIdx) {
+    long addRandomJitter(long amount, double randomizer, int dimIdx) {
         long rangeNormalized = DurationCalcs.safeExtractAmount(range, dimIdx);
         double uniformRandom = (1 - randomizer * 2) * rangeNormalized;
-        return Math.max(0, (long) (initialDelay + uniformRandom));
+        return Math.max(0, (long) (amount + uniformRandom));
     }
 
     @Override
-    boolean checkBounds(long initialDelay, double randomizer, int dimIdx) {
+    boolean checkBounds(long amount, double randomizer, int dimIdx) {
         long rangeNormalized = DurationCalcs.safeExtractAmount(range, dimIdx);
         double uniformRandom = (1 - randomizer * 2) * rangeNormalized;
-        return Long.MAX_VALUE - initialDelay > uniformRandom; 
+        if (uniformRandom < 0) {
+            return -Long.MAX_VALUE + Math.abs(amount) < uniformRandom;
+        } else {
+            return Long.MAX_VALUE - Math.abs(amount) > uniformRandom;
+        }
     }
 }