From 4bfeb5fc8d282c0fca0614244632ca699d533f91 Mon Sep 17 00:00:00 2001 From: Weronika Trzaska Date: Wed, 16 Oct 2024 21:20:15 -0500 Subject: [PATCH 1/3] Fix messageSerialization test in GenericMessageTest --- .../messaging/GenericMessageTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java index dfbdd0930c..92aa0eca94 100644 --- a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java +++ b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java @@ -27,6 +27,9 @@ import org.axonframework.serialization.json.JacksonSerializer; import org.junit.jupiter.api.*; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -68,7 +71,7 @@ void correlationDataAddedToNewMessage() { } @Test - void messageSerialization() { + void messageSerialization() throws IOException{ GenericMessage message = new GenericMessage<>("payload", Collections.singletonMap("key", "value")); Serializer jacksonSerializer = JacksonSerializer.builder().build(); @@ -76,7 +79,14 @@ void messageSerialization() { SerializedObject serializedMetaData = message.serializeMetaData(jacksonSerializer, String.class); assertEquals("\"payload\"", serializedPayload.getData()); - assertEquals("{\"key\":\"value\",\"foo\":\"bar\"}", serializedMetaData.getData()); + + ObjectMapper objectMapper = new ObjectMapper(); + Map expectedMetaData = new HashMap<>(); + expectedMetaData.put("key", "value"); + expectedMetaData.put("foo", "bar"); + Map actualMetaData = objectMapper.readValue(serializedMetaData.getData(), Map.class); + + assertEquals(expectedMetaData, actualMetaData); } @Test From 207f148652d2e4df19dcfab553d8715793a28ff8 Mon Sep 17 00:00:00 2001 From: Weronika Trzaska Date: Thu, 17 Oct 2024 07:00:54 -0500 Subject: [PATCH 2/3] Fix test messageSerialization by reusing metadata map --- .../messaging/GenericMessageTest.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java index 92aa0eca94..87ef799db7 100644 --- a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java +++ b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java @@ -72,21 +72,23 @@ void correlationDataAddedToNewMessage() { @Test void messageSerialization() throws IOException{ - GenericMessage message = new GenericMessage<>("payload", Collections.singletonMap("key", "value")); - Serializer jacksonSerializer = JacksonSerializer.builder().build(); + Map metaDataMap = Collections.singletonMap("key", "value"); + + GenericMessage message = new GenericMessage<>("payload", metaDataMap); + + JacksonSerializer jacksonSerializer = JacksonSerializer.builder().build(); + SerializedObject serializedPayload = message.serializePayload(jacksonSerializer, String.class); SerializedObject serializedMetaData = message.serializeMetaData(jacksonSerializer, String.class); assertEquals("\"payload\"", serializedPayload.getData()); - ObjectMapper objectMapper = new ObjectMapper(); - Map expectedMetaData = new HashMap<>(); - expectedMetaData.put("key", "value"); - expectedMetaData.put("foo", "bar"); + + ObjectMapper objectMapper = jacksonSerializer.getObjectMapper(); Map actualMetaData = objectMapper.readValue(serializedMetaData.getData(), Map.class); - assertEquals(expectedMetaData, actualMetaData); + assertTrue(actualMetaData.entrySet().containsAll(metaDataMap.entrySet())); } @Test From 985d7b8c3e947a02a6f9312ef4ebbfed2845798b Mon Sep 17 00:00:00 2001 From: Weronika Trzaska Date: Thu, 17 Oct 2024 07:08:27 -0500 Subject: [PATCH 3/3] Remove import Serializer, no longer use --- .../java/org/axonframework/messaging/GenericMessageTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java index 87ef799db7..963c6dee44 100644 --- a/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java +++ b/messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java @@ -23,7 +23,6 @@ import org.axonframework.messaging.unitofwork.UnitOfWork; import org.axonframework.serialization.CannotConvertBetweenTypesException; import org.axonframework.serialization.SerializedObject; -import org.axonframework.serialization.Serializer; import org.axonframework.serialization.json.JacksonSerializer; import org.junit.jupiter.api.*;