From 40cbc2ea7739b83dfe2e1e39c0ecc58a0eb269dd Mon Sep 17 00:00:00 2001 From: Jan Bernitt Date: Thu, 28 Mar 2019 16:13:05 +0100 Subject: [PATCH] PAYARA-3468 extract ChronoUnit from Config as ChronoUnit.class --- .../faulttolerance/interceptors/RetryInterceptor.java | 6 +++--- .../faulttolerance/interceptors/TimeoutInterceptor.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/RetryInterceptor.java b/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/RetryInterceptor.java index 3175285badc..583abd1c6d5 100644 --- a/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/RetryInterceptor.java +++ b/appserver/payara-appserver-modules/microprofile/fault-tolerance/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/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/TimeoutInterceptor.java b/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/TimeoutInterceptor.java index 315c8e4da13..6541f27cb7c 100644 --- a/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/main/java/fish/payara/microprofile/faulttolerance/interceptors/TimeoutInterceptor.java +++ b/appserver/payara-appserver-modules/microprofile/fault-tolerance/src/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;