Models with additionalProperties and properties that are complex now generate correct code

Author: DavidGrath

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

@@ -728,6 +728,9 @@ public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
         } else if (schema.getAdditionalProperties() instanceof Schema) { // map
             normalizeMapSchema(schema);
             normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas);
+            if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
+                normalizeProperties(schema.getProperties(), visitedSchemas);
+            }
         } else if (ModelUtils.isOneOf(schema)) { // oneOf
             return normalizeOneOf(schema, visitedSchemas);
         } else if (ModelUtils.isAnyOf(schema)) { // anyOf

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

@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.config.GlobalSettings;
+import org.openapitools.codegen.java.assertions.JavaFileAssert;
 import org.openapitools.codegen.languages.SpringCodegen;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
@@ -55,6 +56,7 @@
 import java.nio.file.Files;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -5017,4 +5019,58 @@ public void testQueryIsJsonMimeType() {
 
         assertTrue(codegenOperation.queryParams.stream().allMatch(p -> p.queryIsJsonMimeType));
     }
+
+    @Test(description = "Issue #20213")
+    public void testModelAdditionalPropertiesWithNullableProperty() throws Exception {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+        File spring = new File(output, "spring");
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("spring")
+                .setInputSpec("src/test/resources/3_1/issue_20213.yaml")
+                .setOutputDir(spring.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(clientOptInput).generate()
+                .stream().collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("SampleObjectWithAdditionalFalse.java"))
+                .assertProperty("someString")
+                .withType("JsonNullable<String>");
+        assertFalse(files.containsKey("SampleObjectWithAdditionalFalseSomeString.java"));
+
+
+        File tsAngular = new File(output, "ts-angular");
+        final CodegenConfigurator tsConfigurator = new CodegenConfigurator()
+                .setGeneratorName("typescript-angular")
+                .setInputSpec("src/test/resources/3_1/issue_20213.yaml")
+                .setOutputDir(tsAngular.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput tsClientOptInput = tsConfigurator.toClientOptInput();
+        DefaultGenerator tsGenerator = new DefaultGenerator();
+        Map<String, File> tsFiles = tsGenerator.opts(tsClientOptInput).generate()
+                .stream().collect(Collectors.toMap(File::getName, Function.identity()));
+
+        System.out.println(Files.readString(tsFiles.get("sampleObjectWithAdditionalFalse.ts").toPath()));
+        TestUtils.assertFileContains(tsFiles.get("sampleObjectWithAdditionalFalse.ts").toPath(), "someString?: string");
+        assertFalse(tsFiles.containsKey("sampleObjectWithAdditionalFalseSomeString.ts"));
+
+        File javaClient = new File(output, "java");
+        final CodegenConfigurator javaClientConfigurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setInputSpec("src/test/resources/3_1/issue_20213.yaml")
+                .setOutputDir(javaClient.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput javaClientClientOptInput = javaClientConfigurator.toClientOptInput();
+        DefaultGenerator javaClientGenerator = new DefaultGenerator();
+        Map<String, File> javaClientFiles = javaClientGenerator.opts(javaClientClientOptInput).generate()
+                .stream().collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(javaClientFiles.get("SampleObjectWithAdditionalFalse.java"))
+                .assertProperty("someString")
+                .withType("String");
+        assertFalse(javaClientFiles.containsKey("SampleObjectWithAdditionalFalseSomeString.java"));
+    }
 }

modules/openapi-generator/src/test/resources/3_1/issue_20213.yaml

@@ -0,0 +1,30 @@
+# filename: nullable-properties-with-additional-properties-false.yaml
+openapi: 3.1.0
+info:
+  title: ""
+  version: 1.0.0
+components:
+  schemas:
+    # For reference, an object without additionalProperties: false, but with nullable properties
+    SampleObject:
+      properties:
+        someString:
+          anyOf:
+            - type: string
+            - type: 'null'
+
+    # For reference, an object with additionalProperties: false, but without any nullable properties
+    ReferenceObject:
+      additionalProperties: false
+      properties:
+        someString:
+          type: string
+
+    # The broken case: an object with additionalProperties: false and nullable properties
+    SampleObjectWithAdditionalFalse:
+      additionalProperties: false
+      properties:
+        someString:
+          anyOf:
+            - type: string
+            - type: 'null'