[Fix #634] Preserving union class order

fjtirado · fjtirado · commit 7f62ffd880a8 · 2025-07-14T11:31:42.000+02:00
Signed-off-by: fjtirado &lt;ftirados@redhat.com&gt;
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java
@@ -17,6 +17,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.sun.codemodel.JAnnotationArrayMember;
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JClassAlreadyExistsException;
@@ -317,11 +318,11 @@ private JDefinedClass populateOneOf(
             commonType.orElse(definedClass.owner().ref(Object.class)),
             ruleFactory.getNameHelper().getPropertyName("value", null),
             null);
-
     definedClass._implements(
         definedClass.owner().ref(OneOfValueProvider.class).narrow(valueField.type()));
     GeneratorUtils.implementInterface(definedClass, valueField);
-    definedClass.annotate(Union.class);
+    JAnnotationArrayMember unionAnnotation = definedClass.annotate(Union.class).paramArray("value");
+    oneOfTypes.forEach(t -> unionAnnotation.param(t.getType()));
     return wrapAll(parentSchema, definedClass, commonType, oneOfTypes, Optional.of(valueField));
   }
 
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java b/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java
@@ -19,7 +19,6 @@
 import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JMod;
-import io.serverlessworkflow.annotations.GetterMethod;
 import org.jsonschema2pojo.util.NameHelper;
 
 public class GeneratorUtils {
@@ -39,7 +38,6 @@ public static JMethod getterMethod(
             instanceField.type(),
             nameHelper.getGetterName(name, instanceField.type(), null));
     method.body()._return(instanceField);
-    method.annotate(GetterMethod.class);
     return method;
   }
 
diff --git a/jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java b/jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java
@@ -33,6 +33,8 @@
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JMod;
 import com.sun.codemodel.JPackage;
+import io.github.classgraph.AnnotationClassRef;
+import io.github.classgraph.AnnotationInfo;
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfo;
 import io.github.classgraph.ClassRefTypeSignature;
@@ -41,7 +43,6 @@
 import io.github.classgraph.TypeArgument;
 import io.github.classgraph.TypeSignature;
 import io.serverlessworkflow.annotations.AdditionalProperties;
-import io.serverlessworkflow.annotations.GetterMethod;
 import io.serverlessworkflow.annotations.Item;
 import io.serverlessworkflow.annotations.ItemKey;
 import io.serverlessworkflow.annotations.ItemValue;
@@ -52,7 +53,8 @@
 import java.lang.annotation.Annotation;
 import java.nio.file.Files;
 import java.util.Collection;
-import java.util.LinkedHashSet;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -216,12 +218,12 @@ private JDefinedClass createMixInClass(ClassInfo classInfo) throws JClassAlready
   }
 
   private Collection<JClass> getUnionClasses(ClassInfo unionClassInfo) {
-    Collection<JClass> result = new LinkedHashSet<JClass>();
-    unionClassInfo
-        .getMethodInfo()
-        .filter(f -> f.hasAnnotation(GetterMethod.class))
-        .forEach(m -> result.add(getReturnType(m)));
-    return result;
+    AnnotationInfo info = unionClassInfo.getAnnotationInfoRepeatable(Union.class).get(0);
+    Object[] unionClasses = (Object[]) info.getParameterValues().getValue("value");
+    return Stream.of(unionClasses)
+        .map(AnnotationClassRef.class::cast)
+        .map(ref -> codeModel.ref(ref.getName()))
+        .collect(Collectors.toList());
   }
 
   private JClass getReturnType(MethodInfo info) {
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/GetterMethod.java b/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/GetterMethod.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Union.java b/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Union.java
@@ -23,4 +23,6 @@
 
 @Retention(RUNTIME)
 @Target(ElementType.TYPE)
-public @interface Union {}
+public @interface Union {
+  Class<?>[] value();
+}
