From 69982364e7e1db7d6156f8cfc153596b33e1175c Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 4 Dec 2018 15:57:01 -0500 Subject: [PATCH] Removes conversion method --- .../predicate/AfterRoutePredicateFactory.java | 4 +-- .../BeforeRoutePredicateFactory.java | 4 +-- .../BetweenRoutePredicateFactory.java | 30 ++----------------- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/AfterRoutePredicateFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/AfterRoutePredicateFactory.java index 7174336d..25b6a6bc 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/AfterRoutePredicateFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/AfterRoutePredicateFactory.java @@ -26,8 +26,6 @@ import org.springframework.web.server.ServerWebExchange; import javax.validation.constraints.NotNull; -import static org.springframework.cloud.gateway.handler.predicate.BetweenRoutePredicateFactory.getZonedDateTime; - /** * @author Spencer Gibb */ @@ -46,7 +44,7 @@ public class AfterRoutePredicateFactory extends AbstractRoutePredicateFactory apply(Config config) { - ZonedDateTime datetime = getZonedDateTime(config.getDatetime()); + ZonedDateTime datetime = config.getDatetime(); return exchange -> { final ZonedDateTime now = ZonedDateTime.now(); return now.isAfter(datetime); diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BeforeRoutePredicateFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BeforeRoutePredicateFactory.java index be9bfcea..0f026d68 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BeforeRoutePredicateFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BeforeRoutePredicateFactory.java @@ -24,8 +24,6 @@ import java.util.function.Predicate; import org.springframework.web.server.ServerWebExchange; -import static org.springframework.cloud.gateway.handler.predicate.BetweenRoutePredicateFactory.getZonedDateTime; - /** * @author Spencer Gibb */ @@ -44,7 +42,7 @@ public class BeforeRoutePredicateFactory extends AbstractRoutePredicateFactory apply(Config config) { - ZonedDateTime datetime = getZonedDateTime(config.getDatetime()); + ZonedDateTime datetime = config.getDatetime(); return exchange -> { final ZonedDateTime now = ZonedDateTime.now(); return now.isBefore(datetime); diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactory.java index 3766e445..909fc15f 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/BetweenRoutePredicateFactory.java @@ -49,9 +49,8 @@ public class BetweenRoutePredicateFactory extends AbstractRoutePredicateFactory< @Override public Predicate apply(Config config) { - //TODO: figure out boot conversion - ZonedDateTime datetime1 = getZonedDateTime(config.datetime1); - ZonedDateTime datetime2 = getZonedDateTime(config.datetime2); + ZonedDateTime datetime1 = config.datetime1; + ZonedDateTime datetime2 = config.datetime2; Assert.isTrue(datetime1.isBefore(datetime2), config.datetime1 + " must be before " + config.datetime2); @@ -88,29 +87,4 @@ public class BetweenRoutePredicateFactory extends AbstractRoutePredicateFactory< } } - public static ZonedDateTime getZonedDateTime(Object value) { - ZonedDateTime dateTime; - if (value instanceof ZonedDateTime) { - dateTime = ZonedDateTime.class.cast(value); - } else { - dateTime = parseZonedDateTime(value.toString()); - } - return dateTime; - } - - public static ZonedDateTime parseZonedDateTime(String dateString) { - ZonedDateTime dateTime; - try { - long epoch = Long.parseLong(dateString); - - dateTime = Instant.ofEpochMilli(epoch).atOffset(ZoneOffset.ofTotalSeconds(0)) - .toZonedDateTime(); - } catch (NumberFormatException e) { - // try ZonedDateTime instead - dateTime = ZonedDateTime.parse(dateString); - } - - return dateTime; - } - }