From 317d0115535e0a93410a880c43ca3fe918618d14 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 17 Mar 2017 22:38:36 -0600 Subject: [PATCH] Move Route, Filter & Predicate classes to specific packages --- .../cloud/gateway/actuate/GatewayEndpoint.java | 10 +++++----- .../gateway/config/GatewayAutoConfiguration.java | 8 ++++---- .../cloud/gateway/config/GatewayProperties.java | 4 ++-- .../config/PropertiesRouteDefinitionLocator.java | 4 ++-- .../DiscoveryClientRouteDefinitionLocator.java | 8 ++++---- .../gateway/{model => filter}/FilterDefinition.java | 2 +- .../gateway/filter/RouteToRequestUrlFilter.java | 3 +-- .../cloud/gateway/handler/FilteringWebHandler.java | 4 ++-- .../handler/RequestPredicateHandlerMapping.java | 4 ++-- .../predicate}/PredicateDefinition.java | 2 +- .../predicate/QueryRequestPredicateFactory.java | 2 +- .../cloud/gateway/{model => route}/Route.java | 2 +- .../gateway/{model => route}/RouteDefinition.java | 4 +++- .../{api => route}/RouteDefinitionLocator.java | 4 ++-- .../{api => route}/RouteDefinitionRepository.java | 2 +- .../{api => route}/RouteDefinitionWriter.java | 4 ++-- .../cloud/gateway/{api => route}/RouteLocator.java | 4 ++-- .../cloud/gateway/support/ArgumentHints.java | 5 +++++ .../support/CachingRouteDefinitionLocator.java | 4 ++-- .../cloud/gateway/support/CachingRouteLocator.java | 6 ++---- .../support/CompositeRouteDefinitionLocator.java | 4 ++-- .../cloud/gateway/support/CompositeRouteLocator.java | 4 ++-- .../support/InMemoryRouteDefinitionRepository.java | 4 ++-- .../gateway/support/RouteDefinitionRouteLocator.java | 12 ++++++------ .../cloud/gateway/test/BaseWebClientTests.java | 2 +- 25 files changed, 58 insertions(+), 54 deletions(-) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{model => filter}/FilterDefinition.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{model => handler/predicate}/PredicateDefinition.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{model => route}/Route.java (98%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{model => route}/RouteDefinition.java (93%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{api => route}/RouteDefinitionLocator.java (87%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{api => route}/RouteDefinitionRepository.java (93%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{api => route}/RouteDefinitionWriter.java (88%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/{api => route}/RouteLocator.java (88%) 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 6fc9755e..12fe821c 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 @@ -24,13 +24,13 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.api.RouteDefinitionWriter; -import org.springframework.cloud.gateway.api.RouteLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionWriter; +import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; -import org.springframework.cloud.gateway.model.Route; -import org.springframework.cloud.gateway.model.RouteDefinition; +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.context.ApplicationEventPublisher; 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 8018978c..5b8b33dc 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 @@ -28,10 +28,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.gateway.actuate.GatewayEndpoint; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.api.RouteDefinitionRepository; -import org.springframework.cloud.gateway.api.RouteDefinitionWriter; -import org.springframework.cloud.gateway.api.RouteLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionRepository; +import org.springframework.cloud.gateway.route.RouteDefinitionWriter; +import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.cloud.gateway.filter.NettyRoutingFilter; import org.springframework.cloud.gateway.filter.RouteToRequestUrlFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java index 9b86f231..0fbd5e6c 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java @@ -24,8 +24,8 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.gateway.model.FilterDefinition; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.filter.FilterDefinition; +import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactory; import org.springframework.validation.annotation.Validated; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/PropertiesRouteDefinitionLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/PropertiesRouteDefinitionLocator.java index cb50662f..b5266539 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/PropertiesRouteDefinitionLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/PropertiesRouteDefinitionLocator.java @@ -17,8 +17,8 @@ package org.springframework.cloud.gateway.config; -import org.springframework.cloud.gateway.model.RouteDefinition; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; +import org.springframework.cloud.gateway.route.RouteDefinition; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; import reactor.core.publisher.Flux; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java index cf1211ed..b4df36f7 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java @@ -20,12 +20,12 @@ package org.springframework.cloud.gateway.discovery; import java.net.URI; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; import org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory; import org.springframework.cloud.gateway.handler.predicate.PathRequestPredicateFactory; -import org.springframework.cloud.gateway.model.FilterDefinition; -import org.springframework.cloud.gateway.model.PredicateDefinition; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.filter.FilterDefinition; +import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition; +import org.springframework.cloud.gateway.route.RouteDefinition; import static org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory.REGEXP_KEY; import static org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory.REPLACEMENT_KEY; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/FilterDefinition.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/FilterDefinition.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/FilterDefinition.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/FilterDefinition.java index 76afe6d1..8698e056 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/FilterDefinition.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/FilterDefinition.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.model; +package org.springframework.cloud.gateway.filter; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java index bfe1b549..61a92323 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java @@ -21,8 +21,7 @@ import java.net.URI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.model.Route; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.route.Route; import org.springframework.core.Ordered; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilterChain; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java index d7e758cb..8ca6da7f 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java @@ -22,11 +22,11 @@ import java.util.Optional; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.api.RouteLocator; +import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; -import org.springframework.cloud.gateway.model.Route; +import org.springframework.cloud.gateway.route.Route; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RequestPredicateHandlerMapping.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RequestPredicateHandlerMapping.java index bd46d8e8..6e4ae740 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RequestPredicateHandlerMapping.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RequestPredicateHandlerMapping.java @@ -19,9 +19,9 @@ package org.springframework.cloud.gateway.handler; import java.util.function.Function; -import org.springframework.cloud.gateway.api.RouteLocator; +import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.handler.support.ExchangeServerRequest; -import org.springframework.cloud.gateway.model.Route; +import org.springframework.cloud.gateway.route.Route; import org.springframework.web.reactive.handler.AbstractHandlerMapping; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebHandler; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/PredicateDefinition.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateDefinition.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/PredicateDefinition.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateDefinition.java index 086d839a..94742c7d 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/PredicateDefinition.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateDefinition.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.model; +package org.springframework.cloud.gateway.handler.predicate; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRequestPredicateFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRequestPredicateFactory.java index d06487bb..762949e9 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRequestPredicateFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRequestPredicateFactory.java @@ -46,7 +46,7 @@ public class QueryRequestPredicateFactory implements RequestPredicateFactory { @Override public RequestPredicate apply(Tuple args) { - validate(1, args); + validateMin(1, args); String param = args.getString(PARAM_KEY); if (!args.hasFieldName(REGEXP_KEY)) { diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/Route.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/Route.java similarity index 98% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/Route.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/Route.java index c048d669..e2dd2161 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/Route.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/Route.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.model; +package org.springframework.cloud.gateway.route; import java.net.URI; import java.util.ArrayList; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/RouteDefinition.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java similarity index 93% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/RouteDefinition.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java index a56ae805..403a654b 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/RouteDefinition.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java @@ -15,9 +15,11 @@ * */ -package org.springframework.cloud.gateway.model; +package org.springframework.cloud.gateway.route; import org.hibernate.validator.constraints.NotEmpty; +import org.springframework.cloud.gateway.filter.FilterDefinition; +import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition; import javax.validation.Valid; import javax.validation.ValidationException; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionLocator.java similarity index 87% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionLocator.java index 91ec3d49..0e87938e 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionLocator.java @@ -15,9 +15,9 @@ * */ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.route; -import org.springframework.cloud.gateway.model.RouteDefinition; +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/api/RouteDefinitionRepository.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRepository.java similarity index 93% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionRepository.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRepository.java index 80fcb049..16b6cb3c 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionRepository.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRepository.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.route; /** * @author Spencer Gibb diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionWriter.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionWriter.java similarity index 88% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionWriter.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionWriter.java index 9e95316d..225a541b 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionWriter.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionWriter.java @@ -15,9 +15,9 @@ * */ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.route; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.route.RouteDefinition; import reactor.core.publisher.Mono; /** diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteLocator.java similarity index 88% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteLocator.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteLocator.java index c52d8334..0dc49ce4 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteLocator.java @@ -15,9 +15,9 @@ * */ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.route; -import org.springframework.cloud.gateway.model.Route; +import org.springframework.cloud.gateway.route.Route; import reactor.core.publisher.Flux; /** diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ArgumentHints.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ArgumentHints.java index 37c0acb5..852464c7 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ArgumentHints.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ArgumentHints.java @@ -49,4 +49,9 @@ public interface ArgumentHints { Assert.isTrue(args != null && args.size() == requiredSize, "args must have "+ requiredSize +" entry(s)"); } + + default void validateMin(int minSize, Tuple args) { + Assert.isTrue(args != null && args.size() >= minSize, + "args must have at least "+ minSize +" entry(s)"); + } } 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/support/CachingRouteDefinitionLocator.java index a6c4b9d6..0be237b4 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/support/CachingRouteDefinitionLocator.java @@ -20,8 +20,8 @@ package org.springframework.cloud.gateway.support; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.model.RouteDefinition; +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/support/CachingRouteLocator.java index 45302876..911ff37b 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/support/CachingRouteLocator.java @@ -20,10 +20,8 @@ package org.springframework.cloud.gateway.support; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.api.RouteLocator; -import org.springframework.cloud.gateway.model.Route; -import org.springframework.cloud.gateway.model.RouteDefinition; +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/support/CompositeRouteDefinitionLocator.java index af5a4ca3..f00890bd 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/support/CompositeRouteDefinitionLocator.java @@ -17,8 +17,8 @@ package org.springframework.cloud.gateway.support; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.model.RouteDefinition; +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/support/CompositeRouteLocator.java index 12bb39bd..76f6353b 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/support/CompositeRouteLocator.java @@ -17,8 +17,8 @@ package org.springframework.cloud.gateway.support; -import org.springframework.cloud.gateway.api.RouteLocator; -import org.springframework.cloud.gateway.model.Route; +import org.springframework.cloud.gateway.route.RouteLocator; +import org.springframework.cloud.gateway.route.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/support/InMemoryRouteDefinitionRepository.java index c07b2c69..abc45159 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/support/InMemoryRouteDefinitionRepository.java @@ -20,8 +20,8 @@ package org.springframework.cloud.gateway.support; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.cloud.gateway.api.RouteDefinitionRepository; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.route.RouteDefinitionRepository; +import org.springframework.cloud.gateway.route.RouteDefinition; import static java.util.Collections.synchronizedMap; 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/support/RouteDefinitionRouteLocator.java index 5e68dfc1..70d9d3b7 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/support/RouteDefinitionRouteLocator.java @@ -19,16 +19,16 @@ package org.springframework.cloud.gateway.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.api.RouteDefinitionLocator; -import org.springframework.cloud.gateway.api.RouteLocator; +import org.springframework.cloud.gateway.route.RouteDefinitionLocator; +import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.handler.predicate.RequestPredicateFactory; -import org.springframework.cloud.gateway.model.FilterDefinition; -import org.springframework.cloud.gateway.model.PredicateDefinition; -import org.springframework.cloud.gateway.model.Route; -import org.springframework.cloud.gateway.model.RouteDefinition; +import org.springframework.cloud.gateway.filter.FilterDefinition; +import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition; +import org.springframework.cloud.gateway.route.Route; +import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.tuple.Tuple; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java index 4b72dfaf..45e00c6d 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.gateway.EnableGateway; import org.springframework.cloud.gateway.filter.GlobalFilter; -import org.springframework.cloud.gateway.model.Route; +import org.springframework.cloud.gateway.route.Route; import org.springframework.cloud.netflix.ribbon.RibbonClient; import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.StaticServerList;