From 59b067f9a2c0fbd0247daced6bd6516600efaf1e Mon Sep 17 00:00:00 2001
From: Tim Gage <timothy.gage@oodlefinance.com>
Date: Thu, 13 Jan 2022 16:01:01 +0000
Subject: [PATCH 1/2] Allow java.util.UUID as one of the types that are allowed
 for serialization by default.

---
 .../DefaultInvocationSerializer.java          | 68 ++++++++++---------
 .../TestDefaultInvocationSerializer.java      |  8 +++
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java b/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
index 3425ec30..026cc08b 100644
--- a/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
+++ b/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
@@ -42,6 +42,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.UUID;
+
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
 
@@ -54,6 +56,7 @@
  *   <li>Primitive types such as {@code int} or {@code double} or the boxed equivalents
  *   <li>{@link String}
  *   <li>{@link java.util.Date}
+ *   <li>{@link java.util.UUID}
  *   <li>The {@code java.time} classes:
  *       <ul>
  *         <li>{@link java.time.DayOfWeek}
@@ -125,41 +128,44 @@ private static final class InvocationJsonSerializer
       addClassPair(boolean.class, "boolean");
       addClassPair(char.class, "char");
 
-      addClassPair(Byte.class, "Byte");
-      addClassPair(Short.class, "Short");
-      addClassPair(Integer.class, "Integer");
-      addClassPair(Long.class, "Long");
-      addClassPair(Float.class, "Float");
-      addClassPair(Float.class, "Float");
-      addClassPair(Float.class, "Float");
-      addClassPair(Double.class, "Double");
-      addClassPair(Boolean.class, "Boolean");
-      addClassPair(Character.class, "Character");
-
-      addClassPair(BigDecimal.class, "BigDecimal");
-      addClassPair(String.class, "String");
-      addClassPair(Date.class, "Date");
-
-      addClassPair(DayOfWeek.class, "DayOfWeek");
-      addClassPair(Duration.class, "Duration");
-      addClassPair(Instant.class, "Instant");
-      addClassPair(LocalDate.class, "LocalDate");
-      addClassPair(LocalDateTime.class, "LocalDateTime");
-      addClassPair(Month.class, "Month");
-      addClassPair(MonthDay.class, "MonthDay");
-      addClassPair(Period.class, "Period");
-      addClassPair(Year.class, "Year");
-      addClassPair(YearMonth.class, "YearMonth");
-      addClassPair(ZoneOffset.class, "ZoneOffset");
-      addClassPair(DayOfWeek.class, "DayOfWeek");
-      addClassPair(ChronoUnit.class, "ChronoUnit");
-
-      addClassPair(Transaction.class, "Transaction");
-      addClassPair(TransactionContextPlaceholder.class, "TransactionContext");
+      addClass(Byte.class);
+      addClass(Short.class);
+      addClass(Integer.class);
+      addClass(Long.class);
+      addClass(Float.class);
+      addClass(Double.class);
+      addClass(Boolean.class);
+      addClass(Character.class);
+
+      addClass(BigDecimal.class);
+      addClass(String.class);
+      addClass(Date.class);
+      addClass(UUID.class);
+
+      addClass(DayOfWeek.class);
+      addClass(Duration.class);
+      addClass(Instant.class);
+      addClass(LocalDate.class);
+      addClass(LocalDateTime.class);
+      addClass(Month.class);
+      addClass(MonthDay.class);
+      addClass(Period.class);
+      addClass(Year.class);
+      addClass(YearMonth.class);
+      addClass(ZoneOffset.class);
+      addClass(DayOfWeek.class);
+      addClass(ChronoUnit.class);
+
+      addClass(Transaction.class);
+      addClass(TransactionContextPlaceholder.class);
 
       serializableClasses.forEach(clazz -> addClassPair(clazz, clazz.getName()));
     }
 
+    private void addClass(Class<?> clazz) {
+      addClassPair(clazz, clazz.getSimpleName());
+    }
+
     private void addClassPair(Class<?> clazz, String name) {
       classToName.put(clazz, name);
       nameToClass.put(name, clazz);
diff --git a/transactionoutbox-core/src/test/java/com/gruelbox/transactionoutbox/TestDefaultInvocationSerializer.java b/transactionoutbox-core/src/test/java/com/gruelbox/transactionoutbox/TestDefaultInvocationSerializer.java
index cd876f29..eb016399 100644
--- a/transactionoutbox-core/src/test/java/com/gruelbox/transactionoutbox/TestDefaultInvocationSerializer.java
+++ b/transactionoutbox-core/src/test/java/com/gruelbox/transactionoutbox/TestDefaultInvocationSerializer.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Assertions;
@@ -185,6 +186,13 @@ void testMDC() {
           new Invocation(CLASS_NAME, METHOD_NAME, primitives, values, Map.of("A", "1", "B", "2")));
     }
 
+    @Test
+    void testUUID() {
+      Class<?>[] primitives = {UUID.class};
+      Object[] values = {UUID.randomUUID()};
+      check(new Invocation(CLASS_NAME, METHOD_NAME, primitives, values));
+    }
+
     void check(Invocation invocation) {
       Invocation deserialized = serdeser(invocation);
       Assertions.assertEquals(deserialized, serdeser(invocation));

From f262280c360570f541765470a89ad8b6dc139369 Mon Sep 17 00:00:00 2001
From: Tim Gage <timothy.gage@oodlefinance.com>
Date: Fri, 14 Jan 2022 09:54:02 +0000
Subject: [PATCH 2/2] Revert unintended behaviour change.

---
 .../gruelbox/transactionoutbox/DefaultInvocationSerializer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java b/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
index 026cc08b..79091630 100644
--- a/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
+++ b/transactionoutbox-core/src/main/java/com/gruelbox/transactionoutbox/DefaultInvocationSerializer.java
@@ -157,7 +157,7 @@ private static final class InvocationJsonSerializer
       addClass(ChronoUnit.class);
 
       addClass(Transaction.class);
-      addClass(TransactionContextPlaceholder.class);
+      addClassPair(TransactionContextPlaceholder.class, "TransactionContext");
 
       serializableClasses.forEach(clazz -> addClassPair(clazz, clazz.getName()));
     }