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 db1a5951..e7e1a6bd 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java @@ -130,7 +130,7 @@ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { if (found == null) { throw new IllegalArgumentException("Unable to find GatewayPredicate with name " + predicate.getName()); } - return found.create(predicate.getValue(), predicate.getArgs()); + return found.apply(predicate.getValue(), predicate.getArgs()); } /** diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java index 08660bae..de731cd0 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java @@ -18,7 +18,7 @@ public class CookiePredicate implements GatewayPredicate { } @Override - public Predicate create(String name, String[] args) { + public Predicate apply(String name, String[] args) { //TODO: caching can happen here return exchange -> { Assert.isTrue(args != null && args.length == 1, diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java index 81b8eb91..54e6362e 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java @@ -11,5 +11,5 @@ public interface GatewayPredicate { String getName(); - Predicate create(String value, String[] args); + Predicate apply(String value, String[] args); } diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java index 0dbf97d5..b28ce67b 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java @@ -17,7 +17,7 @@ public class HeaderPredicate implements GatewayPredicate { } @Override - public Predicate create(String header, String[] args) { + public Predicate apply(String header, String[] args) { //TODO: caching can happen here return exchange -> { Assert.isTrue(args != null && args.length == 1, diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java index 19fb2e62..518acfa3 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java @@ -23,7 +23,7 @@ public class HostPredicate implements GatewayPredicate { } @Override - public Predicate create(String pattern, String[] args) { + public Predicate apply(String pattern, String[] args) { //TODO: caching can happen here return exchange -> { String host = exchange.getRequest().getHeaders().getFirst("Host"); diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java index 2d3b7963..29a930b1 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java @@ -16,7 +16,7 @@ public class MethodPredicate implements GatewayPredicate { } @Override - public Predicate create(String method, String[] args) { + public Predicate apply(String method, String[] args) { //TODO: caching can happen here return exchange -> { HttpMethod requestMethod = exchange.getRequest().getMethod(); diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java index 0439559c..a24bafd6 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java @@ -16,7 +16,7 @@ public class QueryPredicate implements GatewayPredicate { } @Override - public Predicate create(String param, String[] args) { + public Predicate apply(String param, String[] args) { //TODO: caching can happen here return exchange -> { String regexp = null; diff --git a/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java b/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java index 48f9316c..7ba5d761 100644 --- a/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java +++ b/src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java @@ -37,7 +37,7 @@ public class UrlPredicate implements GatewayPredicate { } @Override - public Predicate create(String pattern, String[] args) { + public Predicate apply(String pattern, String[] args) { return exchange -> { String lookupPath = getPathHelper().getLookupPathForRequest(exchange); return getPathMatcher().match(pattern, lookupPath);