root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Brian Clozel 2016-04-04 22:53:25 +02:00
parent 09327181c4
commit e3f87b3e3a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
View File

@ -52,7 +52,7 @@ public class ReactorClientHttpResponse implements ClientHttpResponse {
@Override @Override
public Flux<DataBuffer> getBody() { public Flux<DataBuffer> getBody() {
return Flux.from(channel.input()).map(b -> allocator.wrap(b.byteBuffer())); return channel.input().map(b -> allocator.wrap(b.byteBuffer()));
} }
@Override @Override
@ -87,7 +87,7 @@ public class ReactorClientHttpResponse implements ClientHttpResponse {
@Override @Override
public String toString() { public String toString() {
return "ReactorClientHttpResponse{" + return "ReactorClientHttpResponse{" +
"request=" + this.channel.method() + " " + this.channel.uri() + "," + "request=" + this.channel.method().getName() + " " + this.channel.uri() + "," +
"status=" + getStatusCode() + "status=" + getStatusCode() +
'}'; '}';
} }

18
spring-web-reactive/src/test/java/org/springframework/web/client/reactive/WebClientIntegrationTests.java
View File

@ -16,6 +16,10 @@
package org.springframework.web.client.reactive; package org.springframework.web.client.reactive;
import static org.junit.Assert.*;
import static org.springframework.web.client.reactive.HttpRequestBuilders.*;
import static org.springframework.web.client.reactive.WebResponseExtractors.*;
import java.util.function.Consumer; import java.util.function.Consumer;
import okhttp3.HttpUrl; import okhttp3.HttpUrl;
@ -36,12 +40,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.reactive.ReactorHttpClientRequestFactory; import org.springframework.http.client.reactive.ReactorHttpClientRequestFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.springframework.web.client.reactive.HttpRequestBuilders.get;
import static org.springframework.web.client.reactive.HttpRequestBuilders.post;
import static org.springframework.web.client.reactive.WebResponseExtractors.*;
/** /**
* @author Brian Clozel * @author Brian Clozel
*/ */
@ -77,6 +75,7 @@ public class WebClientIntegrationTests {
).assertComplete(); ).assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT));
assertEquals("/greeting?name=Spring", request.getPath()); assertEquals("/greeting?name=Spring", request.getPath());
} }
@ -98,6 +97,7 @@ public class WebClientIntegrationTests {
ts.awaitAndAssertNextValues("Hello Spring!").assertComplete(); ts.awaitAndAssertNextValues("Hello Spring!").assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("testvalue", request.getHeader("X-Test-Header")); assertEquals("testvalue", request.getHeader("X-Test-Header"));
assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT));
assertEquals("/greeting?name=Spring", request.getPath()); assertEquals("/greeting?name=Spring", request.getPath());
@ -125,6 +125,7 @@ public class WebClientIntegrationTests {
} }
}); });
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("/greeting?name=Spring", request.getPath()); assertEquals("/greeting?name=Spring", request.getPath());
assertEquals("text/plain", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("text/plain", request.getHeader(HttpHeaders.ACCEPT));
} }
@ -145,6 +146,7 @@ public class WebClientIntegrationTests {
result.subscribe(ts); result.subscribe(ts);
ts.awaitAndAssertNextValuesWith(p -> assertEquals("barbar", p.getBar())).assertComplete(); ts.awaitAndAssertNextValuesWith(p -> assertEquals("barbar", p.getBar())).assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("/pojo", request.getPath()); assertEquals("/pojo", request.getPath());
assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT));
} }
@ -168,6 +170,7 @@ public class WebClientIntegrationTests {
p -> assertThat(p.getBar(), Matchers.is("bar2")) p -> assertThat(p.getBar(), Matchers.is("bar2"))
).assertValueCount(2).assertComplete(); ).assertValueCount(2).assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("/pojos", request.getPath()); assertEquals("/pojos", request.getPath());
assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT));
} }
@ -193,6 +196,7 @@ public class WebClientIntegrationTests {
} }
).assertComplete(); ).assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("/pojos", request.getPath()); assertEquals("/pojos", request.getPath());
assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("application/json", request.getHeader(HttpHeaders.ACCEPT));
} }
@ -216,6 +220,7 @@ public class WebClientIntegrationTests {
ts.awaitAndAssertNextValuesWith(p -> assertEquals("BARBAR", p.getBar())).assertComplete(); ts.awaitAndAssertNextValuesWith(p -> assertEquals("BARBAR", p.getBar())).assertComplete();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("/pojo/capitalize", request.getPath()); assertEquals("/pojo/capitalize", request.getPath());
assertEquals("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}", request.getBody().readUtf8()); assertEquals("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}", request.getBody().readUtf8());
assertEquals("chunked", request.getHeader(HttpHeaders.TRANSFER_ENCODING)); assertEquals("chunked", request.getHeader(HttpHeaders.TRANSFER_ENCODING));
@ -240,6 +245,7 @@ public class WebClientIntegrationTests {
ts.await().assertError(); ts.await().assertError();
RecordedRequest request = server.takeRequest(); RecordedRequest request = server.takeRequest();
assertEquals(1, server.getRequestCount());
assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT)); assertEquals("*/*", request.getHeader(HttpHeaders.ACCEPT));
assertEquals("/greeting?name=Spring", request.getPath()); assertEquals("/greeting?name=Spring", request.getPath());
} }