From cee2dc71ed4d700634f1eab3cb068b4d9648eb38 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 15 Mar 2017 10:55:00 -0600 Subject: [PATCH] Rename filter.route package to filter.factory --- .../gateway/actuate/GatewayEndpoint.java | 2 +- .../config/GatewayAutoConfiguration.java | 32 +++++++++---------- .../gateway/config/GatewayProperties.java | 2 +- .../DiscoveryClientRouteLocator.java | 2 +- .../AddRequestHeaderWebFilterFactory.java | 2 +- .../AddRequestParameterWebFilterFactory.java | 2 +- .../AddResponseHeaderWebFilterFactory.java | 2 +- .../HystrixWebFilterFactory.java | 2 +- .../PrefixPathWebFilterFactory.java | 2 +- .../RedirectToWebFilterFactory.java | 2 +- ...RemoveNonProxyHeadersWebFilterFactory.java | 2 +- .../RemoveRequestHeaderWebFilterFactory.java | 2 +- .../RemoveResponseHeaderWebFilterFactory.java | 2 +- .../RewritePathWebFilterFactory.java | 2 +- .../SecureHeadersProperties.java | 2 +- .../SecureHeadersWebFilterFactory.java | 2 +- .../SetPathWebFilterFactory.java | 2 +- .../SetResponseHeaderWebFilterFactory.java | 2 +- .../SetStatusWebFilterFactory.java | 2 +- .../{route => factory}/WebFilterFactory.java | 3 +- .../gateway/handler/FilteringWebHandler.java | 2 +- .../cloud/gateway/support/NameUtils.java | 2 +- ...AddRequestHeaderWebFilterFactoryTests.java | 2 +- ...RequestParameterWebFilterFactoryTests.java | 2 +- .../HystrixWebFilterFactoryTests.java | 2 +- .../RedirectToWebFilterFactoryTests.java | 2 +- ...eNonProxyHeadersWebFilterFactoryTests.java | 4 +-- ...oveRequestHeaderWebFilterFactoryTests.java | 2 +- ...veResponseHeaderWebFilterFactoryTests.java | 2 +- ...ePathWebFilterFactoryIntegrationTests.java | 2 +- .../RewritePathWebFilterFactoryTests.java | 2 +- .../SecureHeadersWebFilterFactoryTests.java | 18 +++++------ ...tPathWebFilterFactoryIntegrationTests.java | 2 +- .../SetPathWebFilterFactoryTests.java | 2 +- .../SetResponseWebFilterFactoryTests.java | 2 +- .../SetStatusWebFilterFactoryTests.java | 2 +- .../cloud/gateway/test/AdhocTestSuite.java | 26 +++++++-------- 37 files changed, 73 insertions(+), 74 deletions(-) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/AddRequestHeaderWebFilterFactory.java (95%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/AddRequestParameterWebFilterFactory.java (98%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/AddResponseHeaderWebFilterFactory.java (94%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/HystrixWebFilterFactory.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/PrefixPathWebFilterFactory.java (95%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/RedirectToWebFilterFactory.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveNonProxyHeadersWebFilterFactory.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveRequestHeaderWebFilterFactory.java (95%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveResponseHeaderWebFilterFactory.java (94%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/RewritePathWebFilterFactory.java (95%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/SecureHeadersProperties.java (98%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/SecureHeadersWebFilterFactory.java (97%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/SetPathWebFilterFactory.java (96%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/SetResponseHeaderWebFilterFactory.java (94%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/SetStatusWebFilterFactory.java (96%) rename spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/{route => factory}/WebFilterFactory.java (93%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/AddRequestHeaderWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/AddRequestParameterWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/HystrixWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RedirectToWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveNonProxyHeadersWebFilterFactoryTests.java (93%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveRequestHeaderWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RemoveResponseHeaderWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RewritePathWebFilterFactoryIntegrationTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/RewritePathWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/SecureHeadersWebFilterFactoryTests.java (75%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/SetPathWebFilterFactoryIntegrationTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/SetPathWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/SetResponseWebFilterFactoryTests.java (97%) rename spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/{route => factory}/SetStatusWebFilterFactoryTests.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 a93f9c2f6..98ae21dac 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 @@ -29,7 +29,7 @@ import org.springframework.cloud.gateway.model.Route; import org.springframework.cloud.gateway.api.RouteLocator; import org.springframework.cloud.gateway.api.RouteWriter; import org.springframework.cloud.gateway.filter.GlobalFilter; -import org.springframework.cloud.gateway.filter.route.WebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.handler.FilteringWebHandler; import org.springframework.cloud.gateway.support.NotFoundException; import org.springframework.cloud.gateway.support.RefreshRoutesEvent; 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 34c321c72..e6d054805 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 @@ -33,22 +33,22 @@ import org.springframework.cloud.gateway.filter.LoadBalancerClientFilter; import org.springframework.cloud.gateway.filter.NettyRoutingFilter; import org.springframework.cloud.gateway.filter.RouteToRequestUrlFilter; import org.springframework.cloud.gateway.filter.WriteResponseFilter; -import org.springframework.cloud.gateway.filter.route.AddRequestHeaderWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.AddRequestParameterWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.AddResponseHeaderWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.HystrixWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.PrefixPathWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.RedirectToWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.RemoveNonProxyHeadersWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.RemoveRequestHeaderWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.RemoveResponseHeaderWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.RewritePathWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.SetResponseHeaderWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.WebFilterFactory; -import org.springframework.cloud.gateway.filter.route.SecureHeadersProperties; -import org.springframework.cloud.gateway.filter.route.SetPathWebFilterFactory; -import org.springframework.cloud.gateway.filter.route.SetStatusWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.AddRequestHeaderWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.AddRequestParameterWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.AddResponseHeaderWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.HystrixWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.PrefixPathWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RedirectToWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RemoveRequestHeaderWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RemoveResponseHeaderWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.SetResponseHeaderWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.SecureHeadersProperties; +import org.springframework.cloud.gateway.filter.factory.SetPathWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.SetStatusWebFilterFactory; import org.springframework.cloud.gateway.handler.FilteringWebHandler; import org.springframework.cloud.gateway.handler.NettyRoutingWebHandler; import org.springframework.cloud.gateway.handler.RequestPredicateHandlerMapping; 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 6120b40bf..340693ae4 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 @@ -26,7 +26,7 @@ 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.Route; -import org.springframework.cloud.gateway.filter.route.RemoveNonProxyHeadersWebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactory; import static org.springframework.cloud.gateway.support.NameUtils.normalizeFilterName; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteLocator.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteLocator.java index c768b28bb..478cf02d7 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteLocator.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteLocator.java @@ -22,7 +22,7 @@ import java.util.Collections; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.gateway.api.RouteLocator; -import org.springframework.cloud.gateway.filter.route.RewritePathWebFilterFactory; +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; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactory.java similarity index 95% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactory.java index 65393a581..767879b37 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactory.java similarity index 98% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactory.java index 68b4624b6..3181aa5bf 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddResponseHeaderWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddResponseHeaderWebFilterFactory.java similarity index 94% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddResponseHeaderWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddResponseHeaderWebFilterFactory.java index 47c2d7815..484cb27d7 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/AddResponseHeaderWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/AddResponseHeaderWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactory.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactory.java index 5b10fbd2b..a31699940 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/PrefixPathWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/PrefixPathWebFilterFactory.java similarity index 95% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/PrefixPathWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/PrefixPathWebFilterFactory.java index 4d6fa2176..0b8f8e236 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/PrefixPathWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/PrefixPathWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactory.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactory.java index c697fd653..549030353 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.net.MalformedURLException; import java.net.URI; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactory.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactory.java index 26853a0e9..8428394f9 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactory.java similarity index 95% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactory.java index 97e86b0de..d0d199f9e 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactory.java similarity index 94% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactory.java index 487e3ddca..f252b38df 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactory.java similarity index 95% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactory.java index ec0009ffc..f6310f783 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; import org.springframework.http.server.reactive.ServerHttpRequest; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersProperties.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersProperties.java similarity index 98% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersProperties.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersProperties.java index e7db58026..01c02d28a 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersProperties.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersProperties.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactory.java similarity index 97% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactory.java index 6fb550b27..72aa1b2dd 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.http.HttpHeaders; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactory.java similarity index 96% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactory.java index ce0f4e459..9b572ec78 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.net.URI; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetResponseHeaderWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetResponseHeaderWebFilterFactory.java similarity index 94% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetResponseHeaderWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetResponseHeaderWebFilterFactory.java index 33cc20101..f9d84d32f 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetResponseHeaderWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetResponseHeaderWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.web.server.WebFilter; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactory.java similarity index 96% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactory.java index f8c4a49b5..0d19f0d79 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactory.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.cloud.gateway.support.ServerWebExchangeUtils; import org.springframework.http.HttpStatus; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/WebFilterFactory.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/WebFilterFactory.java similarity index 93% rename from spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/WebFilterFactory.java rename to spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/WebFilterFactory.java index 64a4e3596..793d3b069 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/route/WebFilterFactory.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/factory/WebFilterFactory.java @@ -15,8 +15,7 @@ * */ -//TODO: move to package factory -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.springframework.cloud.gateway.support.NameUtils; import org.springframework.util.Assert; 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 8be034232..f65a806d5 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 @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.gateway.filter.route.WebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.model.FilterDefinition; import org.springframework.cloud.gateway.model.Route; import org.springframework.cloud.gateway.config.GatewayProperties; diff --git a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/NameUtils.java b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/NameUtils.java index a0418543e..7195c2152 100644 --- a/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/NameUtils.java +++ b/spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/NameUtils.java @@ -17,7 +17,7 @@ package org.springframework.cloud.gateway.support; -import org.springframework.cloud.gateway.filter.route.WebFilterFactory; +import org.springframework.cloud.gateway.filter.factory.WebFilterFactory; import org.springframework.cloud.gateway.handler.predicate.RequestPredicateFactory; /** diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactoryTests.java index 78d02c7c1..34e2b31d0 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestHeaderWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestHeaderWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactoryTests.java index 3061bd005..4a3056ca0 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/AddRequestParameterWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/AddRequestParameterWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactoryTests.java index cba6ccd6f..575683906 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/HystrixWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/HystrixWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactoryTests.java index d2071a96a..2ce638f0e 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RedirectToWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RedirectToWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactoryTests.java similarity index 93% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactoryTests.java index aacd673c7..e51b0e957 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveNonProxyHeadersWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveNonProxyHeadersWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.util.Map; @@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.cloud.gateway.filter.route.RemoveNonProxyHeadersWebFilterFactory.DEFAULT_HEADERS_TO_REMOVE; +import static org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactory.DEFAULT_HEADERS_TO_REMOVE; import static org.springframework.cloud.gateway.test.TestUtils.getMap; import static org.springframework.web.reactive.function.BodyExtractors.toMono; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactoryTests.java index 49ced45b3..258f77396 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveRequestHeaderWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveRequestHeaderWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.util.Map; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactoryTests.java index afb6ce31d..8f5a5dd4d 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RemoveResponseHeaderWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RemoveResponseHeaderWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryIntegrationTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryIntegrationTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryIntegrationTests.java index 2487656ae..beff82bfe 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryIntegrationTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java index 950f0aebf..e8db68116 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/RewritePathWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/RewritePathWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactoryTests.java similarity index 75% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactoryTests.java index 0c2bac5b6..560e4198e 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SecureHeadersWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,14 +32,14 @@ import org.springframework.web.reactive.function.client.ClientResponse; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.CONTENT_SECURITY_POLICY_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.REFERRER_POLICY_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.STRICT_TRANSPORT_SECURITY_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.X_CONTENT_TYPE_OPTIONS_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.X_DOWNLOAD_OPTIONS_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.X_FRAME_OPTIONS_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER; -import static org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactory.X_XSS_PROTECTION_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.CONTENT_SECURITY_POLICY_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.REFERRER_POLICY_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.STRICT_TRANSPORT_SECURITY_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.X_CONTENT_TYPE_OPTIONS_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.X_DOWNLOAD_OPTIONS_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.X_FRAME_OPTIONS_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER; +import static org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactory.X_XSS_PROTECTION_HEADER; import static org.springframework.cloud.gateway.test.TestUtils.assertStatus; import reactor.core.publisher.Mono; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryIntegrationTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryIntegrationTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryIntegrationTests.java index ba1075fbf..d593e2621 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryIntegrationTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java index db26bf64b..43542d14b 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetPathWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import java.util.HashMap; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetResponseWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetResponseWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetResponseWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetResponseWebFilterFactoryTests.java index c39cd89bd..0e32895f4 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetResponseWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetResponseWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactoryTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactoryTests.java similarity index 97% rename from spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactoryTests.java rename to spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactoryTests.java index 532b352b3..3a0c959dc 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/route/SetStatusWebFilterFactoryTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/factory/SetStatusWebFilterFactoryTests.java @@ -15,7 +15,7 @@ * */ -package org.springframework.cloud.gateway.filter.route; +package org.springframework.cloud.gateway.filter.factory; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java index ead6b78d9..201f65fdd 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/AdhocTestSuite.java @@ -21,19 +21,19 @@ import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.cloud.gateway.filter.route.AddRequestHeaderWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.AddRequestParameterWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.HystrixWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.RedirectToWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.RemoveNonProxyHeadersWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.RemoveRequestHeaderWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.RewritePathWebFilterFactoryIntegrationTests; -import org.springframework.cloud.gateway.filter.route.RewritePathWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.SecureHeadersWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.SetPathWebFilterFactoryIntegrationTests; -import org.springframework.cloud.gateway.filter.route.SetPathWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.SetResponseWebFilterFactoryTests; -import org.springframework.cloud.gateway.filter.route.SetStatusWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.AddRequestHeaderWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.AddRequestParameterWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.HystrixWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.RedirectToWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.RemoveRequestHeaderWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactoryIntegrationTests; +import org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.SecureHeadersWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.SetPathWebFilterFactoryIntegrationTests; +import org.springframework.cloud.gateway.filter.factory.SetPathWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.SetResponseWebFilterFactoryTests; +import org.springframework.cloud.gateway.filter.factory.SetStatusWebFilterFactoryTests; import org.springframework.cloud.gateway.handler.predicate.AfterRequestPredicateFactoryTests; import org.springframework.cloud.gateway.handler.predicate.BeforeRequestPredicateFactoryTests; import org.springframework.cloud.gateway.handler.predicate.BetweenRequestPredicateFactoryTests;