Fixed generating code without properties, but with inheritance.

Minor fixes in templates. Fixed micronaut-projects#1869
altro3 · Nov 15, 2024 · b025add · b025add
1 parent 0a14aa0
commit b025add
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 76 deletions.
diff --git a/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java b/...-generator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautJavaCodegen.java
@@ -1889,6 +1889,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 }
             }
 
+            model.vendorExtensions.put("hasOwnVars", !model.vars.isEmpty());
             model.vendorExtensions.put("withMultipleVars", model.vars.size() > 1);
             if (!requiredParentVarsWithoutDiscriminator.isEmpty()) {
                 model.vendorExtensions.put("requiredParentVarsWithoutDiscriminator", requiredParentVarsWithoutDiscriminator);
@@ -1929,6 +1930,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
             // just for tests
             if (System.getProperty("micronaut.test.no-vars") != null) {
                 model.hasVars = false;
+                model.vendorExtensions.put("hasOwnVars", false);
                 model.vendorExtensions.put("requiredVarsWithoutDiscriminator", Collections.emptyList());
                 model.vendorExtensions.put("optionalVars", Collections.emptyList());
                 model.vendorExtensions.put("requiredVars", Collections.emptyList());

diff --git a/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java b/...enerator/src/main/java/io/micronaut/openapi/generator/AbstractMicronautKotlinCodegen.java
@@ -1826,6 +1826,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                 }
             }
 
+            model.vendorExtensions.put("hasOwnVars", !model.vars.isEmpty());
             model.vendorExtensions.put("withMultipleVars", model.vars.size() > 1);
             if (!requiredParentVarsWithoutDiscriminator.isEmpty()) {
                 model.vendorExtensions.put("requiredParentVarsWithoutDiscriminator", requiredParentVarsWithoutDiscriminator);
@@ -1857,6 +1858,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
             // just for tests
             if (System.getProperty("micronaut.test.no-vars") != null) {
                 model.hasVars = false;
+                model.vendorExtensions.put("hasOwnVars", false);
                 model.vendorExtensions.put("requiredVarsWithoutDiscriminator", Collections.emptyList());
                 model.vendorExtensions.put("optionalVars", Collections.emptyList());
                 model.vendorExtensions.put("requiredVars", Collections.emptyList());

diff --git a/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -274,9 +274,9 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
     // sort operations by default
     protected boolean skipSortingOperations = false;
 
-    protected final static Pattern XML_MIME_PATTERN = Pattern.compile("(?i)application/(.*)[+]?xml(;.*)?");
-    protected final static Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)application/json(;.*)?");
-    protected final static Pattern JSON_VENDOR_MIME_PATTERN = Pattern.compile("(?i)application/vnd.(.*)+json(;.*)?");
+    protected static final Pattern XML_MIME_PATTERN = Pattern.compile("(?i)application/(.*)[+]?xml(;.*)?");
+    protected static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)application/json(;.*)?");
+    protected static final Pattern JSON_VENDOR_MIME_PATTERN = Pattern.compile("(?i)application/vnd.(.*)+json(;.*)?");
     private static final Pattern COMMON_PREFIX_ENUM_NAME = Pattern.compile("[a-zA-Z0-9]+\\z");
 
     /**

diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/enum.mustache
@@ -45,7 +45,7 @@
         {{/enumVars}}
     {{/allowableValues}}
 
-    {{#formatSingleLine}}public final static Map<{{{dataType}}}, {{>common/model/enumName}}> VALUE_MAPPING = Map.copyOf(Arrays.stream(values()){{/formatSingleLine}}
+    {{#formatSingleLine}}public static final Map<{{{dataType}}}, {{>common/model/enumName}}> VALUE_MAPPING = Map.copyOf(Arrays.stream(values()){{/formatSingleLine}}
             .collect(Collectors.toMap(v -> v.value{{#isString}}{{#useEnumCaseInsensitive}}.toLowerCase(){{/useEnumCaseInsensitive}}{{/isString}}, Function.identity())));
 
     private final {{{vendorExtensions.baseType}}} value;

diff --git a/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache b/openapi-generator/src/main/resources/templates/java-micronaut/common/model/pojo.mustache
@@ -45,7 +45,7 @@
 @Serdeable
 {{/micronaut_serde_jackson}}
 {{#jackson}}
-    {{#hasVars}}
+    {{#vendorExtensions.hasOwnVars}}
         {{#vendorExtensions.withMultipleVars}}
 @JsonPropertyOrder({{openbrace}}
             {{#vars}}
@@ -56,7 +56,7 @@
         {{^vendorExtensions.withMultipleVars}}
 @JsonPropertyOrder({{#vars}}{{classname}}.JSON_PROPERTY_{{nameInSnakeCase}}{{/vars}})
         {{/vendorExtensions.withMultipleVars}}
-    {{/hasVars}}
+    {{/vendorExtensions.hasOwnVars}}
 {{/jackson}}
 {{#additionalModelTypeAnnotations}}
 {{{.}}}
@@ -447,15 +447,15 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        {{#hasVars}}
-        {{classname}} {{classVarName}} = ({{classname}}) o;
-        return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
-            {{/-last}}{{/vars}}{{#parent}} &&
-            super.equals(o){{/parent}};
-        {{/hasVars}}
-        {{^hasVars}}
+        {{#vendorExtensions.hasOwnVars}}
+        var {{classVarName}} = ({{classname}}) o;
+        return {{#vars}}{{#isByteArray}}Arrays{{/isByteArray}}{{^isByteArray}}Objects{{/isByteArray}}.equals({{name}}, {{classVarName}}.{{name}}){{^-last}}
+            && {{/-last}}{{/vars}}{{#parent}}
+            && super.equals(o){{/parent}};
+        {{/vendorExtensions.hasOwnVars}}
+        {{^vendorExtensions.hasOwnVars}}
         return {{#parent}}super.equals(o){{/parent}}{{^parent}}true{{/parent}};
-        {{/hasVars}}
+        {{/vendorExtensions.hasOwnVars}}
     {{/useReflectionEqualsHashCode}}
     }
 
@@ -465,7 +465,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
         return HashCodeBuilder.reflectionHashCode(this);
     {{/useReflectionEqualsHashCode}}
     {{^useReflectionEqualsHashCode}}
-        return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
+        return Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#vendorExtensions.hasOwnVars}}, {{/vendorExtensions.hasOwnVars}}super.hashCode(){{/parent}});
     {{/useReflectionEqualsHashCode}}
     }
 

diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/enum.mustache
@@ -24,7 +24,7 @@
 {{{.}}}
 {{/additionalEnumTypeAnnotations}}
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{#formatSingleLine}}enum class {{>common/model/enumName}}{{/formatSingleLine}}(
-    @get:JsonValue val value: {{{dataType}}}
+    @get:JsonValue val value: {{{dataType}}},
 ) {
 
     {{#allowableValues}}
@@ -41,13 +41,12 @@
     @Deprecated("")
             {{/deprecated}}
     @JsonProperty({{{strValue}}})
-    {{{name}}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+    {{{name}}}({{{value}}}),{{#-last}}
+    ;{{/-last}}
         {{/enumVars}}
     {{/allowableValues}}
 
-    override fun toString(): String {
-        return {{#isString}}value{{/isString}}{{^isString}}"$value"{{/isString}}
-    }
+    override fun toString(): String = {{#isString}}value{{/isString}}{{^isString}}"$value"{{/isString}}
 
     companion object {
 

diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/model.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/model.mustache
@@ -38,6 +38,7 @@ import {{javaxPackage}}.annotation.Generated
 {{#generateSwagger2Annotations}}
 import io.swagger.v3.oas.annotations.media.Schema
 {{/generateSwagger2Annotations}}
+import java.util.*
 {{/formatNoEmptyLines}}
 {{#formatOneEmptyLine}}
     {{#models}}

diff --git a/...rator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache b/...rator/src/main/resources/templates/kotlin-micronaut/common/model/oneof_interface.mustache
@@ -6,10 +6,8 @@
 {{>common/generatedAnnotation}}
 {{/generatedAnnotation}}
 {{>common/model/typeInfoAnnotation}}
-interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} : {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
-{{/formatNoEmptyLines}}
+interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} : {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{/formatNoEmptyLines}}{{#discriminator}} {
 
-{{#discriminator}}
     val {{propertyName}}: {{propertyType}}
-{{/discriminator}}
 }
+{{/discriminator}}
diff --git a/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache b/openapi-generator/src/main/resources/templates/kotlin-micronaut/common/model/pojo.mustache
@@ -19,13 +19,13 @@
 @Serdeable
 {{/micronaut_serde_jackson}}
 {{#jackson}}
-    {{#hasVars}}
+    {{#vendorExtensions.hasOwnVars}}
 @JsonPropertyOrder(
     {{#vars}}
-        {{classname}}.JSON_PROPERTY_{{nameInSnakeCase}}{{^-last}},{{/-last}}
+    {{classname}}.JSON_PROPERTY_{{nameInSnakeCase}},
     {{/vars}}
 )
-    {{/hasVars}}
+    {{/vendorExtensions.hasOwnVars}}
 {{/jackson}}
 {{#additionalModelTypeAnnotations}}
 {{{.}}}
@@ -94,50 +94,38 @@
     {{/formatNoEmptyLines}}
     {{/vendorExtensions.optionalVars}}
 {{/vendorExtensions.withInheritance}}
-{{#hasVars}}){{/hasVars}}{{#parent}}: {{{parent}}}({{#vendorExtensions.requiredParentVarsWithoutDiscriminator}}{{{name}}}{{^-last}}, {{/-last}}{{/vendorExtensions.requiredParentVarsWithoutDiscriminator}}) {{/parent}}{{#vendorExtensions.x-implements}}{{#parent}}, {{/parent}}{{^parent}}: {{/parent}}{{^-first}}, {{/-first}}{{{.}}}{{/vendorExtensions.x-implements}} {{openbrace}}
+{{#hasVars}}){{/hasVars}}{{#parent}} : {{{parent}}}({{#vendorExtensions.requiredParentVarsWithoutDiscriminator}}{{{name}}}{{^-last}}, {{/-last}}{{/vendorExtensions.requiredParentVarsWithoutDiscriminator}}){{/parent}}{{#vendorExtensions.x-implements}}{{#parent}}, {{/parent}}{{^parent}}: {{/parent}}{{^-first}}, {{/-first}}{{{.}}}{{/vendorExtensions.x-implements}} {{openbrace}}
 
     {{#vendorExtensions.withInheritance}}
 
     override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-    {{#parent}}
-        if (!super.equals(other)) return false
-    {{/parent}}
+        if (this === other) {
+            return true
+        }
+        if (javaClass != other?.javaClass) {
+            return false
+        }
         other as {{classname}}
-    {{#hasVars}}
-        {{#vars}}
-        if ({{{name}}} != other.{{{name}}}) return false
-        {{/vars}}
-    {{/hasVars}}
-        return true
+    {{#vendorExtensions.hasOwnVars}}
+        return {{#vars}}{{^-first}}
+                && {{/-first}}{{{name}}} == other.{{{name}}}{{/vars}}{{#parent}}
+                && super.equals(other){{/parent}}
+    {{/vendorExtensions.hasOwnVars}}
+    {{^vendorExtensions.hasOwnVars}}
+        return {{#parent}}super.equals(other){{/parent}}{{^parent}}true{{/parent}}
+    {{/vendorExtensions.hasOwnVars}}
     }
 
-    override fun hashCode(): Int {
-        var result = {{#parent}}super.hashCode(){{/parent}}{{^parent}}{{#vars.0}}{{{name}}}{{#isNullable}}?{{/isNullable}}.hashCode(){{#isNullable}} ?: 0{{/isNullable}}{{/vars.0}}{{/parent}}
-    {{#hasVars}}
-    {{#vars}}
-        {{#parent}}
-        result = 31 * result + {{#isNullable}}({{/isNullable}}{{{name}}}{{#isNullable}}?{{/isNullable}}.hashCode(){{#isNullable}} ?: 0){{/isNullable}}
-        {{/parent}}
-        {{^parent}}
-            {{^-first}}
-        result = {{#-first}}{{#parent}}31 * result + {{/parent}}{{/-first}}{{^-first}}31 * result + {{/-first}}{{#isNullable}}({{/isNullable}}{{{name}}}{{#isNullable}}?{{/isNullable}}.hashCode(){{#isNullable}} ?: 0){{/isNullable}}
-            {{/-first}}
-        {{/parent}}
-    {{/vars}}
-    {{/hasVars}}
-        return result
-    }
+    override fun hashCode(): Int =
+        Objects.hash({{#vars}}{{^isByteArray}}{{name}}{{/isByteArray}}{{#isByteArray}}Arrays.hashCode({{name}}){{/isByteArray}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#vendorExtensions.hasOwnVars}}, {{/vendorExtensions.hasOwnVars}}super.hashCode(){{/parent}})
 
-    override fun toString(): String {
+    override fun toString(): String =
     {{#hasVars}}
-        return "{{classname}}({{#allVars}}{{{vendorExtensions.realName}}}='${{{name}}}'{{^-last}}, {{/-last}}{{/allVars}})"
+        "{{classname}}({{#allVars}}{{{vendorExtensions.realName}}}='${{{name}}}'{{^-last}}, {{/-last}}{{/allVars}})"
     {{/hasVars}}
     {{^hasVars}}
-        return "{{classname}}()"
+        "{{classname}}()"
     {{/hasVars}}
-    }
     {{/vendorExtensions.withInheritance}}
 
     {{#vars}}
@@ -158,6 +146,7 @@
 
     {{/vars}}
 
+    {{#vendorExtensions.hasOwnVars}}
     companion object {
     {{#serializableModel}}
 
@@ -170,4 +159,15 @@
         const val JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}"
     {{/vars}}
     }
+    {{/vendorExtensions.hasOwnVars}}
+    {{^vendorExtensions.hasOwnVars}}
+        {{#serializableModel}}
+    companion object {
+
+        @Serial
+        @JvmStatic
+        private val serialVersionUID = {{{vendorExtensions.serialId}}}L
+    }
+        {{/serializableModel}}
+    {{/vendorExtensions.hasOwnVars}}
 {{closebrace}}
diff --git a/...or/src/main/resources/templates/kotlin-micronaut/common/model/typeInfoAnnotation.mustache b/...or/src/main/resources/templates/kotlin-micronaut/common/model/typeInfoAnnotation.mustache
@@ -2,13 +2,13 @@
     {{#discriminator.propertyBaseName}}
         {{#jackson}}
 @JsonIgnoreProperties(
-        value = ["{{{discriminator.propertyBaseName}}}"], // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
-        allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
+    value = ["{{{discriminator.propertyBaseName}}}"], // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
+    allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
 )
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "{{{discriminator.propertyBaseName}}}", visible = true)
             {{#vendorExtensions.hasMappedModels}}
 @JsonSubTypes({{#mappedModels}}
-        JsonSubTypes.Type(value = {{modelName}}::class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"){{^-last}},{{/-last}}
+    JsonSubTypes.Type(value = {{modelName}}::class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),
 {{/mappedModels}})
             {{/vendorExtensions.hasMappedModels}}
         {{/jackson}}

diff --git a/...enerator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenTest.java b/...enerator/src/test/java/io/micronaut/openapi/generator/JavaMicronautClientCodegenTest.java
@@ -381,7 +381,7 @@ void testEnumsWithNonStringTypeValue() {
 
         assertFileContains(modelPath + "StringEnum.java", "@JsonProperty(\"starting\")", "STARTING(\"starting\"),",
             """
-                    public final static Map<String, StringEnum> VALUE_MAPPING = Map.copyOf(Arrays.stream(values())
+                    public static final Map<String, StringEnum> VALUE_MAPPING = Map.copyOf(Arrays.stream(values())
                             .collect(Collectors.toMap(v -> v.value, Function.identity())));
                 """,
             """
@@ -804,7 +804,7 @@ void testUseEnumCaseInsensitive() {
 
         assertFileContains(path + "model/StringEnum.java",
             """
-                    public final static Map<String, StringEnum> VALUE_MAPPING = Map.copyOf(Arrays.stream(values())
+                    public static final Map<String, StringEnum> VALUE_MAPPING = Map.copyOf(Arrays.stream(values())
                             .collect(Collectors.toMap(v -> v.value.toLowerCase(), Function.identity())));
                 """,
             """
@@ -1363,4 +1363,32 @@ void testSwaggerAnnotations() {
                     );
                 """);
     }
+
+    @Test
+    void testEquals() {
+
+        var codegen = new JavaMicronautClientCodegen();
+        codegen.setGenerateSwaggerAnnotations(true);
+        String outputPath = generateFiles(codegen, "src/test/resources/3_0/check-equals.yml", CodegenConstants.MODELS);
+        String path = outputPath + "src/main/java/org/openapitools/";
+
+        assertFileNotContains(path + "model/SalesInvoiceCreateDto.java", "@JsonPropertyOrder");
+        assertFileContains(path + "model/SalesInvoiceCreateDto.java", """
+                @Override
+                public boolean equals(Object o) {
+                    if (this == o) {
+                        return true;
+                    }
+                    if (o == null || getClass() != o.getClass()) {
+                        return false;
+                    }
+                    return super.equals(o);
+                }
+            
+                @Override
+                public int hashCode() {
+                    return Objects.hash(super.hashCode());
+                }
+            """);
+    }
 }