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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2020-01-14 17:46:24 +00:00
parent 67444a07c2
commit 732f7d40ea
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/HystrixStreamAggregatorTests.java
View File

@@ -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());

4
spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java
View File

@@ -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());
}
}