From 1731460eac779a9b2d58f27515e7563e73326537 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Fri, 15 Jul 2016 17:53:15 +0200
Subject: [PATCH] Ensure Reactor & RxJava response extractors compile with
 Eclipse JDT

---
 .../web/client/reactive/ResponseExtractors.java           | 3 +--
 .../reactive/support/RxJava1ResponseExtractors.java       | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
index c55253c37b1..ca835fc6e4e 100644
--- a/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
+++ b/spring-web/src/main/java/org/springframework/web/client/reactive/ResponseExtractors.java
@@ -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()));
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java b/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java
index 4a6a4935ef1..b12263f9681 100644
--- a/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java
+++ b/spring-web/src/main/java/org/springframework/web/client/reactive/support/RxJava1ResponseExtractors.java
@@ -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())));
 	}