Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure Reactor & RxJava response extractors compile with Eclipse JDT

Browse Source
This commit is contained in:
Sam Brannen
2016-07-15 17:53:15 +02:00
parent 841480596e
commit 1731460eac
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
View File

@@ -117,8 +117,7 @@ public class ResponseExtractors {
ResolvableType type) {
return (clientResponse, messageConverters) -> clientResponse
.map(response -> new ResponseEntity<>(
decodeResponseBody(response, type,
messageConverters),
ResponseExtractors.<T> decodeResponseBody(response, type, messageConverters),
response.getHeaders(), response.getStatusCode()));
}

8
spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java
View File

@@ -90,10 +90,10 @@ public class RxJava1ResponseExtractors {
*/
public static <T> ResponseExtractor<Single<ResponseEntity<Observable<T>>>> responseStream(Class<T> sourceClass) {
ResolvableType resolvableType = ResolvableType.forClass(sourceClass);
return (clientResponse, messageConverters) -> RxJava1SingleConverter.fromPublisher(clientResponse
.map(response -> new ResponseEntity<>(
RxJava1ObservableConverter
.fromPublisher(decodeResponseBody(response, resolvableType, messageConverters)),
return (clientResponse, messageConverters) -> RxJava1SingleConverter.fromPublisher(
clientResponse.map(response -> new ResponseEntity<>(
RxJava1ObservableConverter.fromPublisher(
RxJava1ResponseExtractors.<T> decodeResponseBody(response, resolvableType, messageConverters)),
response.getHeaders(),
response.getStatusCode())));
}