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 89377ee0f..7704be557 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,14 +74,16 @@ 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"))); @@ -89,7 +91,8 @@ 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-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 7b33ec4e4..8c440c775 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 @@ -234,8 +234,8 @@ public class RibbonRoutingFilter extends ZuulFilter { protected void setResponse(ClientHttpResponse resp) throws ClientException, IOException { RequestContext.getCurrentContext().set("zuulResponse", resp); - this.helper.setResponse(resp.getRawStatusCode(), - resp.getBody(), resp.getHeaders()); + this.helper.setResponse(resp.getRawStatusCode(), resp.getBody(), + resp.getHeaders()); } }