From a318b88da7ba32b86acd2c16a83e91ace7081293 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Wed, 2 Dec 2020 13:10:05 +0100
Subject: [PATCH] interim

---
 .../cloudevent/CloudEventMessageBuilder.java  |  1 -
 ...CloudEventMessageUtilsAndBuilderTests.java | 56 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java

diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java
index 50d58f5b4..c99a83ac7 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java
@@ -57,7 +57,6 @@ public final class CloudEventMessageBuilder<T> {
 		return builder;
 	}
 
-	@SuppressWarnings("unchecked")
 	public static <T> CloudEventMessageBuilder<T> fromMessage(Message<T> message) {
 		CloudEventMessageBuilder<T> builder = new CloudEventMessageBuilder<T>(new HashMap<>(message.getHeaders()));
 		builder.data = message.getPayload();
diff --git a/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java
new file mode 100644
index 000000000..2bd80be88
--- /dev/null
+++ b/spring-cloud-function-context/src/test/java/org/springframework/cloud/function/cloudevent/CloudEventMessageUtilsAndBuilderTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.function.cloudevent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.support.MessageBuilder;
+
+/**
+ * @author Oleg Zhurakousky
+ */
+public class CloudEventMessageUtilsAndBuilderTests {
+
+	@Test
+	public void testAttributeRecognitionAndCanonicalization() {
+		Message<String> httpMessage = MessageBuilder.withPayload("hello")
+				.setHeader(CloudEventMessageUtils.SOURCE, "https://foo.bar")
+				.setHeader(CloudEventMessageUtils.SPECVERSION, "1.0")
+				.setHeader(CloudEventMessageUtils.TYPE, "blah")
+				.setHeader("x", "x")
+				.setHeader("zzz", "zzz")
+				.build();
+		Map<String, Object> attributes = CloudEventMessageUtils.getAttributes(httpMessage);
+		assertThat(attributes.size()).isEqualTo(3);
+		assertThat((String) CloudEventMessageUtils.getData(httpMessage)).isEqualTo("hello");
+
+		Message<String> kafkaMessage = CloudEventMessageBuilder.fromMessage(httpMessage).build(CloudEventMessageUtils.KAFKA_ATTR_PREFIX);
+		attributes = CloudEventMessageUtils.getAttributes(kafkaMessage);
+		assertThat(attributes.size()).isEqualTo(3);
+		assertThat(kafkaMessage.getHeaders().get("ce_source")).isNotNull();
+		assertThat(CloudEventMessageUtils.getSource(kafkaMessage)).isEqualTo(URI.create("https://foo.bar"));
+		assertThat(kafkaMessage.getHeaders().get("ce_type")).isNotNull();
+		assertThat(CloudEventMessageUtils.getType(kafkaMessage)).isEqualTo("blah");
+		assertThat(kafkaMessage.getHeaders().get("ce_specversion")).isNotNull();
+		assertThat(CloudEventMessageUtils.getSpecVersion(kafkaMessage)).isEqualTo("1.0");
+	}
+}