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

Moved to auto configuration and added test

Browse Source
This commit is contained in:
Spencer Gibb
2016-11-23 17:36:28 -07:00
parent 98b1226117
commit 7d8995df68
8 changed files with 108 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -57,6 +57,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor.addons</groupId>
<artifactId>reactor-test</artifactId>
<version>${reactor.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>

2
src/main/java/org/springframework/cloud/gateway/GatewayConfiguration.java → src/main/java/org/springframework/cloud/gateway/GatewayAutoConfiguration.java
View File

@@ -13,7 +13,7 @@ import org.springframework.web.client.reactive.WebClient;
*/
@Configuration
@EnableConfigurationProperties
public class GatewayConfiguration {
public class GatewayAutoConfiguration {
@Bean
@ConditionalOnMissingBean

1
src/main/java/org/springframework/cloud/gateway/GatewayFilter.java
View File

@@ -33,6 +33,7 @@ public interface GatewayFilter {
String GATEWAY_ROUTE_ATTR = "gatewayRoute";
String GATEWAY_REQUEST_URL_ATTR = "requestUrl";
String GATEWAY_HANDLER_MAPPER_ATTR = "gatewayHandlerMapper";
/**
* Process the Web request and (optionally) delegate to the next

1
src/main/java/org/springframework/cloud/gateway/GatewayHostHandlerMapping.java
View File

@@ -45,6 +45,7 @@ public class GatewayHostHandlerMapping extends AbstractHandlerMapping {
@Override
protected Mono<?> getHandlerInternal(ServerWebExchange exchange) {
exchange.getAttributes().put(GatewayFilter.GATEWAY_HANDLER_MAPPER_ATTR, getClass().getSimpleName());
String host = exchange.getRequest().getHeaders().getFirst("Host");
Object handler;
try {

2
src/main/java/org/springframework/cloud/gateway/GatewayUrlHandlerMapping.java
View File

@@ -35,6 +35,8 @@ public class GatewayUrlHandlerMapping extends AbstractUrlHandlerMapping {
return super.getHandler(exchange).map(o -> {
if (o instanceof RouteHolder) {
RouteHolder holder = (RouteHolder) o;
exchange.getAttributes().put(GatewayFilter.GATEWAY_HANDLER_MAPPER_ATTR,
GatewayUrlHandlerMapping.this.getClass().getSimpleName());
exchange.getAttributes().put(GatewayFilter.GATEWAY_ROUTE_ATTR, holder.route);
return holder.webHandler;
}

2
src/main/resources/META-INF/spring.factories Normal file
View File

@@ -0,0 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.gateway.GatewayAutoConfiguration

37
src/test/java/org/springframework/cloud/gateway/GatewayApplication.java
View File

@@ -1,50 +1,13 @@
package org.springframework.cloud.gateway;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.core.annotation.Order;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
//TODO: move to autoconfig
@Import(GatewayConfiguration.class)
@SpringBootConfiguration
@EnableAutoConfiguration
public class GatewayApplication {
private static final Log log = LogFactory.getLog(GatewayApplication.class);
@Bean
@Order(501)
public GatewayFilter modifyResponseFilter() {
return (exchange, chain) -> {
log.info("modifyResponseFilter start");
exchange.getResponse().getHeaders().add("X-My-Custom", "MyCustomValue");
return chain.filter(exchange);
};
}
@Bean
@Order(502)
public GatewayFilter postFilter() {
return (exchange, chain) -> {
log.info("postFilter start");
return chain.filter(exchange).then(postFilterWork(exchange));
};
}
private static Mono<Void> postFilterWork(ServerWebExchange exchange) {
log.info("postFilterWork");
exchange.getResponse().getHeaders().add("X-Post-Header", "AddedAfterRoute");
return Mono.empty();
}
public static void main(String[] args) {
new SpringApplicationBuilder()
.sources(GatewayApplication.class)

97
src/test/java/org/springframework/cloud/gateway/GatewayApplicationTests.java
View File

@@ -1,16 +1,109 @@
package org.springframework.cloud.gateway;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.reactive.ReactorClientHttpConnector;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.client.reactive.ClientResponse;
import org.springframework.web.client.reactive.WebClient;
import org.springframework.web.server.ServerWebExchange;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static org.springframework.web.client.reactive.ClientRequest.GET;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@RunWith(SpringRunner.class)
@SpringBootTest
@SpringBootTest(webEnvironment = RANDOM_PORT)
public class GatewayApplicationTests {
public static final String HANDLER_MAPPER_HEADER = "X-Gateway-Handler-Mapper-Class";
@LocalServerPort
private int port;
private WebClient webClient = WebClient.builder(new ReactorClientHttpConnector()).build();
@Test
public void contextLoads() {
public void urlRouteWorks() {
Mono<ClientResponse> result = webClient.exchange(
GET("http://localhost:" + port + "/get").build()
);
StepVerifier
.create(result.map(response -> response.headers().asHttpHeaders()))
.consumeNextWith(
httpHeaders -> {
assertThat(httpHeaders.getFirst(HANDLER_MAPPER_HEADER))
.isEqualTo(GatewayUrlHandlerMapping.class.getSimpleName());
})
.expectComplete()
.verify();
}
@Test
public void hostRouteWorks() {
Mono<ClientResponse> result = webClient.exchange(
GET("http://localhost:" + port + "/get")
.header("Host", "www.example.org")
.build()
);
StepVerifier
.create(result)
.consumeNextWith(
response -> {
HttpHeaders httpHeaders = response.headers().asHttpHeaders();
HttpStatus statusCode = response.statusCode();
assertThat(httpHeaders.getFirst(HANDLER_MAPPER_HEADER))
.isEqualTo(GatewayHostHandlerMapping.class.getSimpleName());
assertThat(statusCode).isEqualTo(HttpStatus.OK);
})
.expectComplete()
.verify();
}
@SpringBootApplication
public static class TestConfig {
private static final Log log = LogFactory.getLog(TestConfig.class);
@Bean
@Order(501)
public GatewayFilter modifyResponseFilter() {
return (exchange, chain) -> {
log.info("modifyResponseFilter start");
String value = (String) exchange.getAttribute(GatewayFilter.GATEWAY_HANDLER_MAPPER_ATTR).orElse("N/A");
exchange.getResponse().getHeaders().add(HANDLER_MAPPER_HEADER, value);
return chain.filter(exchange);
};
}
@Bean
@Order(502)
public GatewayFilter postFilter() {
return (exchange, chain) -> {
log.info("postFilter start");
return chain.filter(exchange).then(postFilterWork(exchange));
};
}
private static Mono<Void> postFilterWork(ServerWebExchange exchange) {
log.info("postFilterWork");
exchange.getResponse().getHeaders().add("X-Post-Header", "AddedAfterRoute");
return Mono.empty();
}
}
}