SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Route, Filter & Predicate classes to specific packages

Browse Source
This commit is contained in:
Spencer Gibb
2017-03-17 22:38:36 -06:00
parent 6880468482
commit 317d011553
25 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/actuate/GatewayEndpoint.java
View File

@@ -24,13 +24,13 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.api.RouteDefinitionWriter;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionWriter;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.cloud.gateway.filter.factory.WebFilterFactory;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.cloud.gateway.support.NotFoundException;
import org.springframework.cloud.gateway.support.RefreshRoutesEvent;
import org.springframework.context.ApplicationEventPublisher;

8
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
View File

@@ -28,10 +28,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.web.reactive.HttpHandlerAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.gateway.actuate.GatewayEndpoint;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.api.RouteDefinitionRepository;
import org.springframework.cloud.gateway.api.RouteDefinitionWriter;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
import org.springframework.cloud.gateway.route.RouteDefinitionWriter;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.cloud.gateway.filter.NettyRoutingFilter;
import org.springframework.cloud.gateway.filter.RouteToRequestUrlFilter;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/GatewayProperties.java
View File

@@ -24,8 +24,8 @@ import javax.validation.Valid;
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.RouteDefinition;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.cloud.gateway.filter.factory.RemoveNonProxyHeadersWebFilterFactory;
import org.springframework.validation.annotation.Validated;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/PropertiesRouteDefinitionLocator.java
View File

@@ -17,8 +17,8 @@
package org.springframework.cloud.gateway.config;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import reactor.core.publisher.Flux;

8
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/discovery/DiscoveryClientRouteDefinitionLocator.java
View File

@@ -20,12 +20,12 @@ package org.springframework.cloud.gateway.discovery;
import java.net.URI;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
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;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
import org.springframework.cloud.gateway.route.RouteDefinition;
import static org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory.REGEXP_KEY;
import static org.springframework.cloud.gateway.filter.factory.RewritePathWebFilterFactory.REPLACEMENT_KEY;

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/FilterDefinition.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/FilterDefinition.java
View File

@@ -15,7 +15,7 @@
*
*/
package org.springframework.cloud.gateway.model;
package org.springframework.cloud.gateway.filter;
import java.util.LinkedHashMap;
import java.util.Map;

3
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/RouteToRequestUrlFilter.java
View File

@@ -21,8 +21,7 @@ import java.net.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.core.Ordered;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilterChain;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/FilteringWebHandler.java
View File

@@ -22,11 +22,11 @@ import java.util.Optional;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.config.GatewayProperties;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.cloud.gateway.filter.factory.WebFilterFactory;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/RequestPredicateHandlerMapping.java
View File

@@ -19,9 +19,9 @@ package org.springframework.cloud.gateway.handler;
import java.util.function.Function;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.handler.support.ExchangeServerRequest;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.web.reactive.handler.AbstractHandlerMapping;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebHandler;

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/PredicateDefinition.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/PredicateDefinition.java
View File

@@ -15,7 +15,7 @@
*
*/
package org.springframework.cloud.gateway.model;
package org.springframework.cloud.gateway.handler.predicate;
import java.util.LinkedHashMap;
import java.util.Map;

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/handler/predicate/QueryRequestPredicateFactory.java
View File

@@ -46,7 +46,7 @@ public class QueryRequestPredicateFactory implements RequestPredicateFactory {
@Override
public RequestPredicate apply(Tuple args) {
validate(1, args);
validateMin(1, args);
String param = args.getString(PARAM_KEY);
if (!args.hasFieldName(REGEXP_KEY)) {

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/Route.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/Route.java
View File

@@ -15,7 +15,7 @@
*
*/
package org.springframework.cloud.gateway.model;
package org.springframework.cloud.gateway.route;
import java.net.URI;
import java.util.ArrayList;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/model/RouteDefinition.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinition.java
View File

@@ -15,9 +15,11 @@
*
*/
package org.springframework.cloud.gateway.model;
package org.springframework.cloud.gateway.route;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
import javax.validation.Valid;
import javax.validation.ValidationException;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionLocator.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionLocator.java
View File

@@ -15,9 +15,9 @@
*
*/
package org.springframework.cloud.gateway.api;
package org.springframework.cloud.gateway.route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinition;
import reactor.core.publisher.Flux;
/**

2
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionRepository.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionRepository.java
View File

@@ -15,7 +15,7 @@
*
*/
package org.springframework.cloud.gateway.api;
package org.springframework.cloud.gateway.route;
/**
* @author Spencer Gibb

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteDefinitionWriter.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteDefinitionWriter.java
View File

@@ -15,9 +15,9 @@
*
*/
package org.springframework.cloud.gateway.api;
package org.springframework.cloud.gateway.route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinition;
import reactor.core.publisher.Mono;
/**

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/api/RouteLocator.java → spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/route/RouteLocator.java
View File

@@ -15,9 +15,9 @@
*
*/
package org.springframework.cloud.gateway.api;
package org.springframework.cloud.gateway.route;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.route.Route;
import reactor.core.publisher.Flux;
/**

5
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/ArgumentHints.java
View File

@@ -49,4 +49,9 @@ public interface ArgumentHints {
Assert.isTrue(args != null && args.size() == requiredSize,
"args must have "+ requiredSize +" entry(s)");
}
default void validateMin(int minSize, Tuple args) {
Assert.isTrue(args != null && args.size() >= minSize,
"args must have at least "+ minSize +" entry(s)");
}
}

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteDefinitionLocator.java
View File

@@ -20,8 +20,8 @@ package org.springframework.cloud.gateway.support;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.context.event.EventListener;
import reactor.core.publisher.Flux;

6
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CachingRouteLocator.java
View File

@@ -20,10 +20,8 @@ package org.springframework.cloud.gateway.support;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.context.event.EventListener;
import reactor.core.publisher.Flux;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteDefinitionLocator.java
View File

@@ -17,8 +17,8 @@
package org.springframework.cloud.gateway.support;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteDefinition;
import reactor.core.publisher.Flux;
/**

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/CompositeRouteLocator.java
View File

@@ -17,8 +17,8 @@
package org.springframework.cloud.gateway.support;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.route.Route;
import reactor.core.publisher.Flux;

4
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/InMemoryRouteDefinitionRepository.java
View File

@@ -20,8 +20,8 @@ package org.springframework.cloud.gateway.support;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.cloud.gateway.api.RouteDefinitionRepository;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.route.RouteDefinitionRepository;
import org.springframework.cloud.gateway.route.RouteDefinition;
import static java.util.Collections.synchronizedMap;

12
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/support/RouteDefinitionRouteLocator.java
View File

@@ -19,16 +19,16 @@ package org.springframework.cloud.gateway.support;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.gateway.api.RouteDefinitionLocator;
import org.springframework.cloud.gateway.api.RouteLocator;
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
import org.springframework.cloud.gateway.route.RouteLocator;
import org.springframework.cloud.gateway.config.GatewayProperties;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.cloud.gateway.filter.factory.WebFilterFactory;
import org.springframework.cloud.gateway.handler.predicate.RequestPredicateFactory;
import org.springframework.cloud.gateway.model.FilterDefinition;
import org.springframework.cloud.gateway.model.PredicateDefinition;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.model.RouteDefinition;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.tuple.Tuple;

2
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/BaseWebClientTests.java
View File

@@ -29,7 +29,7 @@ import org.junit.Before;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.gateway.EnableGateway;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.cloud.gateway.model.Route;
import org.springframework.cloud.gateway.route.Route;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.StaticServerList;