SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style: code simplification

Browse Source 
Resolves #1129
This commit is contained in:
Romain
2024-03-23 18:26:41 +01:00
committed by Oleg Zhurakousky
parent 7969d06fc8
commit f9954d7dbd
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
View File

@@ -88,7 +88,10 @@ final public class LocalServerTestSupport {
File javaHome = new File(System.getProperty("java.home")); File javaHome = new File(System.getProperty("java.home"));
assertThat(javaHome.exists()).isTrue(); assertThat(javaHome.exists()).isTrue();
File javaBin = new File(javaHome, "bin"); 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(); assertThat(javaCommand.exists()).isTrue();
String myClassPath = System.getProperty("java.class.path"); String myClassPath = System.getProperty("java.class.path");
assertThat(myClassPath).isNotNull(); assertThat(myClassPath).isNotNull();

18
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/JsonMessageConverter.java
View File

@@ -64,10 +64,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
@Override @Override
protected boolean canConvertTo(Object payload, @Nullable MessageHeaders headers) { protected boolean canConvertTo(Object payload, @Nullable MessageHeaders headers) {
if (!supportsMimeType(headers)) { return supportsMimeType(headers);
return false;
}
return true;
} }
@Override @Override
@@ -78,10 +75,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
private boolean canDiscoverConvertToType(Message<?> message, Class<?> targetClass) { private boolean canDiscoverConvertToType(Message<?> message, Class<?> targetClass) {
if (targetClass == null || targetClass == Object.class) { if (targetClass == null || targetClass == Object.class) {
MimeType mimeType = getMimeType(message.getHeaders()); MimeType mimeType = getMimeType(message.getHeaders());
if (mimeType != null && StringUtils.hasText(mimeType.getParameter("type"))) { return mimeType != null && StringUtils.hasText(mimeType.getParameter("type"));
return true;
}
return false;
} }
return true; return true;
} }
@@ -123,13 +117,7 @@ public class JsonMessageConverter extends AbstractMessageConverter {
if (payload instanceof byte[]) { if (payload instanceof byte[]) {
payload = new String((byte[]) payload, StandardCharsets.UTF_8); payload = new String((byte[]) payload, StandardCharsets.UTF_8);
} }
logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e);
if (logger.isDebugEnabled()) {
logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e);
}
else {
logger.warn("Failed to convert value: " + payload + " to: " + targetClass);
}
} }
} }
} }

5
spring-cloud-function-samples/function-sample-gcp-http/src/test/java/com/example/LocalServerTestSupport.java
View File

@@ -113,7 +113,10 @@ final public class LocalServerTestSupport {
assertThat(javaHome.exists()).isTrue(); assertThat(javaHome.exists()).isTrue();
File javaBin = new File(javaHome, "bin"); 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(); assertThat(javaCommand.exists()).isTrue();
return javaCommand.toString(); return javaCommand.toString();

2
spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
View File

@@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-kotlin</artifactId> <artifactId>spring-cloud-function-kotlin</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>