https://github.com/mulesoft-labs/raml-for-jax-rs/issues/223

equalsAndHashCode for unions.

Author: jpbelang

raml-to-pojo/src/main/java/org/raml/ramltopojo/GenerationContextImpl.java

@@ -134,13 +134,13 @@ private<T> void loadBasePlugins(Set<T> plugins, Class<T> pluginType, TypeDeclara
     public ObjectTypeHandlerPlugin pluginsForObjects(TypeDeclaration... typeDeclarations) {
 
         List<PluginDef> data = Annotations.PLUGINS.get(Collections.<PluginDef>emptyList(), api, typeDeclarations);
-        System.err.println("annotation defined plugins for " + typeDeclarations[0].name() + "are " + data);
+        //System.err.println("annotation defined plugins for " + typeDeclarations[0].name() + "are " + data);
         Set<ObjectTypeHandlerPlugin> plugins = new HashSet<>();
         loadBasePlugins(plugins, ObjectTypeHandlerPlugin.class);
         for (PluginDef datum : data) {
             plugins.addAll(pluginManager.getClassesForName(datum.getPluginName(), datum.getArguments() , ObjectTypeHandlerPlugin.class));
         }
-        System.err.println("plugin definitions for object type " + plugins + " for " + typeDeclarations[0].name());
+        //System.err.println("plugin definitions for object type " + plugins + " for " + typeDeclarations[0].name());
         return new ObjectTypeHandlerPlugin.Composite(plugins);
     }
 

raml-to-pojo/src/main/java/org/raml/ramltopojo/extensions/AllTypesPluginHelper.java

@@ -12,11 +12,12 @@
 /**
  * Created. There, you have it.
  */
-public class AllTypesPluginHelper implements ObjectTypeHandlerPlugin, UnionTypeHandlerPlugin, EnumerationTypeHandlerPlugin {
+public class AllTypesPluginHelper implements ObjectTypeHandlerPlugin, UnionTypeHandlerPlugin, EnumerationTypeHandlerPlugin, ArrayTypeHandlerPlugin {
 
     private final ObjectTypeHandlerPlugin.Helper objectTypeHandlerPlugin= new ObjectTypeHandlerPlugin.Helper();
     private final UnionTypeHandlerPlugin.Helper unionTypeHandlerPlugin= new UnionTypeHandlerPlugin.Helper();
     private final EnumerationTypeHandlerPlugin.Helper enumerationTypeHandlerPlugin= new EnumerationTypeHandlerPlugin.Helper();
+    private final ArrayTypeHandlerPlugin.Helper arrayTypeHandlerPlugin = new ArrayTypeHandlerPlugin.Helper();
 
     @Override
     public ClassName className(ObjectPluginContext objectPluginContext, ObjectTypeDeclaration ramlType, ClassName currentSuggestion, EventType eventType) {
@@ -78,4 +79,13 @@ public TypeSpec.Builder enumValue(EnumerationPluginContext enumerationPluginCont
         return enumerationTypeHandlerPlugin.enumValue(enumerationPluginContext, declaration, incoming, value, eventType);
     }
 
+    @Override
+    public ClassName className(ArrayPluginContext arrayPluginContext, TypeDeclaration ramlType, ClassName currentSuggestion, EventType eventType) {
+        return arrayTypeHandlerPlugin.className(arrayPluginContext, ramlType, currentSuggestion, eventType);
+    }
+
+    @Override
+    public TypeSpec.Builder classCreated(ArrayPluginContext arrayPluginContext, TypeDeclaration ramlType, TypeSpec.Builder incoming, EventType eventType) {
+        return arrayTypeHandlerPlugin.classCreated(arrayPluginContext, ramlType, incoming, eventType);
+    }
 }

raml-to-pojo/src/main/java/org/raml/ramltopojo/extensions/tools/AddEqualsAndHashCode.java

@@ -114,6 +114,15 @@ private void createEquals(List<FieldSpec> specs, TypeSpec.Builder incoming) {
 
     @Override
     public TypeSpec.Builder classCreated(UnionPluginContext unionPluginContext, UnionTypeDeclaration ramlType, TypeSpec.Builder incoming, EventType eventType) {
-        return super.classCreated(unionPluginContext, ramlType, incoming, eventType);
+
+        if ( eventType != EventType.IMPLEMENTATION) {
+
+            return incoming;
+        }
+
+        List<FieldSpec> specs = incoming.build().fieldSpecs;
+        createEquals(specs, incoming);
+        createHashCode(specs, incoming);
+        return incoming;
     }
 }

raml-to-pojo/src/main/java/org/raml/ramltopojo/union/UnionTypeHandler.java

@@ -72,10 +72,6 @@ public Optional<CreationResult> create(GenerationContext generationContext, Crea
 
     private TypeSpec.Builder getImplementation(ClassName interfaceName, GenerationContext generationContext, UnionPluginContext context, CreationResult preCreationResult) {
         TypeSpec.Builder typeSpec = TypeSpec.classBuilder(preCreationResult.getJavaName(EventType.IMPLEMENTATION)).addModifiers(Modifier.PUBLIC).addSuperinterface(interfaceName);
-        typeSpec = generationContext.pluginsForUnions(union).classCreated(context, union, typeSpec, EventType.IMPLEMENTATION);
-        if ( typeSpec == null ) {
-            return null;
-        }
 
         FieldSpec.Builder anyType = FieldSpec.builder(Object.class, "anyType", Modifier.PRIVATE);
         anyType = generationContext.pluginsForUnions(union).anyFieldCreated(context, union, typeSpec, anyType, EventType.IMPLEMENTATION);
@@ -119,6 +115,12 @@ private TypeSpec.Builder getImplementation(ClassName interfaceName, GenerationCo
                                     .returns(TypeName.BOOLEAN).build()
                     ).build();
         }
+
+        typeSpec = generationContext.pluginsForUnions(union).classCreated(context, union, typeSpec, EventType.IMPLEMENTATION);
+        if ( typeSpec == null ) {
+            return null;
+        }
+
         return typeSpec;
     }