PAYARA-3468 extract ChronoUnit from Config as ChronoUnit.class

payara · Mar 28, 2019 · 40cbc2e · 40cbc2e
1 parent 143e9f6
commit 40cbc2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../src/main/java/fish/payara/microprofile/faulttolerance/interceptors/RetryInterceptor.java b/.../src/main/java/fish/payara/microprofile/faulttolerance/interceptors/RetryInterceptor.java
@@ -241,21 +241,21 @@ private Object retry(InvocationContext invocationContext) throws Exception {
                 .orElse(retry.delay());
             // Look for a String and cast to ChronoUnit - Use the Common Sense Convertor
             ChronoUnit delayUnit = FaultToleranceCdiUtils.getOverrideValue(
-                config, Retry.class, "delayUnit", invocationContext, String.class).map(ChronoUnit::valueOf)
+                config, Retry.class, "delayUnit", invocationContext, ChronoUnit.class)
                 .orElse(retry.delayUnit());
             long maxDuration = FaultToleranceCdiUtils.getOverrideValue(
                 config, Retry.class, "maxDuration", invocationContext, Long.class)
                 .orElse(retry.maxDuration());
             // Look for a String and cast to ChronoUnit - Use the Common Sense Convertor
             ChronoUnit durationUnit = FaultToleranceCdiUtils.getOverrideValue(
-                config, Retry.class, "durationUnit", invocationContext, String.class).map(ChronoUnit::valueOf)
+                config, Retry.class, "durationUnit", invocationContext, ChronoUnit.class)
                 .orElse(retry.durationUnit());
             long jitter = FaultToleranceCdiUtils.getOverrideValue(
                 config, Retry.class, "jitter", invocationContext, Long.class)
                 .orElse(retry.jitter());
             // Look for a String and cast to ChronoUnit - Use the Common Sense Convertor
             ChronoUnit jitterDelayUnit = FaultToleranceCdiUtils.getOverrideValue(
-                config, Retry.class, "jitterDelayUnit", invocationContext, String.class).map(ChronoUnit::valueOf)
+                config, Retry.class, "jitterDelayUnit", invocationContext, ChronoUnit.class)
                 .orElse(retry.jitterDelayUnit());
 
             long delayMillis = Duration.of(delay, delayUnit).toMillis();

diff --git a/...rc/main/java/fish/payara/microprofile/faulttolerance/interceptors/TimeoutInterceptor.java b/...rc/main/java/fish/payara/microprofile/faulttolerance/interceptors/TimeoutInterceptor.java
@@ -194,7 +194,7 @@ private Object timeout(InvocationContext invocationContext) throws Exception {
                 .orElse(timeout.value());
         // Look for a String and cast to ChronoUnit - Use the Common Sense Convertor
         ChronoUnit unit = FaultToleranceCdiUtils.getOverrideValue(
-                config, Timeout.class, "unit", invocationContext, String.class).map(ChronoUnit::valueOf)
+                config, Timeout.class, "unit", invocationContext, ChronoUnit.class)
                 .orElse(timeout.unit());
 
         Future<?> timeoutFuture = null;