Polish to fix build

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/SpringBootRequestHandler.java

@@ -28,6 +28,7 @@ import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.function.context.AbstractSpringFunctionAdapterInitializer;
 import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
+import org.springframework.messaging.Message;
 
 /**
  * @param <E> event type
@@ -61,6 +62,9 @@ public class SpringBootRequestHandler<E, O> extends AbstractSpringFunctionAdapte
 	protected <T> T result(Object input, Publisher<?> output) {
 		List<O> result = new ArrayList<>();
 		for (Object value : Flux.from(output).toIterable()) {
+			if (value instanceof Message<?> && !((FunctionInvocationWrapper) this.function()).isOutputTypeMessage()) {
+				value = ((Message<?>) value).getPayload();
+			}
 			result.add(convertOutput(value));
 		}
 		if (isSingleValue(input) && result.size() == 1) {

spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java

@@ -729,6 +729,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 		 *
 		 */
 		private Object convertInputIfNecessary(Object input, Type type) {
+			if (type == null) {
+				return input;
+			}
 			if (this.getRawClassFor(type) == Void.class && !(input instanceof Publisher) && !(input instanceof Message)) {
 				logger.info("Input value '" + input + "' is ignored for function '"
 						+ this.functionDefinition + "' since it's input type is Void and as such it is treated as Supplier.");

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

@@ -95,10 +95,11 @@ public class ContextFunctionCatalogAutoConfiguration {
 		mcList = mcList.stream()
 				.filter(c -> isConverterEligible(c))
 				.collect(Collectors.toList());
-		mcList.add(new StringMessageConverter());
+
-		mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService));
 		mcList.add(new JsonMessageConverter(jsonMapper));
 		mcList.add(new ByteArrayMessageConverter());
+		mcList.add(new StringMessageConverter());
+		mcList.add(new PrimitiveTypesFromStringMessageConverter(conversionService));
 
 
 		if (!CollectionUtils.isEmpty(mcList)) {

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

@@ -170,10 +170,10 @@ public class ContextFunctionCatalogInitializer implements ApplicationContextInit
 					List<MessageConverter> messageConverters = new ArrayList<>();
 					JsonMapper jsonMapper = this.context.getBean(JsonMapper.class);
 
-					messageConverters.add(new StringMessageConverter());
-					messageConverters.add(new PrimitiveTypesFromStringMessageConverter(new DefaultConversionService()));
 					messageConverters.add(new JsonMessageConverter(jsonMapper));
 					messageConverters.add(new ByteArrayMessageConverter());
+					messageConverters.add(new StringMessageConverter());
+					messageConverters.add(new PrimitiveTypesFromStringMessageConverter(new DefaultConversionService()));
 
 					SmartCompositeMessageConverter messageConverter = new SmartCompositeMessageConverter(messageConverters);