diff --git a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineController.java b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineController.java index 96e892cc0..e6fd609db 100644 --- a/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineController.java +++ b/spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineController.java @@ -57,7 +57,7 @@ public class TurbineController { .interval(Duration.ofSeconds(5), Duration.ofSeconds(10)) .map(l -> Collections.singletonMap("type", (Object) "ping")).share(); flux = Flux.merge(RxReactiveStreams.toPublisher(stream), ping).share() - .map(map -> JsonUtility.mapToJson(map)); + .map(JsonUtility::mapToJson); } @GetMapping(produces = MediaType.TEXT_EVENT_STREAM_VALUE) diff --git a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java index 1a162168c..89377ee0f 100644 --- a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java +++ b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java @@ -74,18 +74,14 @@ public class HystrixStreamAggregatorTests { @Test public void messageDecoded() throws Exception { - this.publisher.subscribe(map -> { - assertThat(map.get("type")).isEqualTo("HystrixCommand"); - }); + this.publisher.subscribe(map -> assertThat(map.get("type")).isEqualTo("HystrixCommand")); this.aggregator.sendToSubject(PAYLOAD.getBytes()); this.output.expect(not(containsString("ERROR"))); } @Test public void messageWrappedInArray() throws Exception { - this.publisher.subscribe(map -> { - assertThat(map.get("type")).isEqualTo("HystrixCommand"); - }); + this.publisher.subscribe(map -> assertThat(map.get("type")).isEqualTo("HystrixCommand")); this.aggregator.sendToSubject(new StringBuilder().append("[").append(PAYLOAD) .append("]").toString().getBytes()); this.output.expect(not(containsString("ERROR"))); @@ -93,9 +89,7 @@ public class HystrixStreamAggregatorTests { @Test public void doubleEncodedMessage() throws Exception { - this.publisher.subscribe(map -> { - assertThat(map.get("type")).isEqualTo("HystrixCommand"); - }); + this.publisher.subscribe(map -> assertThat(map.get("type")).isEqualTo("HystrixCommand")); // If The JSON is embedded in a JSON String this is what it looks like String payload = "\"" + PAYLOAD.replace("\"", "\\\"") + "\""; this.aggregator.sendToSubject(payload.getBytes()); diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringClusterMonitor.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringClusterMonitor.java index aeeb2184e..a476609af 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringClusterMonitor.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringClusterMonitor.java @@ -19,7 +19,6 @@ package org.springframework.cloud.netflix.turbine; import com.netflix.config.DynamicBooleanProperty; import com.netflix.config.DynamicPropertyFactory; import com.netflix.config.DynamicStringProperty; -import com.netflix.turbine.data.DataFromSingleInstance; import com.netflix.turbine.discovery.Instance; import com.netflix.turbine.handler.PerformanceCriteria; import com.netflix.turbine.monitor.MonitorConsole; @@ -37,7 +36,7 @@ public class SpringClusterMonitor extends AggregateClusterMonitor { public SpringClusterMonitor(String name, String clusterName) { super(name, new ObservationCriteria.ClusterBasedObservationCriteria(clusterName), new PerformanceCriteria.AggClusterPerformanceCriteria(clusterName), - new MonitorConsole(), InstanceMonitorDispatcher, + new MonitorConsole<>(), InstanceMonitorDispatcher, SpringClusterMonitor.ClusterConfigBasedUrlClosure); } diff --git a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java b/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java index 2459baf18..4f96ab366 100644 --- a/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java +++ b/spring-cloud-netflix-turbine/src/test/java/org/springframework/cloud/netflix/turbine/TurbineHttpTests.java @@ -76,7 +76,7 @@ public class TurbineHttpTests { @Override public Collection getClusterInformations( HttpServletRequest request) { - List clusterInformationList = new ArrayList(); + List clusterInformationList = new ArrayList<>(); clusterInformationList.add(foo); clusterInformationList.add(bar); return clusterInformationList; diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/LocationRewriteFilter.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/LocationRewriteFilter.java index 31c1c7abe..91b897f5b 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/LocationRewriteFilter.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/LocationRewriteFilter.java @@ -122,7 +122,7 @@ public class LocationRewriteFilter extends ZuulFilter { : redirectedUriComps.getPath(); if (downstreamHasGlobalPrefix(zuulProperties)) { - path.append("/" + zuulProperties.getPrefix()); + path.append("/").append(zuulProperties.getPrefix()); } else { path.append(zuulHasGlobalPrefix(zuulProperties) diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java index 3a69d25ca..4151d89ab 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendResponseFilter.java @@ -270,7 +270,7 @@ public class SendResponseFilter extends ZuulFilter { if (rd != null) { StringBuilder debugHeader = new StringBuilder(); for (String it : rd) { - debugHeader.append("[[[" + it + "]]]"); + debugHeader.append("[[[").append(it).append("]]]"); } servletResponse.addHeader(X_ZUUL_DEBUG_HEADER, debugHeader.toString()); } diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java index faddb1dfb..7b33ec4e4 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java @@ -235,7 +235,7 @@ public class RibbonRoutingFilter extends ZuulFilter { throws ClientException, IOException { RequestContext.getCurrentContext().set("zuulResponse", resp); this.helper.setResponse(resp.getRawStatusCode(), - resp.getBody() == null ? null : resp.getBody(), resp.getHeaders()); + resp.getBody(), resp.getHeaders()); } } 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 ef74b5872..f6809d791 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 @@ -481,7 +481,7 @@ public class SimpleHostRoutingFilter extends ZuulFilter try { return Long.parseLong(contentLengthHeader); } - catch (NumberFormatException e) { + catch (NumberFormatException ignored) { } } return request.getContentLength(); diff --git a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java index 93389a386..510aad4a6 100644 --- a/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java +++ b/spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/util/RequestContentDataExtractor.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -98,7 +99,7 @@ public final class RequestContentDataExtractor { if (listOfOnlyQueryParams != null) { listOfOnlyQueryParams = listOfOnlyQueryParams.stream() - .filter(queryParam -> queryParam != null) + .filter(Objects::nonNull) .map(param -> uriDecode(param, Charset.defaultCharset())) .collect(Collectors.toList()); if (!listOfOnlyQueryParams.containsAll(listOfAllParams)) {