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

GH-422, GH-606 Improve generation of default attributes for Consumer

Browse Source
This commit is contained in:
Oleg Zhurakousky
2020-11-16 16:49:59 +01:00
parent ee3868debd
commit 24ef2747ba
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtils.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.function.cloudevent;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -286,21 +285,30 @@ public final class CloudEventMessageUtils {
}
}
public static CloudEventAttributes generateAttributesWithProvider(MessageHeaders headers, CloudEventAttributesProvider provider) {
CloudEventAttributes attributes = new CloudEventAttributes(headers);
/**
* Typically called by Consumer.
*/
public static CloudEventAttributes generateAttributes(Message<?> message, CloudEventAttributesProvider provider) {
CloudEventAttributes attributes = generateDefaultAttributeValues(new CloudEventAttributes(message.getHeaders()),
message.getPayload().getClass().getName().getClass().getName(), message.getPayload().getClass().getName().getClass().getName());
provider.generateDefaultCloudEventHeaders(attributes);
return attributes;
}
public static CloudEventAttributes generateAttributes(Message<?> inputMessage, Object result, String applicationName) {
CloudEventAttributes attributes = new CloudEventAttributes(inputMessage.getHeaders(), CloudEventMessageUtils.determinePrefixToUse(inputMessage));
return generateDefaultAttributeValues(attributes, result.getClass().getName(), applicationName);
}
private static CloudEventAttributes generateDefaultAttributeValues(CloudEventAttributes attributes, String source, String type) {
if (attributes.isValidCloudEvent()) {
return attributes
.setSpecversion("1.0")
.setId(UUID.randomUUID().toString())
.setType(result.getClass().getName())
.setSource(applicationName);
.setType(type)
.setSource(source);
}
return new CloudEventAttributes(Collections.emptyMap());
return attributes;
}
}