From 24dfd4ae76e9bf6f9f13a12e446c8d7a699d0f70 Mon Sep 17 00:00:00 2001 From: Igor Suhorukov Date: Fri, 2 Feb 2018 03:15:51 +0300 Subject: [PATCH] fix issue with assertion in HystrixStreamTests, polish diamond operator and follow class field naming convention (#2703) * fix assertion check * polish: replace the type specification in this constructor call with the diamond operator ("<>"), make EUREKA_PACKAGES final to avoid issue "static non-final field names should comply with a naming convention" --- .../cloud/netflix/archaius/ArchaiusEndpoint.java | 2 +- .../cloud/netflix/feign/ribbon/FeignLoadBalancer.java | 2 +- .../cloud/netflix/feign/ribbon/FeignRetryPolicy.java | 2 +- .../cloud/netflix/hystrix/HystrixHealthIndicator.java | 2 +- .../eureka/MutableDiscoveryClientOptionalArgs.java | 2 +- .../eureka/server/EurekaServerAutoConfiguration.java | 6 +++--- .../cloud/netflix/hystrix/stream/HystrixStreamTests.java | 8 ++++---- .../netflix/ribbon/ZonePreferenceServerListFilter.java | 2 +- .../cloud/netflix/ribbon/support/RibbonRetryPolicy.java | 2 +- .../turbine/stream/TurbinePortApplicationListener.java | 2 +- .../cloud/netflix/zuul/filters/SimpleRouteLocator.java | 2 +- .../netflix/zuul/filters/TraceProxyRequestHelper.java | 2 +- .../filters/discovery/DiscoveryClientRouteLocator.java | 4 ++-- .../zuul/filters/route/SimpleHostRoutingFilter.java | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java b/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java index 64f618cb..e77114da 100644 --- a/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java +++ b/spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java @@ -38,7 +38,7 @@ public class ArchaiusEndpoint { @ReadOperation public Map invoke() { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); AbstractConfiguration config = ConfigurationManager.getConfigInstance(); if (config instanceof ConcurrentCompositeConfiguration) { ConcurrentCompositeConfiguration composite = (ConcurrentCompositeConfiguration) config; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignLoadBalancer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignLoadBalancer.java index 9585e033..4fab93f1 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignLoadBalancer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignLoadBalancer.java @@ -157,7 +157,7 @@ public class FeignLoadBalancer extends @Override public HttpHeaders getHeaders() { - Map> headers = new HashMap>(); + Map> headers = new HashMap<>(); Map> feignHeaders = RibbonRequest.this.toRequest().headers(); for(String key : feignHeaders.keySet()) { headers.put(key, new ArrayList(feignHeaders.get(key))); diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRetryPolicy.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRetryPolicy.java index d5219c55..f78d52fa 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRetryPolicy.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRetryPolicy.java @@ -83,7 +83,7 @@ public class FeignRetryPolicy extends InterceptorRetryPolicy { FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) { this.serviceId = serviceId; this.request = request; - this.metadata = new HashMap(); + this.metadata = new HashMap<>(); } @Override diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java index c14ba627..fb1a8bfe 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java @@ -41,7 +41,7 @@ public class HystrixHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Builder builder) throws Exception { - List openCircuitBreakers = new ArrayList(); + List openCircuitBreakers = new ArrayList<>(); // Collect all open circuit breakers from Hystrix for (HystrixCommandMetrics metrics : HystrixCommandMetrics.getInstances()) { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/MutableDiscoveryClientOptionalArgs.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/MutableDiscoveryClientOptionalArgs.java index b57eedea..f19b0cdb 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/MutableDiscoveryClientOptionalArgs.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/MutableDiscoveryClientOptionalArgs.java @@ -31,7 +31,7 @@ public class MutableDiscoveryClientOptionalArgs extends DiscoveryClientOptionalA @Override public void setAdditionalFilters(Collection additionalFilters) { - additionalFilters = new LinkedHashSet(additionalFilters); + additionalFilters = new LinkedHashSet<>(additionalFilters); this.additionalFilters = additionalFilters; super.setAdditionalFilters(additionalFilters); } diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java index 1ba484ce..a90cb7e8 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerAutoConfiguration.java @@ -81,7 +81,7 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { /** * List of packages containing Jersey resources required by the Eureka server */ - private static String[] EUREKA_PACKAGES = new String[] { "com.netflix.discovery", + private static final String[] EUREKA_PACKAGES = new String[] { "com.netflix.discovery", "com.netflix.eureka" }; @Autowired @@ -283,7 +283,7 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { // Find classes in Eureka packages (or subpackages) // - Set> classes = new HashSet>(); + Set> classes = new HashSet<>(); for (String basePackage : EUREKA_PACKAGES) { Set beans = provider.findCandidateComponents(basePackage); for (BeanDefinition bd : beans) { @@ -295,7 +295,7 @@ public class EurekaServerAutoConfiguration extends WebMvcConfigurerAdapter { // Construct the Jersey ResourceConfig // - Map propsAndFeatures = new HashMap(); + Map propsAndFeatures = new HashMap<>(); propsAndFeatures.put( // Skip static content used by the webapp ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX, diff --git a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java index e0d1d24a..2aed71a6 100644 --- a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java +++ b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java @@ -92,10 +92,10 @@ public class HystrixStreamTests { this.task.gatherMetrics(); Message message = this.collector.forChannel(output).take(); JsonNode tree = mapper.readTree((String)message.getPayload()); - assertThat(tree.hasNonNull("origin")); - assertThat(tree.hasNonNull("data")); - assertThat(tree.hasNonNull("event")); - assertThat(tree.findValue("event").asText().equals("message")); + assertThat(tree.hasNonNull("origin")).isTrue(); + assertThat(tree.hasNonNull("data")).isTrue(); + assertThat(tree.hasNonNull("event")).isTrue(); + assertThat(tree.findValue("event").asText()).isEqualTo("message"); } } diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilter.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilter.java index 8fc140b8..b0defeaa 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilter.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/ZonePreferenceServerListFilter.java @@ -48,7 +48,7 @@ public class ZonePreferenceServerListFilter extends ZoneAffinityServerListFilter public List getFilteredListOfServers(List servers) { List output = super.getFilteredListOfServers(servers); if (this.zone != null && output.size() == servers.size()) { - List local = new ArrayList(); + List local = new ArrayList<>(); for (Server server : output) { if (this.zone.equalsIgnoreCase(server.getZone())) { local.add(server); diff --git a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/support/RibbonRetryPolicy.java b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/support/RibbonRetryPolicy.java index c2d1ba80..157ce501 100644 --- a/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/support/RibbonRetryPolicy.java +++ b/spring-cloud-netflix-ribbon/src/main/java/org/springframework/cloud/netflix/ribbon/support/RibbonRetryPolicy.java @@ -54,7 +54,7 @@ public class RibbonRetryPolicy extends InterceptorRetryPolicy { RibbonRetryPolicyServiceInstance(String serviceId, HttpRequest request) { this.serviceId = serviceId; this.request = request; - this.metadata = new HashMap(); + this.metadata = new HashMap<>(); } @Override diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbinePortApplicationListener.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbinePortApplicationListener.java index b7576eac..83a89023 100644 --- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbinePortApplicationListener.java +++ b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbinePortApplicationListener.java @@ -22,7 +22,7 @@ public class TurbinePortApplicationListener implements return; } if (serverPort != Integer.valueOf(-1)) { - Map ports = new HashMap(); + Map ports = new HashMap<>(); if (turbinePort == null) { // The actual server.port used by the application forced to be -1 (no user // endpoints) because no value was provided for turbine diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java index 07fdfb97..35490ff8 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java @@ -175,7 +175,7 @@ public class SimpleRouteLocator implements RouteLocator, Ordered { * {@link ZuulProperties}, but subclasses can add dynamic calculations. */ protected Map locateRoutes() { - LinkedHashMap routesMap = new LinkedHashMap(); + LinkedHashMap routesMap = new LinkedHashMap<>(); for (ZuulRoute route : this.properties.getRoutes().values()) { routesMap.put(route.getPath(), route); } diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java index d52ba111..edec513c 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java @@ -155,7 +155,7 @@ public class TraceProxyRequestHelper extends ProxyRequestHelper { if (this.traces != null) { @SuppressWarnings("unchecked") Map trace = (Map) info.get("headers"); - Map output = new LinkedHashMap(); + Map output = new LinkedHashMap<>(); trace.put("response", output); debugHeaders(headers, output); output.put("status", "" + status); diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java index ad0d92a9..d35deb4b 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java @@ -99,10 +99,10 @@ public class DiscoveryClientRouteLocator extends SimpleRouteLocator @Override protected LinkedHashMap locateRoutes() { - LinkedHashMap routesMap = new LinkedHashMap(); + LinkedHashMap routesMap = new LinkedHashMap<>(); routesMap.putAll(super.locateRoutes()); if (this.discovery != null) { - Map staticServices = new LinkedHashMap(); + Map staticServices = new LinkedHashMap<>(); for (ZuulRoute route : routesMap.values()) { String serviceId = route.getServiceId(); if (serviceId == null) { diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java index bbc5b682..54555017 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java @@ -308,7 +308,7 @@ public class SimpleHostRoutingFilter extends ZuulFilter { } private MultiValueMap revertHeaders(Header[] headers) { - MultiValueMap map = new LinkedMultiValueMap(); + MultiValueMap map = new LinkedMultiValueMap<>(); for (Header header : headers) { String name = header.getName(); if (!map.containsKey(name)) {