General cleanup

Author: olegz

spring-cloud-function-adapters/spring-cloud-function-grpc/src/test/java/org/springframework/cloud/function/grpc/GrpcInteractionTests.java

@@ -33,7 +33,6 @@
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.function.utils.SocketUtils;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.Message;

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

@@ -31,6 +31,7 @@
 import org.springframework.messaging.converter.AbstractMessageConverter;
 import org.springframework.messaging.converter.MessageConverter;
 import org.springframework.util.MimeType;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -47,7 +48,9 @@ public class JsonMessageConverter extends AbstractMessageConverter {
 	private final JsonMapper jsonMapper;
 
 	public JsonMessageConverter(JsonMapper jsonMapper) {
-		this(jsonMapper, new MimeType("application", "json"), new MimeType(CloudEventMessageUtils.APPLICATION_CLOUDEVENTS.getType(),
+
+		this(jsonMapper, new MimeType(MimeTypeUtils.APPLICATION_JSON, StandardCharsets.UTF_8),
+			new MimeType(CloudEventMessageUtils.APPLICATION_CLOUDEVENTS.getType(),
 				CloudEventMessageUtils.APPLICATION_CLOUDEVENTS.getSubtype() + "+json"));
 	}
 
@@ -101,8 +104,8 @@ protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @
 				return message.getPayload();
 			}
 		}
-		if (targetClass == byte[].class && message.getPayload() instanceof String) {
-			return ((String) message.getPayload()).getBytes(StandardCharsets.UTF_8);
+		if (targetClass == byte[].class && message.getPayload() instanceof String stringPayload) {
+			return stringPayload.getBytes(StandardCharsets.UTF_8);
 		}
 		else {
 			try {
@@ -114,8 +117,8 @@ protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @
 				}
 				else if (logger.isDebugEnabled()) {
 					Object payload = message.getPayload();
-					if (payload instanceof byte[]) {
-						payload = new String((byte[]) payload, StandardCharsets.UTF_8);
+					if (payload instanceof byte[] bytePayload) {
+						payload = new String(bytePayload, StandardCharsets.UTF_8);
 					}
 					logger.debug("Failed to convert value: " + payload + " to: " + targetClass, e);
 				}

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/utils/FunctionMessageUtils.java

@@ -20,7 +20,6 @@
 import java.util.Locale;
 
 import org.springframework.cloud.function.context.message.MessageUtils;
-import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
 /**
@@ -36,14 +35,6 @@ private FunctionMessageUtils() {
 
 	}
 
-	public static String getSourceType(String functionDefinition, Message<?> message) {
-		return determineSourceFromHeaders(message.getHeaders());
-	}
-
-	public static String getTargetType(String functionDefinition, Message<?> message) {
-		return message.getHeaders().containsKey(MessageUtils.TARGET_PROTOCOL) ? (String) message.getHeaders().get(MessageUtils.TARGET_PROTOCOL) : "unknown";
-	}
-
 	private static String determineSourceFromHeaders(MessageHeaders headers) {
 		for (String key : headers.keySet()) {
 			if (key.equals(MessageUtils.SOURCE_TYPE)) {