From 2df5dcc992b6919c3b07bd893f88e05f0786450d Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 24 Apr 2018 09:46:48 +0100
Subject: [PATCH] Compiler warnings

---
 .../function/web/flux/FunctionController.java | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
index f495c649c..9518c52ad 100644
--- a/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
+++ b/spring-cloud-function-web/src/main/java/org/springframework/cloud/function/web/flux/FunctionController.java
@@ -16,9 +16,16 @@
 
 package org.springframework.cloud.function.web.flux;
 
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.reactivestreams.Publisher;
+
 import org.springframework.cloud.function.context.catalog.FunctionInspector;
 import org.springframework.cloud.function.context.message.MessageUtils;
 import org.springframework.cloud.function.web.flux.constants.WebRequestConstants;
@@ -32,15 +39,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.request.WebRequest;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.Optional;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
 /**
  * @author Dave Syer
  * @author Mark Fisher
@@ -67,7 +69,8 @@ public class FunctionController {
 
 	@PostMapping(path = "/**")
 	@ResponseBody
-	public ResponseEntity<Publisher<?>> post(WebRequest request, @RequestBody FluxRequest<?> body) {
+	public ResponseEntity<Publisher<?>> post(WebRequest request,
+			@RequestBody FluxRequest<?> body) {
 
 		@SuppressWarnings("unchecked")
 		Function<Flux<?>, Flux<?>> function = (Function<Flux<?>, Flux<?>>) request
@@ -75,10 +78,10 @@ public class FunctionController {
 		@SuppressWarnings("unchecked")
 		Consumer<Flux<?>> consumer = (Consumer<Flux<?>>) request
 				.getAttribute(WebRequestConstants.CONSUMER, WebRequest.SCOPE_REQUEST);
-		Boolean single = (Boolean) request
-				.getAttribute(WebRequestConstants.INPUT_SINGLE, WebRequest.SCOPE_REQUEST);
+		Boolean single = (Boolean) request.getAttribute(WebRequestConstants.INPUT_SINGLE,
+				WebRequest.SCOPE_REQUEST);
 
-		FluxFormRequest form = FluxFormRequest.from(request.getParameterMap());
+		FluxFormRequest<?, ?> form = FluxFormRequest.from(request.getParameterMap());
 
 		if (function != null) {
 			Flux<?> flux = body.body() == null ? form.flux() : body.flux();
@@ -92,11 +95,13 @@ public class FunctionController {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Handled POST with function");
 			}
-			return ResponseEntity.ok().body(debug ? result.log() : response(request, function, single, result));
+			return ResponseEntity.ok().body(
+					debug ? result.log() : response(request, function, single, result));
 		}
 
 		if (consumer != null) {
-			Flux<?> flux = body.body() == null ? form.flux().cache() : body.flux().cache(); // send a copy back to the caller
+			Flux<?> flux = body.body() == null ? form.flux().cache()
+					: body.flux().cache(); // send a copy back to the caller
 			if (debug) {
 				flux = flux.log();
 			}
@@ -110,14 +115,17 @@ public class FunctionController {
 		throw new IllegalArgumentException("no such function");
 	}
 
-	private Publisher<?> response(WebRequest request, Object handler, Boolean single, Flux<?> result) {
+	private Publisher<?> response(WebRequest request, Object handler, Boolean single,
+			Flux<?> result) {
 
 		if (single != null && single && isOutputSingle(handler)) {
-			request.setAttribute(WebRequestConstants.OUTPUT_SINGLE, true, WebRequest.SCOPE_REQUEST);
+			request.setAttribute(WebRequestConstants.OUTPUT_SINGLE, true,
+					WebRequest.SCOPE_REQUEST);
 			return Mono.from(result);
 		}
 
-		request.setAttribute(WebRequestConstants.OUTPUT_SINGLE, false, WebRequest.SCOPE_REQUEST);
+		request.setAttribute(WebRequestConstants.OUTPUT_SINGLE, false,
+				WebRequest.SCOPE_REQUEST);
 
 		return result;
 	}
@@ -143,8 +151,8 @@ public class FunctionController {
 		@SuppressWarnings("unchecked")
 		Supplier<Flux<?>> supplier = (Supplier<Flux<?>>) request
 				.getAttribute(WebRequestConstants.SUPPLIER, WebRequest.SCOPE_REQUEST);
-		String argument = (String) request
-				.getAttribute(WebRequestConstants.ARGUMENT, WebRequest.SCOPE_REQUEST);
+		String argument = (String) request.getAttribute(WebRequestConstants.ARGUMENT,
+				WebRequest.SCOPE_REQUEST);
 
 		if (function != null) {
 			return value(function, argument);