From a431b7ed9aac388b4611afe754bfa974356625de Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Sat, 14 Jan 2017 11:24:43 -0700 Subject: [PATCH] Rename PredicateFactory -> RoutePredicate --- .../config/GatewayAutoConfiguration.java | 52 +++++++++---------- .../filter/route/SetPathRouteFilter.java | 2 +- .../GatewayPredicateHandlerMapping.java | 16 +++--- ...Factory.java => CookieRoutePredicate.java} | 2 +- ...Factory.java => HeaderRoutePredicate.java} | 2 +- ...teFactory.java => HostRoutePredicate.java} | 2 +- ...Factory.java => MethodRoutePredicate.java} | 2 +- ...eFactory.java => QueryRoutePredicate.java} | 2 +- ...dicateFactory.java => RoutePredicate.java} | 2 +- ...ateFactory.java => UrlRoutePredicate.java} | 2 +- .../filter/route/SetPathRouteFilterTests.java | 4 +- 11 files changed, 44 insertions(+), 44 deletions(-) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{CookiePredicateFactory.java => CookieRoutePredicate.java} (92%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{HeaderPredicateFactory.java => HeaderRoutePredicate.java} (91%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{HostPredicateFactory.java => HostRoutePredicate.java} (91%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{MethodPredicateFactory.java => MethodRoutePredicate.java} (88%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{QueryPredicateFactory.java => QueryRoutePredicate.java} (92%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{PredicateFactory.java => RoutePredicate.java} (87%) rename src/main/java/org/springframework/cloud/gateway/handler/predicate/{UrlPredicateFactory.java => UrlRoutePredicate.java} (95%) 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 b813527b..9f74312d 100644 --- a/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java +++ b/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java @@ -23,13 +23,13 @@ import org.springframework.cloud.gateway.filter.route.SetStatusRouteFilter; import org.springframework.cloud.gateway.handler.GatewayFilteringWebHandler; import org.springframework.cloud.gateway.handler.GatewayPredicateHandlerMapping; import org.springframework.cloud.gateway.handler.GatewayWebHandler; -import org.springframework.cloud.gateway.handler.predicate.CookiePredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.HeaderPredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.HostPredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.MethodPredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.PredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.QueryPredicateFactory; -import org.springframework.cloud.gateway.handler.predicate.UrlPredicateFactory; +import org.springframework.cloud.gateway.handler.predicate.CookieRoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.HeaderRoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.HostRoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.MethodRoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.RoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.QueryRoutePredicate; +import org.springframework.cloud.gateway.handler.predicate.UrlRoutePredicate; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.reactive.ReactorClientHttpConnector; @@ -80,39 +80,39 @@ public class GatewayAutoConfiguration { @Bean public GatewayPredicateHandlerMapping gatewayPredicateHandlerMapping(GatewayFilteringWebHandler webHandler, - Map predicates, + Map predicates, RouteReader routeReader) { return new GatewayPredicateHandlerMapping(webHandler, predicates, routeReader); } - @Bean(name = "CookiePredicateFactory") - public CookiePredicateFactory cookiePredicateFactory() { - return new CookiePredicateFactory(); + @Bean(name = "CookieRoutePredicate") + public CookieRoutePredicate cookieRoutePredicate() { + return new CookieRoutePredicate(); } - @Bean(name = "HeaderPredicateFactory") - public HeaderPredicateFactory headerPredicateFactory() { - return new HeaderPredicateFactory(); + @Bean(name = "HeaderRoutePredicate") + public HeaderRoutePredicate headerRoutePredicate() { + return new HeaderRoutePredicate(); } - @Bean(name = "HostPredicateFactory") - public HostPredicateFactory hostPredicateFactory() { - return new HostPredicateFactory(); + @Bean(name = "HostRoutePredicate") + public HostRoutePredicate hostRoutePredicate() { + return new HostRoutePredicate(); } - @Bean(name = "MethodPredicateFactory") - public MethodPredicateFactory methodPredicateFactory() { - return new MethodPredicateFactory(); + @Bean(name = "MethodRoutePredicate") + public MethodRoutePredicate methodRoutePredicate() { + return new MethodRoutePredicate(); } - @Bean(name = "QueryPredicateFactory") - public QueryPredicateFactory queryPredicateFactory() { - return new QueryPredicateFactory(); + @Bean(name = "QueryRoutePredicate") + public QueryRoutePredicate queryRoutePredicate() { + return new QueryRoutePredicate(); } - @Bean(name = "UrlPredicateFactory") - public UrlPredicateFactory urlPredicateFactory() { - return new UrlPredicateFactory(); + @Bean(name = "UrlRoutePredicate") + public UrlRoutePredicate urlRoutePredicate() { + return new UrlRoutePredicate(); } // Filter Factory beans diff --git a/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilter.java b/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilter.java index ee63181a..b4e5204c 100644 --- a/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilter.java +++ b/src/main/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilter.java @@ -8,7 +8,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.util.UriTemplate; import static org.springframework.cloud.gateway.filter.GatewayFilter.getAttribute; -import static org.springframework.cloud.gateway.handler.predicate.UrlPredicateFactory.URL_PREDICATE_VARS_ATTR; +import static org.springframework.cloud.gateway.handler.predicate.UrlRoutePredicate.URL_PREDICATE_VARS_ATTR; /** * @author Spencer Gibb diff --git a/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java b/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java index 6eb3437c..2803dd57 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java @@ -11,7 +11,7 @@ import org.springframework.beans.BeansException; import org.springframework.cloud.gateway.api.RouteReader; import org.springframework.cloud.gateway.config.Route; import org.springframework.cloud.gateway.config.PredicateDefinition; -import org.springframework.cloud.gateway.handler.predicate.PredicateFactory; +import org.springframework.cloud.gateway.handler.predicate.RoutePredicate; import org.springframework.web.reactive.handler.AbstractHandlerMapping; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebHandler; @@ -26,13 +26,13 @@ import static org.springframework.cloud.gateway.filter.GatewayFilter.GATEWAY_ROU */ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { - private Map predicates = new LinkedHashMap<>(); + private Map predicates = new LinkedHashMap<>(); private RouteReader routeReader; private WebHandler webHandler; private List routes; - public GatewayPredicateHandlerMapping(WebHandler webHandler, Map predicates, + public GatewayPredicateHandlerMapping(WebHandler webHandler, Map predicates, RouteReader routeReader) { this.webHandler = webHandler; this.routeReader = routeReader; @@ -40,13 +40,13 @@ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { predicates.forEach((name, factory) -> { String key = normalizeName(name); if (this.predicates.containsKey(key)) { - this.logger.warn("A PredicateFactory named "+ key + this.logger.warn("A RoutePredicate named "+ key + " already exists, class: " + this.predicates.get(key) + ". It will be overwritten."); } this.predicates.put(key, factory); if (logger.isInfoEnabled()) { - logger.info("Loaded PredicateFactory [" + key + "]"); + logger.info("Loaded RoutePredicate [" + key + "]"); } }); @@ -54,7 +54,7 @@ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { } private String normalizeName(String name) { - return name.replace(PredicateFactory.class.getSimpleName(), ""); + return name.replace(RoutePredicate.class.getSimpleName(), ""); } @Override @@ -140,9 +140,9 @@ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { } private Predicate lookup(Route route, PredicateDefinition predicate) { - PredicateFactory found = this.predicates.get(predicate.getName()); + RoutePredicate found = this.predicates.get(predicate.getName()); if (found == null) { - throw new IllegalArgumentException("Unable to find PredicateFactory with name " + predicate.getName()); + throw new IllegalArgumentException("Unable to find RoutePredicate with name " + predicate.getName()); } if (logger.isDebugEnabled()) { List args; diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicate.java similarity index 92% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicate.java index 9bf46723..38f7bfea 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookieRoutePredicate.java @@ -10,7 +10,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public class CookiePredicateFactory implements PredicateFactory { +public class CookieRoutePredicate implements RoutePredicate { @Override public Predicate apply(String name, String[] args) { diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderRoutePredicate.java similarity index 91% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderRoutePredicate.java index 68d0d554..c87012fc 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderRoutePredicate.java @@ -9,7 +9,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public class HeaderPredicateFactory implements PredicateFactory { +public class HeaderRoutePredicate implements RoutePredicate { @Override public Predicate apply(String header, String[] args) { diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicate.java similarity index 91% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicate.java index e1b389f5..45a01cd6 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostRoutePredicate.java @@ -9,7 +9,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public class HostPredicateFactory implements PredicateFactory { +public class HostRoutePredicate implements RoutePredicate { private PathMatcher pathMatcher = new AntPathMatcher("."); diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodRoutePredicate.java similarity index 88% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodRoutePredicate.java index c8128b08..77dbd865 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodRoutePredicate.java @@ -8,7 +8,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public class MethodPredicateFactory implements PredicateFactory { +public class MethodRoutePredicate implements RoutePredicate { @Override public Predicate apply(String method, String[] args) { diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicate.java similarity index 92% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicate.java index e48f1d8a..acfb4041 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRoutePredicate.java @@ -8,7 +8,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public class QueryPredicateFactory implements PredicateFactory { +public class QueryRoutePredicate implements RoutePredicate { @Override public Predicate apply(String param, String[] args) { diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/RoutePredicate.java similarity index 87% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/RoutePredicate.java index a8f8a5e7..0bdc223b 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/RoutePredicate.java @@ -7,7 +7,7 @@ import org.springframework.web.server.ServerWebExchange; /** * @author Spencer Gibb */ -public interface PredicateFactory { +public interface RoutePredicate { Predicate apply(String value, String[] args); } diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicateFactory.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlRoutePredicate.java similarity index 95% rename from src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicateFactory.java rename to src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlRoutePredicate.java index acad3348..72d865b6 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicateFactory.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlRoutePredicate.java @@ -11,7 +11,7 @@ import org.springframework.web.server.support.HttpRequestPathHelper; /** * @author Spencer Gibb */ -public class UrlPredicateFactory implements PredicateFactory { +public class UrlRoutePredicate implements RoutePredicate { public static final String URL_PREDICATE_VARS_ATTR = "urlPredicateVars"; diff --git a/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilterTests.java b/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilterTests.java index c7bf85fe..61e01cee 100644 --- a/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilterTests.java +++ b/src/test/java/org/springframework/cloud/gateway/filter/route/SetPathRouteFilterTests.java @@ -5,7 +5,7 @@ import java.util.HashMap; import org.assertj.core.api.Assertions; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.springframework.cloud.gateway.handler.predicate.UrlPredicateFactory; +import org.springframework.cloud.gateway.handler.predicate.UrlRoutePredicate; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.http.server.reactive.MockServerHttpResponse; import org.springframework.web.server.ServerWebExchange; @@ -44,7 +44,7 @@ public class SetPathRouteFilterTests { .build(); DefaultServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse()); - exchange.getAttributes().put(UrlPredicateFactory.URL_PREDICATE_VARS_ATTR, variables); + exchange.getAttributes().put(UrlRoutePredicate.URL_PREDICATE_VARS_ATTR, variables); WebFilterChain filterChain = mock(WebFilterChain.class);