more serializers

walmartlabs · Dec 29, 2024 · dd30b94 · dd30b94
1 parent 2da58c0
commit dd30b94
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/...nner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SaveLastErrorCommand.java b/...nner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SaveLastErrorCommand.java
@@ -47,7 +47,7 @@ public class SaveLastErrorCommand implements Command {
     // for backward compatibility (java8 concord 1.92.0 version)
     private static final long serialVersionUID = 5759484819869224819L;
 
-    private static final TypeReference<Map<String, Object>> MAP_TYPE = new TypeReference<Map<String, Object>>() {
+    private static final TypeReference<Map<String, Object>> MAP_TYPE = new TypeReference<>() {
     };
 
     private static final AtomicInteger idGenerator = new AtomicInteger(1);
@@ -84,6 +84,7 @@ private static ObjectMapper createMapper() {
         var module = new SimpleModule();
         module.addSerializer(ParallelExecutionException.class, new ParallelExceptionSerializer());
         module.addSerializer(LoggedException.class, new LoggedExceptionSerializer());
+        module.addSerializer(UserDefinedException.class, new UserDefinedExceptionSerializer());
         module.addSerializer(Exception.class, new ExceptionSerializer());
 
         var om = new ObjectMapper();
@@ -118,20 +119,28 @@ public void serialize(LoggedException exception, JsonGenerator gen, SerializerPr
         }
     }
 
+    private static class UserDefinedExceptionSerializer extends JsonSerializer<UserDefinedException> {
+
+        @Override
+        public void serialize(UserDefinedException exception, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            gen.writeStartObject();
+            gen.writeNumberField("@id", idGenerator.getAndIncrement());
+            gen.writeStringField("message", exception.getMessage());
+            if (exception.getPayload() != null && !exception.getPayload().isEmpty()) {
+                gen.writeObjectField("payload", exception.getPayload());
+            }
+            gen.writeEndObject();
+        }
+    }
+
     private static class ExceptionSerializer extends JsonSerializer<Exception> {
 
         @Override
         public void serialize(Exception exception, JsonGenerator gen, SerializerProvider serializers) throws IOException {
             gen.writeStartObject();
             gen.writeNumberField("@id", idGenerator.getAndIncrement());
             gen.writeStringField("message", exception.getMessage());
-            if (exception instanceof UserDefinedException ue) {
-                if (ue.getPayload() != null && !ue.getPayload().isEmpty()) {
-                    gen.writeObjectField("payload", ue.getPayload());
-                }
-            } else {
-                gen.writeStringField("type", exception.getClass().getName());
-            }
+            gen.writeStringField("type", exception.getClass().getName());
             gen.writeEndObject();
         }
     }