From 7dce9c237835ea0e0d6ab5830aa957203c3b48e7 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 27 Jan 2017 21:31:43 -0700 Subject: [PATCH] Move RouteLocator impls to support --- .../cloud/gateway/actuate/GatewayEndpoint.java | 2 +- .../cloud/gateway/config/GatewayAutoConfiguration.java | 2 +- .../cloud/gateway/{api => support}/CachingRouteLocator.java | 4 +++- .../cloud/gateway/{api => support}/CompositeRouteLocator.java | 4 +++- .../cloud/gateway/test/GatewayTestApplication.java | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) rename src/main/java/org/springframework/cloud/gateway/{api => support}/CachingRouteLocator.java (84%) rename src/main/java/org/springframework/cloud/gateway/{api => support}/CompositeRouteLocator.java (70%) diff --git a/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java b/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java index 2d32065f..ac3f6d57 100644 --- a/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java +++ b/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.springframework.cloud.gateway.api.CachingRouteLocator; +import org.springframework.cloud.gateway.support.CachingRouteLocator; import org.springframework.cloud.gateway.api.RouteLocator; import org.springframework.cloud.gateway.api.Route; import org.springframework.cloud.gateway.filter.GlobalFilter; diff --git a/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java index 3c84969f..27c8b6d3 100644 --- a/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.gateway.actuate.GatewayEndpoint; -import org.springframework.cloud.gateway.api.CachingRouteLocator; +import org.springframework.cloud.gateway.support.CachingRouteLocator; import org.springframework.cloud.gateway.api.RouteLocator; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.cloud.gateway.filter.LoadBalancerClientFilter; diff --git a/src/main/java/org/springframework/cloud/gateway/api/CachingRouteLocator.java b/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java similarity index 84% rename from src/main/java/org/springframework/cloud/gateway/api/CachingRouteLocator.java rename to src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java index 6a4cda55..57ad1141 100644 --- a/src/main/java/org/springframework/cloud/gateway/api/CachingRouteLocator.java +++ b/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java @@ -1,8 +1,10 @@ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.support; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import org.springframework.cloud.gateway.api.Route; +import org.springframework.cloud.gateway.api.RouteLocator; import reactor.core.publisher.Flux; /** diff --git a/src/main/java/org/springframework/cloud/gateway/api/CompositeRouteLocator.java b/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java similarity index 70% rename from src/main/java/org/springframework/cloud/gateway/api/CompositeRouteLocator.java rename to src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java index 3bb2bc76..cce17f7d 100644 --- a/src/main/java/org/springframework/cloud/gateway/api/CompositeRouteLocator.java +++ b/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java @@ -1,5 +1,7 @@ -package org.springframework.cloud.gateway.api; +package org.springframework.cloud.gateway.support; +import org.springframework.cloud.gateway.api.Route; +import org.springframework.cloud.gateway.api.RouteLocator; import reactor.core.publisher.Flux; /** diff --git a/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java b/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java index 46eace07..552da4f6 100644 --- a/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java +++ b/src/test/java/org/springframework/cloud/gateway/test/GatewayTestApplication.java @@ -5,8 +5,8 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.gateway.api.CachingRouteLocator; -import org.springframework.cloud.gateway.api.CompositeRouteLocator; +import org.springframework.cloud.gateway.support.CachingRouteLocator; +import org.springframework.cloud.gateway.support.CompositeRouteLocator; import org.springframework.cloud.gateway.api.RouteLocator; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.config.PropertiesRouteLocator;