add test and fix serde issues

Signed-off-by: Ning Sun <sunng@protonmail.com>
cloudevents · sunng87 · Jul 12, 2021 · Jul 13, 2021 · Jul 13, 2021 · Jul 14, 2021
commit 8505d783d5495288b3fb2ebfbc294fc382d7dd46
diff --git a/formats/avro/pom.xml b/formats/avro/pom.xml
@@ -50,8 +50,8 @@
                         </goals>
                         <configuration>
                             <sourceDirectory>${project.basedir}/src/main/avro/</sourceDirectory>
-
                             <outputDirectory>${project.build.directory}/generated-sources/java/</outputDirectory>
+                            <stringType>String</stringType>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/formats/avro/src/main/java/io/cloudevents/avro/AvroCloudEventDataWrapper.java b/formats/avro/src/main/java/io/cloudevents/avro/AvroCloudEventDataWrapper.java
@@ -35,7 +35,7 @@ public class AvroCloudEventDataWrapper implements CloudEventData {
     /**
      * Wraps a JSON object-like data structure.
      */
-    public AvroCloudEventDataWrapper(Map<CharSequence, Object> data) {
+    public AvroCloudEventDataWrapper(Map<String, Object> data) {
         avroCloudEventData = new AvroCloudEventData();
         avroCloudEventData.setValue(data);
     }

diff --git a/formats/avro/src/main/java/io/cloudevents/avro/AvroDeserializer.java b/formats/avro/src/main/java/io/cloudevents/avro/AvroDeserializer.java
@@ -19,6 +19,7 @@
 
 import java.util.Map;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.time.OffsetDateTime;
 
 import io.cloudevents.CloudEventData;
@@ -43,32 +44,36 @@ public AvroDeserializer(AvroCloudEvent avroCloudEvent) {
     @Override
     public <W extends CloudEventWriter<R>, R> R read(CloudEventWriterFactory<W, R> writerFactory,
                                                      CloudEventDataMapper<? extends CloudEventData> mapper) throws CloudEventRWException {
-
-        Map<CharSequence, Object> avroCloudEventAttrs = this.avroCloudEvent.getAttribute();
+        Map<String, Object> avroCloudEventAttrs = this.avroCloudEvent.getAttribute();
         SpecVersion specVersion = SpecVersion.parse((String)avroCloudEventAttrs.get(CloudEventV1.SPECVERSION));
         final CloudEventWriter<R> writer = writerFactory.create(specVersion);
 
-        for (Map.Entry<CharSequence, Object> entry: avroCloudEventAttrs.entrySet()) {
+        for (Map.Entry<String, Object> entry: avroCloudEventAttrs.entrySet()) {
             String key = entry.getKey().toString();
 
-            if (key.equals(CloudEventV1.TIME)) {
-                // OffsetDateTime
-                OffsetDateTime value = OffsetDateTime.parse((String) entry.getValue());
-                writer.withContextAttribute(key, value);
-
-            } else if (key.equals(CloudEventV1.DATASCHEMA)) {
-                // URI
-                URI value = URI.create((String) entry.getValue());
-                writer.withContextAttribute(key, value);
-            } else {
-                // String
-                writer.withContextAttribute(key, (String) entry.getValue());
+            switch(key) {
+                case CloudEventV1.SPECVERSION:
+                    continue;
+                case CloudEventV1.TIME: {
+                    // OffsetDateTime
+                    OffsetDateTime value = OffsetDateTime.parse((String) entry.getValue());
+                    writer.withContextAttribute(key, value);
+                };
+                case CloudEventV1.DATASCHEMA: {
+                    // URI
+                    URI value = URI.create((String) entry.getValue());
+                    writer.withContextAttribute(key, value);
+                };
+                default:
+                    writer.withContextAttribute(key, (String) entry.getValue());
             }
         }
 
-        byte[] data = (byte[]) this.avroCloudEvent.getData();
+        ByteBuffer buffer = (ByteBuffer) this.avroCloudEvent.getData();
 
-        if (data != null) {
+        if (buffer != null) {
+            byte[] data = new byte[buffer.remaining()];
+            buffer.get(data);
             return writer.end(mapper.map(BytesCloudEventData.wrap(data)));
         } else {
             return writer.end();

diff --git a/formats/avro/src/main/java/io/cloudevents/avro/AvroSerializer.java b/formats/avro/src/main/java/io/cloudevents/avro/AvroSerializer.java
@@ -17,6 +17,7 @@
 
 package io.cloudevents.avro;
 
+import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -30,26 +31,32 @@ class AvroSerializer {
     public static final AvroCloudEvent toAvro(CloudEvent e) {
         AvroCloudEvent avroCloudEvent = new AvroCloudEvent();
 
-        Map<CharSequence, Object> attrs = new HashMap<>();
+        Map<String, Object> attrs = new HashMap<>();
 
-        attrs.put(CloudEventV1.TYPE, e.getType());
         attrs.put(CloudEventV1.SPECVERSION, e.getSpecVersion().toString());
+        attrs.put(CloudEventV1.TYPE, e.getType());
         attrs.put(CloudEventV1.ID, e.getId());
         attrs.put(CloudEventV1.SOURCE, e.getSource());
-        // convert to string
-        attrs.put(CloudEventV1.TIME, e.getTime().toString());
-        // convert
-        attrs.put(CloudEventV1.DATASCHEMA, e.getDataSchema().toString());
-        attrs.put(CloudEventV1.SUBJECT, e.getSubject());
 
+        if (e.getTime() != null) {
+            // convert to string
+            attrs.put(CloudEventV1.TIME, e.getTime().toString());
+        }
+
+        if (e.getDataSchema() != null) {
+            // convert
+            attrs.put(CloudEventV1.DATASCHEMA, e.getDataSchema().toString());
+        }
+
+        attrs.put(CloudEventV1.SUBJECT, e.getSubject());
         attrs.put(CloudEventV1.DATACONTENTTYPE, e.getDataContentType());
 
         avroCloudEvent.setAttribute(attrs);
 
         // check datacontenttype
         CloudEventData cloudEventData = e.getData();
         if (cloudEventData != null) {
-            avroCloudEvent.setData(cloudEventData.toBytes());
+            avroCloudEvent.setData(ByteBuffer.wrap(cloudEventData.toBytes()));
         }
 
         return avroCloudEvent;

diff --git a/formats/avro/src/test/java/io/cloudevents/avro/AvroFormatTest.java b/formats/avro/src/test/java/io/cloudevents/avro/AvroFormatTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2018-Present The CloudEvents Authors
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 io.cloudevents.avro;
+
+import java.util.Map;
+import java.net.URI;
+
+import io.cloudevents.CloudEvent;
+import io.cloudevents.CloudEventData;
+import io.cloudevents.SpecVersion;
+import io.cloudevents.core.builder.CloudEventBuilder;
+import io.cloudevents.core.format.EventFormat;
+import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AvroFormatTest {
+
+    Map<String, Object> testData = Map.of("name", "Ning", "age", 22.0);
+
+    @Test
+    public void testSerde() {
+        EventFormat avroFormat = new AvroFormat();
+        CloudEventData cloudEventData = new AvroCloudEventDataWrapper(testData);
+
+        assertThat(cloudEventData).isNotNull();
+        assertThat(cloudEventData.toBytes()).isNotNull();
+
+        CloudEvent cloudEvent = CloudEventBuilder.v1()
+            .withId("1")
+            .withType("testdata")
+            .withSource(URI.create("http://localhost/test"))
+            .withData("application/avro", cloudEventData)
+            .build();
+        assertThat(cloudEvent).isNotNull();
+        assertThat(cloudEvent.getSpecVersion()).isEqualTo(SpecVersion.V1);
+
+        byte[] bytes = avroFormat.serialize(cloudEvent);
+
+        assertThat(bytes).isNotNull();
+        assertThat(bytes).hasSizeGreaterThan(0);
+
+        CloudEvent cloudEvent2 = avroFormat.deserialize(bytes);
+
+        assertThat(cloudEvent2).isNotNull();
+        assertThat(cloudEvent2.getId()).isEqualTo("1");
+        assertThat(cloudEvent2.getType()).isEqualTo("testdata");
+    }
+
+}
diff --git a/formats/avro/src/test/resources/v03/min.proto.json b/formats/avro/src/test/resources/v03/min.proto.json
diff --git a/formats/avro/src/test/resources/v1/binary_ext.proto.json b/formats/avro/src/test/resources/v1/binary_ext.proto.json
diff --git a/formats/avro/src/test/resources/v1/json_data.proto.json b/formats/avro/src/test/resources/v1/json_data.proto.json
diff --git a/formats/avro/src/test/resources/v1/json_data_with_ext.proto.json b/formats/avro/src/test/resources/v1/json_data_with_ext.proto.json
diff --git a/formats/avro/src/test/resources/v1/min.proto.json b/formats/avro/src/test/resources/v1/min.proto.json
diff --git a/formats/avro/src/test/resources/v1/text_data.proto.json b/formats/avro/src/test/resources/v1/text_data.proto.json
diff --git a/formats/avro/src/test/resources/v1/xml_data.proto.json b/formats/avro/src/test/resources/v1/xml_data.proto.json