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

Author: olegz

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

@@ -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 static String determinePrefixToUse(Message<?> inputMessage) {
 		}
 	}
 
-	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;
 	}
 }

spring-cloud-function-samples/function-sample-cloudevent/src/main/java/io/spring/cloudevent/CloudeventDemoApplication.java

@@ -135,12 +135,16 @@ public Consumer<Message<SpringReleaseEvent>> pojoConsumer(CloudEventAttributesPr
 			return eventMessage -> {
 				RequestEntity<SpringReleaseEvent> entity = RequestEntity.post(URI.create("http://foo.com"))
 						.headers(HeaderUtils.fromMessage(
-								new MessageHeaders(CloudEventMessageUtils.generateAttributesWithProvider(eventMessage.getHeaders(), provider))))
+								new MessageHeaders(CloudEventMessageUtils.generateAttributes(eventMessage, provider))))
 						.body(eventMessage.getPayload());
 				List<String> sourceHeader = entity.getHeaders().get("ce-source");
-				List<String> typeHeader = entity.getHeaders().get("ce-type");
 				Assert.isTrue(sourceHeader.get(0).equals("https://interface21.com/"), "'source' must be https://interface21.com/");
+				List<String> typeHeader = entity.getHeaders().get("ce-type");
 				Assert.isTrue(typeHeader.get(0).equals("com.interface21"), "'source' must be com.interface21");
+				List<String> idHeader = entity.getHeaders().get("ce-id");
+				Assert.notEmpty(idHeader, "'id' must not be null");
+				List<String> specversionHeader = entity.getHeaders().get("ce-specversion");
+				Assert.notEmpty(specversionHeader, "'specversion' must not be null");
 			};
 	}
 
@@ -153,7 +157,7 @@ public Consumer<Message<Map<String, Object>>> sink(CloudEventAttributesProvider
 		return eventMessage -> {
 			RequestEntity<Map<String, Object>> entity = RequestEntity.post(URI.create("http://foo.com"))
 					.headers(HeaderUtils.fromMessage(
-							new MessageHeaders(CloudEventMessageUtils.generateAttributesWithProvider(eventMessage.getHeaders(), provider))))
+							new MessageHeaders(CloudEventMessageUtils.generateAttributes(eventMessage, provider, "io.spring"))))
 					.body(eventMessage.getPayload());
 			client.exchange(entity, byte[].class);
 		};