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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2020-09-17 18:06:17 +00:00
parent c7b8e8db19
commit 38030d33be
261 changed files with 2503 additions and 4187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-gateway-sample/src/main/java/org/springframework/cloud/gateway/sample/GatewaySampleApplication.java
View File

@@ -157,18 +157,16 @@ public class GatewaySampleApplication {
@Bean
public RouterFunction<ServerResponse> testFunRouterFunction() {
RouterFunction<ServerResponse> route = RouterFunctions.route(
RequestPredicates.path("/testfun"),
RouterFunction<ServerResponse> route = RouterFunctions.route(RequestPredicates.path("/testfun"),
request -> ServerResponse.ok().body(BodyInserters.fromValue("hello")));
return route;
}
@Bean
public RouterFunction<ServerResponse> testWhenMetricPathIsNotMeet() {
RouterFunction<ServerResponse> route = RouterFunctions.route(
RequestPredicates.path("/actuator/metrics/gateway.requests"),
request -> ServerResponse.ok().body(BodyInserters
.fromValue(HELLO_FROM_FAKE_ACTUATOR_METRICS_GATEWAY_REQUESTS)));
RouterFunction<ServerResponse> route = RouterFunctions
.route(RequestPredicates.path("/actuator/metrics/gateway.requests"), request -> ServerResponse.ok()
.body(BodyInserters.fromValue(HELLO_FROM_FAKE_ACTUATOR_METRICS_GATEWAY_REQUESTS)));
return route;
}

3
spring-cloud-gateway-sample/src/main/java/org/springframework/cloud/gateway/sample/ThrottleGatewayFilter.java
View File

@@ -84,8 +84,7 @@ public class ThrottleGatewayFilter implements GatewayFilter {
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
TokenBucket tokenBucket = TokenBuckets.builder().withCapacity(capacity)
.withFixedIntervalRefillStrategy(refillTokens, refillPeriod, refillUnit)
.build();
.withFixedIntervalRefillStrategy(refillTokens, refillPeriod, refillUnit).build();
// TODO: get a token bucket for a key
log.debug("TokenBucket capacity: " + tokenBucket.getCapacity());

93
spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationTests.java
View File

@@ -49,8 +49,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
* @author Spencer Gibb
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { GatewaySampleApplicationTests.TestConfig.class },
webEnvironment = RANDOM_PORT, properties = "management.server.port=${test.port}")
@SpringBootTest(classes = { GatewaySampleApplicationTests.TestConfig.class }, webEnvironment = RANDOM_PORT,
properties = "management.server.port=${test.port}")
public class GatewaySampleApplicationTests {
protected static int managementPort;
@@ -77,8 +77,7 @@ public class GatewaySampleApplicationTests {
@Before
public void setup() {
baseUri = "http://localhost:" + port;
this.webClient = WebTestClient.bindToServer()
.responseTimeout(Duration.ofSeconds(10)).baseUrl(baseUri).build();
this.webClient = WebTestClient.bindToServer().responseTimeout(Duration.ofSeconds(10)).baseUrl(baseUri).build();
}
@Test
@@ -89,108 +88,88 @@ public class GatewaySampleApplicationTests {
@Test
@SuppressWarnings("unchecked")
public void readBodyPredicateStringWorks() {
webClient.post().uri("/post").header("Host", "www.readbody.org").bodyValue("hi")
.exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "read_body_pred").expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.containsEntry("data", "hi"));
webClient.post().uri("/post").header("Host", "www.readbody.org").bodyValue("hi").exchange().expectStatus()
.isOk().expectHeader().valueEquals("X-TestHeader", "read_body_pred").expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody()).containsEntry("data", "hi"));
}
@Test
@SuppressWarnings("unchecked")
public void rewriteRequestBodyStringWorks() {
webClient.post().uri("/post").header("Host", "www.rewriterequestupper.org")
.bodyValue("hello").exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_request_upper")
webClient.post().uri("/post").header("Host", "www.rewriterequestupper.org").bodyValue("hello").exchange()
.expectStatus().isOk().expectHeader().valueEquals("X-TestHeader", "rewrite_request_upper")
.expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.containsEntry("data", "HELLOHELLO"));
.consumeWith(result -> assertThat(result.getResponseBody()).containsEntry("data", "HELLOHELLO"));
}
@Test
@SuppressWarnings("unchecked")
public void rewriteRequestBodyObjectWorks() {
webClient.post().uri("/post").header("Host", "www.rewriterequestobj.org")
.bodyValue("hello").exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_request").expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.containsEntry("data", "{\"message\":\"HELLO\"}"));
webClient.post().uri("/post").header("Host", "www.rewriterequestobj.org").bodyValue("hello").exchange()
.expectStatus().isOk().expectHeader().valueEquals("X-TestHeader", "rewrite_request")
.expectBody(Map.class).consumeWith(result -> assertThat(result.getResponseBody()).containsEntry("data",
"{\"message\":\"HELLO\"}"));
}
@Test
@SuppressWarnings("unchecked")
public void rewriteResponseBodyStringWorks() {
webClient.post().uri("/post").header("Host", "www.rewriteresponseupper.org")
.bodyValue("hello").exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_response_upper")
webClient.post().uri("/post").header("Host", "www.rewriteresponseupper.org").bodyValue("hello").exchange()
.expectStatus().isOk().expectHeader().valueEquals("X-TestHeader", "rewrite_response_upper")
.expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.containsEntry("DATA", "HELLO"));
.consumeWith(result -> assertThat(result.getResponseBody()).containsEntry("DATA", "HELLO"));
}
@Test
@SuppressWarnings("unchecked")
public void rewriteResponseEmptyBodyToStringWorks() {
webClient.post().uri("/post/empty").header("Host", "www.rewriteemptyresponse.org")
.exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_empty_response")
.expectBody(String.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.isEqualTo("emptybody"));
webClient.post().uri("/post/empty").header("Host", "www.rewriteemptyresponse.org").exchange().expectStatus()
.isOk().expectHeader().valueEquals("X-TestHeader", "rewrite_empty_response").expectBody(String.class)
.consumeWith(result -> assertThat(result.getResponseBody()).isEqualTo("emptybody"));
}
@Test
@SuppressWarnings("unchecked")
public void emptyBodySupplierNotCalledWhenBodyPresent() {
webClient.post().uri("/post")
.header("Host", "www.rewriteresponsewithfailsupplier.org")
.bodyValue("hello").exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_response_fail_supplier")
.expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.containsEntry("DATA", "HELLO"));
webClient.post().uri("/post").header("Host", "www.rewriteresponsewithfailsupplier.org").bodyValue("hello")
.exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_response_fail_supplier").expectBody(Map.class)
.consumeWith(result -> assertThat(result.getResponseBody()).containsEntry("DATA", "HELLO"));
}
@Test
@SuppressWarnings("unchecked")
public void rewriteResponeBodyObjectWorks() {
webClient.post().uri("/post").header("Host", "www.rewriteresponseobj.org")
.bodyValue("hello").exchange().expectStatus().isOk().expectHeader()
.valueEquals("X-TestHeader", "rewrite_response_obj")
webClient.post().uri("/post").header("Host", "www.rewriteresponseobj.org").bodyValue("hello").exchange()
.expectStatus().isOk().expectHeader().valueEquals("X-TestHeader", "rewrite_response_obj")
.expectBody(String.class)
.consumeWith(result -> assertThat(result.getResponseBody())
.isEqualTo("hello"));
.consumeWith(result -> assertThat(result.getResponseBody()).isEqualTo("hello"));
}
@Test
public void complexPredicate() {
webClient.get().uri("/anything/png").header("Host", "www.abc.org").exchange()
.expectHeader().valueEquals("X-TestHeader", "foobar").expectStatus()
.isOk();
webClient.get().uri("/anything/png").header("Host", "www.abc.org").exchange().expectHeader()
.valueEquals("X-TestHeader", "foobar").expectStatus().isOk();
}
@Test
public void actuatorManagementPort() {
webClient.get()
.uri("http://localhost:" + managementPort + "/actuator/gateway/routes")
.exchange().expectStatus().isOk();
webClient.get().uri("http://localhost:" + managementPort + "/actuator/gateway/routes").exchange().expectStatus()
.isOk();
}
@Test
public void actuatorMetrics() {
contextLoads();
webClient.get()
.uri("http://localhost:" + managementPort
+ "/actuator/metrics/gateway.requests")
.exchange().expectStatus().isOk().expectBody().consumeWith(i -> {
webClient.get().uri("http://localhost:" + managementPort + "/actuator/metrics/gateway.requests").exchange()
.expectStatus().isOk().expectBody().consumeWith(i -> {
String body = new String(i.getResponseBodyContent());
ObjectMapper mapper = new ObjectMapper();
try {
JsonNode actualObj = mapper.readTree(body);
JsonNode findValue = actualObj.findValue("name");
assertThat(findValue.asText())
.as("Expected to find metric with name gateway.requests")
assertThat(findValue.asText()).as("Expected to find metric with name gateway.requests")
.isEqualTo("gateway.requests");
}
catch (IOException e) {
@@ -218,10 +197,8 @@ public class GatewaySampleApplicationTests {
int port;
@Bean
public ServiceInstanceListSupplier fixedServiceInstanceListSupplier(
Environment env) {
return ServiceInstanceListSupplier.fixed(env)
.instance("localhost", port, "httpbin").build();
public ServiceInstanceListSupplier fixedServiceInstanceListSupplier(Environment env) {
return ServiceInstanceListSupplier.fixed(env).instance("localhost", port, "httpbin").build();
}
}

13
spring-cloud-gateway-sample/src/test/java/org/springframework/cloud/gateway/sample/GatewaySampleApplicationWithoutMetricsTests.java
View File

@@ -35,8 +35,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.util.SocketUtils;
@RunWith(ModifiedClassPathRunner.class)
@ClassPathExclusions({ "micrometer-*.jar", "spring-boot-actuator-*.jar",
"spring-boot-actuator-autoconfigure-*.jar" })
@ClassPathExclusions({ "micrometer-*.jar", "spring-boot-actuator-*.jar", "spring-boot-actuator-autoconfigure-*.jar" })
@DirtiesContext
public class GatewaySampleApplicationWithoutMetricsTests {
@@ -60,8 +59,7 @@ public class GatewaySampleApplicationWithoutMetricsTests {
@Before
public void setup() {
baseUri = "http://localhost:" + port;
this.webClient = WebTestClient.bindToServer()
.responseTimeout(Duration.ofSeconds(10)).baseUrl(baseUri).build();
this.webClient = WebTestClient.bindToServer().responseTimeout(Duration.ofSeconds(10)).baseUrl(baseUri).build();
}
protected ConfigurableApplicationContext init(Class<?> config) {
@@ -73,10 +71,9 @@ public class GatewaySampleApplicationWithoutMetricsTests {
public void actuatorMetrics() {
init(TestConfig.class);
webClient.get().uri("/get").exchange().expectStatus().isOk();
webClient.get()
.uri("http://localhost:" + port + "/actuator/metrics/gateway.requests")
.exchange().expectStatus().isOk().expectBody(String.class).isEqualTo(
GatewaySampleApplication.HELLO_FROM_FAKE_ACTUATOR_METRICS_GATEWAY_REQUESTS);
webClient.get().uri("http://localhost:" + port + "/actuator/metrics/gateway.requests").exchange().expectStatus()
.isOk().expectBody(String.class)
.isEqualTo(GatewaySampleApplication.HELLO_FROM_FAKE_ACTUATOR_METRICS_GATEWAY_REQUESTS);
}
}