Merge pull request #889 from swagger-api/codegen-issue-10979

HugoMario · web-flow · commit a7c62aa19f4b · 2021-04-27T16:19:05.000-05:00
Codegen issue 10979
diff --git a/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache b/src/main/resources/handlebars/Java/libraries/retrofit2/api.mustache
@@ -1,4 +1,4 @@
-package {{package}};//retrofit2
+package {{package}};
 
 import {{invokerPackage}}.CollectionFormats.*;
 
diff --git a/src/main/resources/handlebars/Java/pojo.mustache b/src/main/resources/handlebars/Java/pojo.mustache
@@ -12,18 +12,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   private static final long serialVersionUID = 1L;
 {{/serializableModel}}
   {{#vars}}
+    {{#baseItems this}}
     {{#isEnum}}
-    {{^isContainer}}
 {{>modelInnerEnum}}
-    {{/isContainer}}
     {{/isEnum}}
-    {{#items.isEnum}}
-      {{#items}}
-      {{^isContainer}}
-{{>modelInnerEnum}}
-      {{/isContainer}}
-      {{/items}}
-    {{/items.isEnum}}
+    {{/baseItems}}
   {{#jackson}}
     {{#vendorExtensions.x-is-discriminator-property}}
   @JsonTypeId
diff --git a/src/main/resources/handlebars/JavaJaxRS/spec/pojo.mustache b/src/main/resources/handlebars/JavaJaxRS/spec/pojo.mustache
@@ -5,19 +5,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
   {{#vars}}
+
+  {{#baseItems this}}
   {{#isEnum}}
-  {{^isContainer}}
 {{>enumClass}}
-  {{/isContainer}}
   {{/isEnum}}
-  {{#items.isEnum}}
-  {{#items}}
-
-  {{^isContainer}}
-  {{>enumClass}}
-  {{/isContainer}}
-  {{/items}}
-  {{/items.isEnum}}
+  {{/baseItems}}
   private {{#useBeanValidation}}@Valid{{/useBeanValidation}} {{{datatypeWithEnum}}} {{name}} = {{{defaultValue}}};
   {{/vars}}
 
diff --git a/src/main/resources/handlebars/JavaMicronaut/pojo.mustache b/src/main/resources/handlebars/JavaMicronaut/pojo.mustache
@@ -10,18 +10,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 
 {{/serializableModel}}
   {{#vars}}
+    {{#baseItems this}}
     {{#isEnum}}
-    {{^isContainer}}
 {{>enumClass}}
-    {{/isContainer}}
     {{/isEnum}}
-    {{#items.isEnum}}
-      {{#items}}
-      {{^isContainer}}
-{{>enumClass}}
-      {{/isContainer}}
-      {{/items}}
-    {{/items.isEnum}}
+    {{/baseItems}}
   {{#jackson}}
   @JsonProperty("{{baseName}}"){{#withXml}}
   @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"){{/withXml}}
diff --git a/src/main/resources/handlebars/JavaSpring/pojo.mustache b/src/main/resources/handlebars/JavaSpring/pojo.mustache
@@ -12,18 +12,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
 
 {{/serializableModel}}
   {{#vars}}
+    {{#baseItems this}}
     {{#isEnum}}
-    {{^isContainer}}
 {{>enumClass}}
-    {{/isContainer}}
     {{/isEnum}}
-    {{#items.isEnum}}
-      {{#items}}
-      {{^isContainer}}
-{{>enumClass}}
-      {{/isContainer}}
-      {{/items}}
-    {{/items.isEnum}}
+    {{/baseItems}}
   {{#jackson}}
     {{#vendorExtensions.x-is-discriminator-property}}
   @JsonTypeId

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package {{package}};//retrofit2`
	`1`	`+package {{package}};`
`2`	`2`
`3`	`3`	`import {{invokerPackage}}.CollectionFormats.*;`
`4`	`4`