Browse Source

Ensure Reactor & RxJava response extractors compile with Eclipse JDT

pull/1090/merge
Sam Brannen 10 years ago
parent
commit
1731460eac
  1. 3
      spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
  2. 8
      spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java

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

@ -117,8 +117,7 @@ public class ResponseExtractors { @@ -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

@ -90,10 +90,10 @@ public class RxJava1ResponseExtractors { @@ -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())));
}

Loading…
Cancel
Save