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

GH-917 Fix regression with sanitizing headers

Browse Source 
Resolves #917
This commit is contained in:
Oleg Zhurakousky
2022-08-16 16:43:18 +02:00
parent e2bdc440d7
commit d222cb12d5
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/AWSLambdaUtils.java
View File

@@ -46,6 +46,9 @@ public final class AWSLambdaUtils {
static final String AWS_EVENT = "aws-event"; static final String AWS_EVENT = "aws-event";
/**
* The name of the headers that stores AWS Context object.
*/
public static final String AWS_CONTEXT = "aws-context"; public static final String AWS_CONTEXT = "aws-context";
private AWSLambdaUtils() { private AWSLambdaUtils() {

5
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -115,8 +115,9 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
functionDefinition = StringUtils.hasText(functionDefinition) functionDefinition = StringUtils.hasText(functionDefinition)
? functionDefinition ? functionDefinition
: this.applicationContext.getEnvironment().getProperty(FunctionProperties.FUNCTION_DEFINITION, ""); : this.applicationContext.getEnvironment().getProperty(FunctionProperties.FUNCTION_DEFINITION, "");
if (!this.applicationContext.containsBean(functionDefinition) || !KotlinDetector.isKotlinType(this.applicationContext.getBean(functionDefinition).getClass())) {
functionDefinition = this.normalizeFunctionDefinition(functionDefinition); functionDefinition = this.normalizeFunctionDefinition(functionDefinition);
}
if (!StringUtils.hasText(functionDefinition)) { if (!StringUtils.hasText(functionDefinition)) {
logger.info("Can't determine default function definition. Please " logger.info("Can't determine default function definition. Please "
+ "use 'spring.cloud.function.definition' property to explicitly define it."); + "use 'spring.cloud.function.definition' property to explicitly define it.");

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

@@ -755,7 +755,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
} }
else { else {
Map<String, Object> headersMap = new HashMap<>(((Message) result).getHeaders()); Map<String, Object> headersMap = new HashMap<>(((Message) result).getHeaders());
this.sanitizeHeaders(((Message) result).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v)); this.sanitizeHeaders(((Message) input).getHeaders()).forEach((k, v) -> headersMap.putIfAbsent(k, v));
result = MessageBuilder.withPayload(((Message) result).getPayload()).copyHeaders(headersMap).build(); result = MessageBuilder.withPayload(((Message) result).getPayload()).copyHeaders(headersMap).build();
} }
} }