GH-791 Add support for propagating input headers

Resolves #791

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

@@ -170,6 +170,8 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA
 
 		private Map<String, Object> outputHeaderMappingExpression;
 
+		private boolean copyInputHeaders;
+
 		public Map<String, Object> getInputHeaderMappingExpression() {
 			return inputHeaderMappingExpression;
 		}
@@ -187,5 +189,13 @@ public class FunctionProperties implements EnvironmentAware, ApplicationContextA
 			this.outputHeaderMappingExpression = outputHeaderMappingExpression;
 		}
 
+		public boolean isCopyInputHeaders() {
+			return copyInputHeaders;
+		}
+
+		public void setCopyInputHeaders(boolean copyInputHeaders) {
+			this.copyInputHeaders = copyInputHeaders;
+		}
+
 	}
 }

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

@@ -408,6 +408,8 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 
 		private boolean isSingleton = true;
 
+		private boolean propagateInputHeaders;
+
 		/*
 		 * This is primarily to support Stream's ability to access
 		 * un-converted payload (e.g., to evaluate expression on some attribute of a payload)
@@ -433,6 +435,15 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 			this.outputType = this.normalizeType(outputType);
 			this.functionDefinition = functionDefinition;
 			this.message = this.inputType != null && FunctionTypeUtils.isMessage(this.inputType);
+			if (functionProperties != null) {
+				Map<String, FunctionConfigurationProperties> funcConfiguration = functionProperties.getConfiguration();
+				if (!CollectionUtils.isEmpty(funcConfiguration)) {
+					FunctionConfigurationProperties configuration = funcConfiguration.get(functionDefinition);
+					if (configuration != null) {
+						propagateInputHeaders = configuration.isCopyInputHeaders();
+					}
+				}
+			}
 		}
 
 		public boolean isSkipOutputConversion() {
@@ -1091,6 +1102,9 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 		}
 
 		private boolean isExtractPayload(Message<?> message, Type type) {
+			if (this.propagateInputHeaders) {
+				return false;
+			}
 			if (this.isRoutingFunction()) {
 				return false;
 			}

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

@@ -58,6 +58,7 @@ import org.springframework.cloud.function.context.FunctionType;
 import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper;
 import org.springframework.cloud.function.json.JsonMapper;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.lang.Nullable;
@@ -673,6 +674,29 @@ public class BeanFactoryAwareFunctionRegistryTests {
 		assertThat(result).startsWith("{date=");
 	}
 
+	@Test
+	public void test_791() {
+		try (ConfigurableApplicationContext ac = new SpringApplicationBuilder(InputHeaderPropagationConfiguration.class)
+				.run("--logging.level.org.springframework.cloud.function=DEBUG",
+						"--spring.main.lazy-initialization=true")) {
+			FunctionCatalog catalog = ac.getBean(FunctionCatalog.class);
+
+			Function<Message<String>, Message<byte[]>> uppercase = catalog.lookup("uppercase", "application/json");
+			Message<byte[]> result = uppercase.apply(MessageBuilder.withPayload("bob").setHeader("foo", "bar").build());
+			assertThat(result.getHeaders()).doesNotContainKey("foo");
+		}
+		try (ConfigurableApplicationContext ac = new SpringApplicationBuilder(InputHeaderPropagationConfiguration.class)
+				.run("--logging.level.org.springframework.cloud.function=DEBUG",
+						"--spring.main.lazy-initialization=true",
+						"--spring.cloud.function.configuration.uppercase.copy-input-headers=true")) {
+			FunctionCatalog catalog = ac.getBean(FunctionCatalog.class);
+
+			Function<Message<String>, Message<byte[]>> uppercase = catalog.lookup("uppercase", "application/json");
+			Message<byte[]> result = uppercase.apply(MessageBuilder.withPayload("bob").setHeader("foo", "bar").build());
+			assertThat(result.getHeaders()).containsKey("foo");
+		}
+	}
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Test
 	public void testArrayPayloadOnFluxFunction() throws Exception {
@@ -924,6 +948,16 @@ public class BeanFactoryAwareFunctionRegistryTests {
 		}
 	}
 
+	@EnableAutoConfiguration
+	@Configuration
+	protected static class InputHeaderPropagationConfiguration {
+
+		@Bean
+		public Function<String, String> uppercase() {
+			return x -> x.toUpperCase();
+		}
+	}
+
 	@EnableAutoConfiguration
 	@Configuration
 	protected static class SampleFunctionConfiguration {