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

Fix java 11 compile

Browse Source
This commit is contained in:
Spencer Gibb
2018-10-17 21:48:20 -04:00
parent efb171de38
commit 5d76667f9b
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilterTests.java
View File

@@ -104,7 +104,8 @@ public class LoadBalancerClientFilterTests {
loadBalancerClientFilter.filter(exchange, chain);
assertThat((LinkedHashSet<URI>)exchange.getAttribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR)).contains(url);
LinkedHashSet<URI> attribute = exchange.getAttribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR);
assertThat(attribute).contains(url);
verify(loadBalancerClient).choose("myservice");

28
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java
View File

@@ -131,18 +131,16 @@ public class ForwardedHeadersFilterTests {
"For=\"[2001:db8:cafe::17]:4711\"",
};
@SuppressWarnings("unchecked")
List<List<Map<String, String>>> expectedFor = new ArrayList<List<Map<String, String>>>() {{
add(list(map("for", "\"_gazonk\"")));
add(list(map("for", "192.0.2.60", "proto", "http", "by", "203.0.113.43")));
add(list(map("for", "192.0.2.43"), map("for", "198.51.100.17")));
add(list(map("for", "12.34.56.78", "host", "example.com", "proto", "https"),
map("for", "23.45.67.89")));
add(list(map("for", "12.34.56.78"),
map("for", "23.45.67.89", "secret", "egah2CGj55fSJFs"),
map("for", "10.1.2.3")));
add(list(map("for", "\"[2001:db8:cafe::17]:4711\"")));
}};
List<List<Map<String, String>>> expectedFor = new ArrayList<>();
expectedFor.add(Arrays.asList(map("for", "\"_gazonk\"")));
expectedFor.add(Arrays.asList(map("for", "192.0.2.60", "proto", "http", "by", "203.0.113.43")));
expectedFor.add(Arrays.asList(map("for", "192.0.2.43"), map("for", "198.51.100.17")));
expectedFor.add(Arrays.asList(map("for", "12.34.56.78", "host", "example.com", "proto", "https"),
map("for", "23.45.67.89")));
expectedFor.add(Arrays.asList(map("for", "12.34.56.78"),
map("for", "23.45.67.89", "secret", "egah2CGj55fSJFs"),
map("for", "10.1.2.3")));
expectedFor.add(Arrays.asList(map("for", "\"[2001:db8:cafe::17]:4711\"")));
for (int i = 0; i < valid.length; i++) {
String value = valid[i];
@@ -166,11 +164,7 @@ public class ForwardedHeadersFilterTests {
}
}
private List<Map<String, String>> list(Map<String, String>... map) {
return new ArrayList<>(Arrays.asList(map));
}
private Map<String, String> map(String... values) {
public static Map<String, String> map(String... values) {
if (values.length % 2 != 0) {
throw new IllegalArgumentException("values must have even number of items: "
+ Arrays.asList(values));

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

@@ -94,7 +94,7 @@ public class SseIntegrationTests {
.run();
ConfigurableEnvironment env = this.gatewayContext.getBean(ConfigurableEnvironment.class);
this.gatewayPort = new Integer(env.getProperty("local.server.port"));
this.gatewayPort = Integer.valueOf(env.getProperty("local.server.port"));
this.webClient = WebClient.create("http://localhost:" + this.gatewayPort + "/sse");

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

@@ -119,7 +119,7 @@ public class WebSocketIntegrationTests {
.run();
ConfigurableEnvironment env = this.gatewayContext.getBean(ConfigurableEnvironment.class);
this.gatewayPort = new Integer(env.getProperty("local.server.port"));
this.gatewayPort = Integer.valueOf(env.getProperty("local.server.port"));
}
@After