From 5d76667f9b4210bc2a870beb2c5a9bebc83eb067 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 17 Oct 2018 21:48:20 -0400 Subject: [PATCH] Fix java 11 compile --- .../filter/LoadBalancerClientFilterTests.java | 3 +- .../headers/ForwardedHeadersFilterTests.java | 28 ++++++++----------- .../gateway/test/sse/SseIntegrationTests.java | 2 +- .../websocket/WebSocketIntegrationTests.java | 2 +- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilterTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilterTests.java index d676a2ee..fa40b217 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilterTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/LoadBalancerClientFilterTests.java @@ -104,7 +104,8 @@ public class LoadBalancerClientFilterTests { loadBalancerClientFilter.filter(exchange, chain); - assertThat((LinkedHashSet)exchange.getAttribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR)).contains(url); + LinkedHashSet attribute = exchange.getAttribute(GATEWAY_ORIGINAL_REQUEST_URL_ATTR); + assertThat(attribute).contains(url); verify(loadBalancerClient).choose("myservice"); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java index bc11ac79..e121a210 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java @@ -131,18 +131,16 @@ public class ForwardedHeadersFilterTests { "For=\"[2001:db8:cafe::17]:4711\"", }; - @SuppressWarnings("unchecked") - List>> expectedFor = new ArrayList>>() {{ - 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>> 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> list(Map... map) { - return new ArrayList<>(Arrays.asList(map)); - } - - private Map map(String... values) { + public static Map map(String... values) { if (values.length % 2 != 0) { throw new IllegalArgumentException("values must have even number of items: " + Arrays.asList(values)); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java index 75d7b2af..b03e2f69 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/sse/SseIntegrationTests.java @@ -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"); diff --git a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java index 9815a04e..a51e7e31 100644 --- a/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java +++ b/spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/test/websocket/WebSocketIntegrationTests.java @@ -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