From d0f97ca8ed386fcf66ce8f09b169de731f2ee3c5 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Mar 2017 23:09:45 -0600 Subject: [PATCH] Move Route helpers to route package --- .../cloud/gateway/actuate/GatewayEndpoint.java | 2 +- .../cloud/gateway/config/GatewayAutoConfiguration.java | 10 +++++----- .../CachingRouteDefinitionLocator.java | 4 +--- .../{support => route}/CachingRouteLocator.java | 4 +--- .../CompositeRouteDefinitionLocator.java | 4 +--- .../{support => route}/CompositeRouteLocator.java | 5 +---- .../InMemoryRouteDefinitionRepository.java | 5 ++--- .../gateway/{support => route}/RefreshRoutesEvent.java | 2 +- .../RouteDefinitionRouteLocator.java | 4 +++- 9 files changed, 16 insertions(+), 24 deletions(-) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/CachingRouteDefinitionLocator.java (90%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/CachingRouteLocator.java (91%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/CompositeRouteDefinitionLocator.java (85%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/CompositeRouteLocator.java (85%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/InMemoryRouteDefinitionRepository.java (89%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/RefreshRoutesEvent.java (95%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{support => route}/RouteDefinitionRouteLocator.java (97%) diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java index 12fe821c..4363ed76 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java @@ -32,7 +32,7 @@ import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.route.Route; import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.cloud.gateway.support.NotFoundException; -import org.springframework.cloud.gateway.support.RefreshRoutesEvent; +import org.springframework.cloud.gateway.route.RefreshRoutesEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.core.Ordered; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 3abba6ee..1899d1c9 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -66,11 +66,11 @@ import org.springframework.cloud.gateway.handler.predicate.PathRequestPredicateF import org.springframework.cloud.gateway.handler.predicate.QueryRequestPredicateFactory; import org.springframework.cloud.gateway.handler.predicate.RemoteAddrRequestPredicateFactory; import org.springframework.cloud.gateway.handler.predicate.RequestPredicateFactory; -import org.springframework.cloud.gateway.support.CachingRouteLocator; -import org.springframework.cloud.gateway.support.CompositeRouteDefinitionLocator; -import org.springframework.cloud.gateway.support.CompositeRouteLocator; -import org.springframework.cloud.gateway.support.InMemoryRouteDefinitionRepository; -import org.springframework.cloud.gateway.support.RouteDefinitionRouteLocator; +import org.springframework.cloud.gateway.route.CachingRouteLocator; +import org.springframework.cloud.gateway.route.CompositeRouteDefinitionLocator; +import org.springframework.cloud.gateway.route.CompositeRouteLocator; +import org.springframework.cloud.gateway.route.InMemoryRouteDefinitionRepository; +import org.springframework.cloud.gateway.route.RouteDefinitionRouteLocator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteDefinitionLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteDefinitionLocator.java similarity index 90% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteDefinitionLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteDefinitionLocator.java index 0be237b4..dcbfcb27 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteDefinitionLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteDefinitionLocator.java @@ -15,13 +15,11 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.springframework.cloud.gateway.route.RouteDefinitionLocator; -import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.context.event.EventListener; import reactor.core.publisher.Flux; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteLocator.java similarity index 91% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteLocator.java index 911ff37b..79ea88c5 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CachingRouteLocator.java @@ -15,13 +15,11 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.springframework.cloud.gateway.route.RouteLocator; -import org.springframework.cloud.gateway.route.Route; import org.springframework.context.event.EventListener; import reactor.core.publisher.Flux; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteDefinitionLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteDefinitionLocator.java similarity index 85% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteDefinitionLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteDefinitionLocator.java index f00890bd..aefc17f4 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteDefinitionLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteDefinitionLocator.java @@ -15,10 +15,8 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; -import org.springframework.cloud.gateway.route.RouteDefinitionLocator; -import org.springframework.cloud.gateway.route.RouteDefinition; import reactor.core.publisher.Flux; /** diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteLocator.java similarity index 85% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteLocator.java index 76f6353b..c7aef785 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/CompositeRouteLocator.java @@ -15,10 +15,7 @@ * */ -package org.springframework.cloud.gateway.support; - -import org.springframework.cloud.gateway.route.RouteLocator; -import org.springframework.cloud.gateway.route.Route; +package org.springframework.cloud.gateway.route; import reactor.core.publisher.Flux; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/InMemoryRouteDefinitionRepository.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/InMemoryRouteDefinitionRepository.java similarity index 89% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/InMemoryRouteDefinitionRepository.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/InMemoryRouteDefinitionRepository.java index abc45159..48bb4db5 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/InMemoryRouteDefinitionRepository.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/InMemoryRouteDefinitionRepository.java @@ -15,13 +15,12 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.cloud.gateway.route.RouteDefinitionRepository; -import org.springframework.cloud.gateway.route.RouteDefinition; +import org.springframework.cloud.gateway.support.NotFoundException; import static java.util.Collections.synchronizedMap; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RefreshRoutesEvent.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RefreshRoutesEvent.java similarity index 95% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RefreshRoutesEvent.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RefreshRoutesEvent.java index 597f706c..1827f284 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RefreshRoutesEvent.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RefreshRoutesEvent.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; import org.springframework.context.ApplicationEvent; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RouteDefinitionRouteLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RouteDefinitionRouteLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java index ac7b7ad9..566fb735 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RouteDefinitionRouteLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRouteLocator.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.support; +package org.springframework.cloud.gateway.route; import java.util.ArrayList; import java.util.HashMap; @@ -36,6 +36,8 @@ import org.springframework.cloud.gateway.route.Route; import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.cloud.gateway.route.RouteDefinitionLocator; import org.springframework.cloud.gateway.route.RouteLocator; +import org.springframework.cloud.gateway.support.ArgumentHints; +import org.springframework.cloud.gateway.support.NameUtils; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.tuple.Tuple; import org.springframework.tuple.TupleBuilder;