Fix defaultValue for AdditionalProperties fields when using generateAliasAsModel

Author: jpfinne

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -68,6 +68,7 @@
 
 import static org.openapitools.codegen.utils.CamelizeOption.*;
 import static org.openapitools.codegen.utils.ModelUtils.getSchemaItems;
+import static org.openapitools.codegen.utils.ModelUtils.isGenerateAliasAsModel;
 import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
@@ -1329,6 +1330,11 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) {
                 return null;
             }
 
+            if (isGenerateAliasAsModel()) {
+                // additionalProperties generated
+                return null;
+            }
+
             return String.format(Locale.ROOT, "new %s<>()",
                     instantiationTypes().getOrDefault("map", "HashMap"));
         } else if (ModelUtils.isIntegerSchema(schema)) {

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

@@ -3514,5 +3514,47 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash
         JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains(
                 "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;",
                 "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties)");
+
+        JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;");
+    }
+
+    @Test
+    public void testAdditionalPropertiesWithGenerateAliasForMicroProfile() {
+        final Path output = newTempFolder();
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setGenerateAliasAsModel(true)
+                .setLibrary(MICROPROFILE)
+                .setInputSpec("src/test/resources/3_0/additionalProperties.yaml")
+                .setOutputDir(output.toString().replace("\\", "/"));
+
+        Map<String, File> files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate()
+                .stream().collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeObject.java")).fileContains(
+                "extends HashMap<String, Object>",
+                "return Objects.hash(super.hashCode())",
+                "return super.equals(o)");
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains(
+                "extends HashMap<String, String>",
+                "return Objects.hash(super.hashCode())",
+                "return super.equals(o)");
+
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTrue.java")).fileContains(
+                "extends HashMap<String, Object>",
+                "return Objects.hash(super.hashCode())",
+                "return super.equals(o)");
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeObject.java")).fileContains(
+                "HashMap<String, Object>",
+                "return Objects.hash(name, super.hashCode())");
+
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesTypeString.java")).fileContains(
+                "HashMap<String, String>",
+                "return Objects.hash(name, super.hashCode())");
+        JavaFileAssert.assertThat(files.get("AdditionalPropertiesTrue.java")).fileContains(
+                "HashMap<String, Object>",
+                "return Objects.hash(name, super.hashCode())");
+
+        JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;");
     }
 }

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -5407,5 +5407,7 @@ public void testAdditionalPropertiesWithGenerateAliasAsModelGeneratesCorrectHash
         JavaFileAssert.assertThat(files.get("AdditionalPropertiesOnlyTypeString.java")).fileContains(
                 "AdditionalPropertiesOnlyTypeString additionalPropertiesOnlyTypeString = (AdditionalPropertiesOnlyTypeString) o;",
                 "return Objects.equals(this.additionalProperties, additionalPropertiesOnlyTypeString.additionalProperties);");
+
+        JavaFileAssert.assertThat(files.get("Response.java")).fileContains("AdditionalPropertiesOnlyTypeObject additionalPropertiesOnlyTypeObject;");
     }
 }