From f9954d7dbd40a5fdb08d5321e6d86757194f470a Mon Sep 17 00:00:00 2001
From: Romain <romaingraziani@gmail.com>
Date: Sat, 23 Mar 2024 18:26:41 +0100
Subject: [PATCH] style:  code simplification

Resolves #1129
---
 .../integration/LocalServerTestSupport.java    |  5 ++++-
 .../context/config/JsonMessageConverter.java   | 18 +++---------------
 .../com/example/LocalServerTestSupport.java    |  5 ++++-
 .../function-sample-kotlin-web/pom.xml         |  2 +-
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
index aa98eca30..577739ead 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
@@ -88,7 +88,10 @@ final public class LocalServerTestSupport {
 		File javaHome = new File(System.getProperty("java.home"));
 		assertThat(javaHome.exists()).isTrue();
 		File javaBin = new File(javaHome, "bin");
-		File javaCommand = new File(javaBin, "java");
+		File javaCommand = new File(javaBin, "java.exe");
+		if (!javaCommand.exists()) {
+			javaCommand = new File(javaBin, "java");
+		}
 		assertThat(javaCommand.exists()).isTrue();
 		String myClassPath = System.getProperty("java.class.path");
 		assertThat(myClassPath).isNotNull();
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
index 5aff6ec50..414e39ecc 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
@@ -64,10 +64,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
 
 	@Override
 	protected boolean canConvertTo(Object payload, @Nullable MessageHeaders headers) {
-		if (!supportsMimeType(headers)) {
-			return false;
-		}
-		return true;
+		return supportsMimeType(headers);
 	}
 
 	@Override
@@ -78,10 +75,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
 	private boolean canDiscoverConvertToType(Message<?> message, Class<?> targetClass) {
 		if (targetClass == null || targetClass == Object.class) {
 			MimeType mimeType = getMimeType(message.getHeaders());
-			if (mimeType != null && StringUtils.hasText(mimeType.getParameter("type"))) {
-				return true;
-			}
-			return false;
+			return mimeType != null && StringUtils.hasText(mimeType.getParameter("type"));
 		}
 		return true;
 	}
@@ -123,13 +117,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
 					if (payload instanceof byte[]) {
 						payload = new String((byte[]) payload, StandardCharsets.UTF_8);
 					}
-
-					if (logger.isDebugEnabled()) {
-						logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e);
-					}
-					else {
-						logger.warn("Failed to convert value: " + payload + " to: " + targetClass);
-					}
+					logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e);
 				}
 			}
 		}
diff --git a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/LocalServerTestSupport.java b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/LocalServerTestSupport.java
index 8bbe71943..259174282 100644
--- a/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/LocalServerTestSupport.java
+++ b/spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/LocalServerTestSupport.java
@@ -113,7 +113,10 @@ final public class LocalServerTestSupport {
 		assertThat(javaHome.exists()).isTrue();
 
 		File javaBin = new File(javaHome, "bin");
-		File javaCommand = new File(javaBin, "java");
+		File javaCommand = new File(javaBin, "java.exe");
+		if (!javaCommand.exists()) {
+			javaCommand = new File(javaBin, "java");
+		}
 		assertThat(javaCommand.exists()).isTrue();
 
 		return javaCommand.toString();
diff --git a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
index e22a371f7..1e6d80ed5 100644
--- a/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
+++ b/spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-kotlin</artifactId>
-			<version>4.1.0-SNAPSHOT</version>
+			<version>4.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>