Check if object is already a ResponseEntity, if so return instead of … (#1343)

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/SingleReturnValueHandler.java

@@ -100,6 +100,10 @@ public class SingleReturnValueHandler implements AsyncHandlerMethodReturnValueHa
 				.map(new Func1<Object, ResponseEntity<?>>() {
 					@Override
 					public ResponseEntity<?> call(Object object) {
+						if (object instanceof ResponseEntity){
+			                            return (ResponseEntity) object;
+                        			}
+
 						return new ResponseEntity<Object>(object,
 								getHttpHeaders(responseEntity),
 								getHttpStatus(responseEntity));

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/rx/SingleReturnValueHandlerTest.java

@@ -69,7 +69,13 @@ public class SingleReturnValueHandlerTest {
 
 		@RequestMapping(method = RequestMethod.GET, value = "/singleWithResponse")
 		public ResponseEntity<Single<String>> singleWithResponse() {
-            return new ResponseEntity<>(Single.just("single value"), HttpStatus.NOT_FOUND);
+			return new ResponseEntity<>(Single.just("single value"),
+					HttpStatus.NOT_FOUND);
+		}
+
+		@RequestMapping(method = RequestMethod.GET, value = "/singleCreatedWithResponse")
+		public Single<ResponseEntity<String>> singleOuterWithResponse() {
+			return Single.just(new ResponseEntity<>("single value", HttpStatus.CREATED));
 		}
 
         @RequestMapping(method = RequestMethod.GET, value = "/throw")
@@ -114,6 +120,19 @@ public class SingleReturnValueHandlerTest {
 		assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
 	}
 
+	@Test
+	public void shouldRetrieveSingleValueWithCreatedCode() {
+
+		// when
+		ResponseEntity<String> response = restTemplate.getForEntity(path("/singleCreatedWithResponse"),
+				String.class);
+
+		// then
+		assertNotNull(response);
+		assertEquals(HttpStatus.CREATED, response.getStatusCode());
+		assertEquals("single value", response.getBody());
+	}
+
 	private String path(String context) {
 		return String.format("http://localhost:%d%s", port, context);
 	}