fix model generation for class hierarchies when nullSafe-array-default is enabled (#79) (#80)

Author: roald-di

src/main/java/cd/connect/openapi/DartV3ApiGenerator.java

@@ -496,6 +496,10 @@ private void updateModelsWithAllOfInheritance(Map<String, CodegenModel> models)
       List<CodegenProperty> ownVars = cm.getVars().stream().filter(cp -> !cp.vendorExtensions.containsKey("x-dart-inherited")).collect(Collectors.toList());
       cm.vendorExtensions.put("x-dart-ownVars", ownVars);
       cm.vendorExtensions.put("x-dart-hasOwnVars", !ownVars.isEmpty());
+
+      List<CodegenProperty> ownDefaultVals = ownVars.stream().filter(cp -> cp.vendorExtensions.containsKey("x-ns-default-val")).collect(Collectors.toList());
+      cm.vendorExtensions.put("x-own-ns-default-vals", ownDefaultVals);
+      cm.vendorExtensions.put("x-has-own-ns-default-vals", !ownDefaultVals.isEmpty());
     }
   }
 

src/main/resources/dart2-v3template/class.mustache

@@ -28,8 +28,8 @@ class {{classname}}{{#parent}} extends {{parent}}{{/parent}} {
   {{#required}}{{#nullSafe}}late {{/nullSafe}}{{/required}}dynamic{{^required}}{{/required}} json;
 {{/parent}}{{/hasVars}}
 {{classname}}({{#hasVars}}{ {{#vars}}{{#required}}{{#nullSafe}}{{^vendorExtensions.x-ns-default-val}}required {{/vendorExtensions.x-ns-default-val}}{{/nullSafe}}{{/required}}{{#vendorExtensions.x-ns-default-val}}{{{dataType}}}{{#nullSafe}}?{{/nullSafe}} {{{name}}}{{/vendorExtensions.x-ns-default-val}}{{^vendorExtensions.x-ns-default-val}}{{^vendorExtensions.x-dart-inherited}}this.{{/vendorExtensions.x-dart-inherited}}{{{name}}}{{/vendorExtensions.x-ns-default-val}},
-    {{/vars}} }{{/hasVars}}){{#vendorExtensions.x-has-ns-default-vals}} : {{#vendorExtensions.x-ns-default-vals}}{{^vendorExtensions.x-dart-inherited}}this.{{/vendorExtensions.x-dart-inherited}}{{{name}}} = {{{name}}} ?? []{{^-last}}, {{/-last}}{{/vendorExtensions.x-ns-default-vals}}{{/vendorExtensions.x-has-ns-default-vals}}
-{{#parent}} : super({{#vars}}{{#vendorExtensions.x-dart-inherited}}{{name}}: {{name}},{{/vendorExtensions.x-dart-inherited}}{{/vars}}) {{/parent}}
+    {{/vars}} }{{/hasVars}}){{#vendorExtensions.x-has-own-ns-default-vals}} : {{#vendorExtensions.x-own-ns-default-vals}}this.{{{name}}} = {{{name}}} ?? []{{^-last}}, {{/-last}}{{/vendorExtensions.x-own-ns-default-vals}}{{/vendorExtensions.x-has-own-ns-default-vals}}
+{{#parent}} {{#vendorExtensions.x-has-own-ns-default-vals}},{{/vendorExtensions.x-has-own-ns-default-vals}}{{^vendorExtensions.x-has-own-ns-default-vals}}:{{/vendorExtensions.x-has-own-ns-default-vals}} super({{#vars}}{{#vendorExtensions.x-dart-inherited}}{{name}}: {{name}},{{/vendorExtensions.x-dart-inherited}}{{/vars}}) {{/parent}}
 ;
 
   @override

src/test/resources/inheritance.yaml

@@ -106,3 +106,74 @@ components:
           type: string
           nullable: true
       additionalProperties: false
+
+    WithList:
+      type: object
+      properties:
+        list:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: false
+        nullableList:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: true
+      discriminator:
+        propertyName: type
+      additionalProperties: false
+
+    WithListDerived:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/Entity'
+      properties:
+        list:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: false
+        nullableList:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: true
+      additionalProperties: false
+
+    WithListDerived2:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/WithList'
+      properties:
+        list2:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: false
+        nullableList2:
+          type: array
+          items:
+            $ref: '#/components/schemas/Entity'
+          nullable: true
+      additionalProperties: false
+
+    WithListDerived3:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/WithList'
+      properties:
+        someString:
+          type: string
+          nullable: false
+      additionalProperties: false
+
+    WithListDerived4:
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/WithListDerived'
+      properties:
+        someString:
+          type: string
+          nullable: false
+      additionalProperties: false