Browse Source

rename create to apply

pull/41/head
Spencer Gibb 8 years ago
parent
commit
203bc0fe98
No known key found for this signature in database
GPG Key ID: 7788A47380690861
  1. 2
      src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java
  2. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java
  3. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java
  4. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java
  5. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java
  6. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java
  7. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java
  8. 2
      src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java

2
src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java

@ -130,7 +130,7 @@ public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping { @@ -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());
}
/**

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/CookiePredicate.java

@ -18,7 +18,7 @@ public class CookiePredicate implements GatewayPredicate { @@ -18,7 +18,7 @@ public class CookiePredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String name, String[] args) {
public Predicate<ServerWebExchange> apply(String name, String[] args) {
//TODO: caching can happen here
return exchange -> {
Assert.isTrue(args != null && args.length == 1,

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/GatewayPredicate.java

@ -11,5 +11,5 @@ public interface GatewayPredicate { @@ -11,5 +11,5 @@ public interface GatewayPredicate {
String getName();
Predicate<ServerWebExchange> create(String value, String[] args);
Predicate<ServerWebExchange> apply(String value, String[] args);
}

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/HeaderPredicate.java

@ -17,7 +17,7 @@ public class HeaderPredicate implements GatewayPredicate { @@ -17,7 +17,7 @@ public class HeaderPredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String header, String[] args) {
public Predicate<ServerWebExchange> apply(String header, String[] args) {
//TODO: caching can happen here
return exchange -> {
Assert.isTrue(args != null && args.length == 1,

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/HostPredicate.java

@ -23,7 +23,7 @@ public class HostPredicate implements GatewayPredicate { @@ -23,7 +23,7 @@ public class HostPredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String pattern, String[] args) {
public Predicate<ServerWebExchange> apply(String pattern, String[] args) {
//TODO: caching can happen here
return exchange -> {
String host = exchange.getRequest().getHeaders().getFirst("Host");

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/MethodPredicate.java

@ -16,7 +16,7 @@ public class MethodPredicate implements GatewayPredicate { @@ -16,7 +16,7 @@ public class MethodPredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String method, String[] args) {
public Predicate<ServerWebExchange> apply(String method, String[] args) {
//TODO: caching can happen here
return exchange -> {
HttpMethod requestMethod = exchange.getRequest().getMethod();

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryPredicate.java

@ -16,7 +16,7 @@ public class QueryPredicate implements GatewayPredicate { @@ -16,7 +16,7 @@ public class QueryPredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String param, String[] args) {
public Predicate<ServerWebExchange> apply(String param, String[] args) {
//TODO: caching can happen here
return exchange -> {
String regexp = null;

2
src/main/java/org/springframework/cloud/gateway/handler/predicate/UrlPredicate.java

@ -37,7 +37,7 @@ public class UrlPredicate implements GatewayPredicate { @@ -37,7 +37,7 @@ public class UrlPredicate implements GatewayPredicate {
}
@Override
public Predicate<ServerWebExchange> create(String pattern, String[] args) {
public Predicate<ServerWebExchange> apply(String pattern, String[] args) {
return exchange -> {
String lookupPath = getPathHelper().getLookupPathForRequest(exchange);
return getPathMatcher().match(pattern, lookupPath);

Loading…
Cancel
Save