Issue 21890: Added Test

Author: MarcoZurich

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

@@ -25,7 +25,10 @@
 import io.swagger.v3.parser.core.models.ParseOptions;
 import org.mockito.Answers;
 import org.mockito.Mockito;
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.TestUtils;
 import org.openapitools.codegen.languages.AbstractJavaCodegen;
 import org.openapitools.codegen.testutils.ConfigAssert;
 import org.openapitools.codegen.utils.ModelUtils;
@@ -752,20 +755,6 @@ public void nullDefaultValueForModelWithDynamicProperties() {
         Assert.assertEquals(defaultValue, "null");
     }
 
-    @Test
-    public void defaultEmptyListForModelWithAdditionalPropertyDefaultToEmptyContainer() {
-        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_1/java/issue_21890.yaml");
-        codegen.additionalProperties().put(CodegenConstants.DEFAULT_TO_EMPTY_CONTAINER, "map");
-        codegen.processOpts();
-        codegen.setOpenAPI(openAPI);
-
-        Schema<?> schema = openAPI.getComponents().getSchemas().get("Pet_parents");
-
-        CodegenProperty parents = codegen.fromProperty("parents", schema, true);
-        String defaultValue = codegen.toDefaultValue(parents, schema);
-        Assert.assertEquals(defaultValue, "new HashMap()");
-    }
-
     @Test
     public void maplikeDefaultValueForModelWithStringToStringMapping() {
         final OpenAPI openAPI = FLATTENED_SPEC.get("3_0/mapSchemas");

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

@@ -5634,6 +5634,30 @@ public void testCollectionTypesWithDefaults_issue_collection() throws IOExceptio
                 .fileContains("private List<String> stringRequiredList = new ArrayList<>();");
     }
 
+    @Test
+    public void testDefaultForRequiredNonNullableMap() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/java/issue_21890.yaml", null, new ParseOptions()).getOpenAPI();
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setLibrary(SPRING_BOOT);
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put("defaultToEmptyContainer", "map");
+
+        ClientOptInput input = new ClientOptInput()
+                .openAPI(openAPI)
+                .config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(input).generate().stream()
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("Pet.java"))
+                .fileContains("private Map<String, String> requiredNonNullableMap = new HashMap<>();");
+    }
+
     @Test
     public void testGenericReturnTypeWhenUsingResponseEntity_issue1096() throws IOException {
         Map<String, Object> additionalProperties = new HashMap<>();

…test/resources/3_1/java/issue_21890.yaml …test/resources/3_0/java/issue_21890.yamlmodules/openapi-generator/src/test/resources/3_1/java/issue_21890.yaml renamed to modules/openapi-generator/src/test/resources/3_0/java/issue_21890.yaml modules/openapi-generator/src/test/resources/3_1/java/issue_21890.yaml renamed to modules/openapi-generator/src/test/resources/3_0/java/issue_21890.yaml

@@ -1,10 +1,9 @@
-openapi: 3.1.0
+openapi: 3.0.0
 servers:
   - url: 'http://petstore.swagger.io/v2'
 info:
   description: >-
-    This is a sample server Petstore server. For this sample, you can use the api key
-    `special-key` to test the authorization filters.
+    This is a sample server Petstore server
   version: 1.0.0
   title: OpenAPI Petstore
   license:
@@ -33,25 +32,17 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Pet'
-        '400':
-          description: Invalid ID supplied
-        '404':
-          description: Pet not found
 components:
   schemas:
     Pet:
       title: a Pet
       description: A pet for sale in the pet store
       type: object
-      properties:
-        parents:
-          type: object
-          properties:
-            mother:
-              type: string
-            father:
-              type: string
       required:
-        - parents
-
-
+        - requiredNonNullableMap
+      properties:
+        # Test for issue 21890.
+        # As this map is required and non-nullable, the generated java class should initialise this Map with new HashMap()
+        requiredNonNullableMap:
+          additionalProperties:
+            type: string