PR-605 less formatting

Resolves #605

Author: olegz

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

@@ -596,7 +596,7 @@ private Object enrichInvocationResultIfNecessary(Object input, Object result) {
 				if (result instanceof Message) {
 					Map<String, Object> headersMap = (Map<String, Object>) ReflectionUtils
 							.getField(SimpleFunctionRegistry.this.headersField, ((Message) result).getHeaders());
-					headersMap.putAll(this.sanitizeHeaders(((Message) input).getHeaders()));
+					this.sanitizeHeaders(((Message) input).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v));
 				}
 				else {
 					result = MessageBuilder.withPayload(result).copyHeaders(this.sanitizeHeaders(((Message) input).getHeaders())).build();

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java

@@ -311,6 +311,7 @@ public void lookupDefaultName() {
 		assertThat(function).isNotNull();
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void lookupWithCompositionFunctionAndConsumer() {
 		SimpleFunctionRegistry functionRegistry = new SimpleFunctionRegistry(this.conversionService, this.messageConverter,
@@ -347,6 +348,22 @@ public void lookupWithReactiveConsumer() {
 		functionWrapper.apply("123");
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Test
+	public void testHeaderEnricherFunction() {
+		FunctionRegistration<HeaderEnricherFunction> registration =
+			new FunctionRegistration<>(new HeaderEnricherFunction(), "headerEnricher")
+				.type(FunctionType.of(HeaderEnricherFunction.class));
+		SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter,
+			new JacksonMapper(new ObjectMapper()));
+		catalog.register(registration);
+		Function<Message<?>, Message<?>> function = catalog.lookup("headerEnricher");
+		Message<?> message =
+			function.apply(MessageBuilder.withPayload("hello").setHeader("original", "originalValue")
+				.build());
+		assertThat(message.getHeaders().get("original")).isEqualTo("newValue");
+	}
+
 
 	public Function<String, String> uppercase() {
 		return v -> v.toUpperCase();
@@ -501,4 +518,13 @@ public Flux<List<String>> apply(Flux<Message<List<Person>>> listFlux) {
 				.map(lst -> lst.stream().map(Person::getName).collect(Collectors.toList()));
 		}
 	}
+
+	private static class HeaderEnricherFunction implements Function<Message<?>, Message<?>> {
+
+		@Override
+		public Message<?> apply(Message<?> message) {
+			return MessageBuilder.withPayload(message.getPayload()).setHeader("original", "newValue")
+				.build();
+		}
+	}
 }

spring-cloud-function-context/src/test/java/org/springframework/cloud/function/userissues/UserIssuesTests.java

@@ -22,6 +22,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -34,7 +35,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.GenericMessage;
 
-import reactor.core.publisher.Flux;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -104,17 +104,16 @@ public void testIssue601() throws Exception {
 		FunctionCatalog catalog = this.configureCatalog(Issue601Configuration.class);
 		FunctionInvocationWrapper function = catalog.lookup("uppercase");
 		assertThat(function.getInputType().getTypeName())
-			.isEqualTo(ResolvableType.forClassWithGenerics(Flux.class, String.class).getType().getTypeName());
+				.isEqualTo(ResolvableType.forClassWithGenerics(Flux.class, String.class).getType().getTypeName());
 		assertThat(function.getOutputType().getTypeName())
-		.isEqualTo(ResolvableType.forClassWithGenerics(Flux.class, Integer.class).getType().getTypeName());
+				.isEqualTo(ResolvableType.forClassWithGenerics(Flux.class, Integer.class).getType().getTypeName());
 		Flux<Integer> result = (Flux<Integer>) function.apply(Flux.just("julien", "ricky", "bubbles"));
 		List<Integer> results = result.collectList().block();
 		assertThat(results.get(0)).isEqualTo(6);
 		assertThat(results.get(1)).isEqualTo(5);
 		assertThat(results.get(2)).isEqualTo(7);
 	}
 
-
 	@EnableAutoConfiguration
 	@Configuration
 	public static class Issue602Configuration {
@@ -133,17 +132,17 @@ public Function<List<Product>, Integer> consumer() {
 	@Configuration
 	public static class Issue601Configuration {
 		@Bean
-	    public Uppercase uppercase() {
-	        return new Uppercase();
-	    }
+		public Uppercase uppercase() {
+			return new Uppercase();
+		}
 	}
 
 	public static class Uppercase implements Function<Flux<String>, Flux<Integer>> {
 
-	    @Override
-	    public Flux<Integer> apply(Flux<String> s) {
-	        return s.map(v -> v.length());
-	    }
+		@Override
+		public Flux<Integer> apply(Flux<String> s) {
+			return s.map(v -> v.length());
+		}
 	}
 
 	public static class Product {