GH-1259 Fix formatting of previous commit

Author: olegz

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java

@@ -33,12 +33,11 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 import com.google.cloud.functions.RawBackgroundFunction;
-
-import reactor.core.publisher.Flux;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.cloud.function.context.FunctionCatalog;
@@ -132,12 +131,7 @@ public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws E
 		Object resultObject = function.apply(message);
 
 		if (resultObject != null) {
-			Message<?> result = null;
-			if (resultObject instanceof Publisher<?>) {
-				result = getResultFromPublisher(resultObject);
-			} else {
-				result = (Message<?>) resultObject;
-			}
+			Message<?> result = resultObject instanceof Publisher<?> ? getResultFromPublisher(resultObject) : (Message<?>) resultObject;
 
 			buildHttpResponse(httpRequest, httpResponse, result);
 		}
@@ -163,7 +157,8 @@ public void accept(String json, Context context) {
 		Message<byte[]> result = null;
 		if (resultObject instanceof Publisher<?>) {
 			result = getResultFromPublisher(resultObject);
-		} else {
+		}
+		else {
 			result = (Message<byte[]>) resultObject;
 		}
 
@@ -172,19 +167,19 @@ public void accept(String json, Context context) {
 		}
 	}
 
-	/**
-	 * This method build the http response from service
-	 * 
-	 * @throws IOException
+	/*
+	 * This method build the http response from service.
 	 */
 	private void buildHttpResponse(HttpRequest httpRequest, HttpResponse httpResponse, Message<?> result)
 			throws IOException {
 		MessageHeaders headers = result.getHeaders();
 		if (result.getHeaders().containsKey(MessageHeaders.CONTENT_TYPE)) {
 			httpResponse.setContentType(result.getHeaders().get(MessageHeaders.CONTENT_TYPE).toString());
-		} else if (result.getHeaders().containsKey("Content-Type")) {
+		}
+		else if (result.getHeaders().containsKey("Content-Type")) {
 			httpResponse.setContentType(result.getHeaders().get("Content-Type").toString());
-		} else {
+		}
+		else {
 			httpRequest.getContentType().ifPresent(contentType -> httpResponse.setContentType(contentType));
 		}
 		String content = result.getPayload() instanceof String strPayload ? strPayload
@@ -196,23 +191,25 @@ private void buildHttpResponse(HttpRequest httpRequest, HttpResponse httpRespons
 				String headerValue = ((Collection<?>) values).stream().map(item -> item.toString())
 						.collect(Collectors.joining(","));
 				httpResponse.appendHeader(header.getKey(), headerValue);
-			} else {
+			}
+			else {
 				httpResponse.appendHeader(header.getKey(), header.getValue().toString());
 			}
 		}
 
 		if (headers.containsKey(HTTP_STATUS_CODE)) {
 			if (headers.get(HTTP_STATUS_CODE) instanceof Integer) {
 				httpResponse.setStatusCode((int) headers.get(HTTP_STATUS_CODE));
-			} else {
+			}
+			else {
 				log.warn("The statusCode should be an Integer value");
 			}
 		}
 	}
 
-	/**
-	 * This methd get the result from reactor's publisher 
-	 * 
+	/*
+	 * This methd get the result from reactor's publisher.
+	 *
 	 * For reference: https://github.com/spring-cloud/spring-cloud-function/blob/main/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
 	 */
 	private Message<byte[]> getResultFromPublisher(Object resultObject) {
@@ -223,17 +220,20 @@ private Message<byte[]> getResultFromPublisher(Object resultObject) {
 			if (item instanceof Message<?> messageItem) {
 				results.add(convertFromJsonIfNecessary(messageItem.getPayload()));
 				lastMessage = messageItem;
-			} else {
+			}
+			else {
 				results.add(convertFromJsonIfNecessary(item));
 			}
 		}
 
 		byte[] resultsPayload;
 		if (results.size() == 1) {
 			resultsPayload = jsonMapper.toJson(results.get(0));
-		} else if (results.size() > 1) {
+		}
+		else if (results.size() > 1) {
 			resultsPayload = jsonMapper.toJson(results);
-		} else {
+		}
+		else {
 			resultsPayload = null;
 		}
 

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java

@@ -22,12 +22,10 @@
 
 import com.github.blindpirate.extensions.CaptureSystemOutput;
 import com.google.gson.Gson;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration;
 import org.springframework.cloud.function.json.JsonMapper;

spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java

@@ -30,14 +30,12 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 import com.google.gson.Gson;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;