Reworked tests for Issue #20213

Author: DavidGrath

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

@@ -5019,57 +5019,4 @@ 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()));
-
-        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/java/org/openapitools/codegen/OpenAPINormalizerTest.java

@@ -939,6 +939,11 @@ public void testOpenAPINormalizerSimplifyOneOfAnyOf31Spec() {
         assertEquals(schema22.getAnyOf(), null);
         assertEquals(schema22.getTypes(), Set.of("string"));
         assertEquals(schema22.getEnum().size(), 2);
+
+        Schema schema23 = openAPI.getComponents().getSchemas().get("AnyOfNullableAdditionalPropertiesTest");
+        assertEquals(((Schema) schema23.getProperties().get("str")).getAnyOf(), null);
+        assertTrue(((Schema) schema23.getProperties().get("str")).getNullable());
+        assertEquals(schema22.getTypes(), Set.of("string"));
     }
 
     @Test

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

@@ -67,6 +67,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.InstanceOfAssertFactories.FILE;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.TestUtils.*;
 import static org.openapitools.codegen.languages.JavaClientCodegen.*;
@@ -3833,6 +3834,30 @@ public void queryParameterJsonSerialization(String library) {
         );
     }
 
+    @Test(description = "Issue #20213")
+    public void givenModelHasFalseAdditionalPropertiesAndPropertyHasNullAsAnyOfTypeThenModelIsCorrect() throws Exception {
+        File output = Files.createTempDirectory("test").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setInputSpec("src/test/resources/3_1/issue_20213.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        DefaultGenerator defaultGenerator = new DefaultGenerator();
+        Map<String, File> fileMap = defaultGenerator.opts(clientOptInput).generate()
+                .stream().collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(fileMap.get("SampleObjectWithAdditionalFalse.java"))
+                .assertProperty("someString")
+                .withType("String")
+                .assertPropertyAnnotations()
+                .containsWithName("javax.annotation.Nullable");
+        assertFalse(fileMap.containsKey("SampleObjectWithAdditionalFalseSomeString.java"));
+
+    }
+
     @DataProvider(name = "springClients")
     public static Object[] springClients() {
         return new Object[]{RESTCLIENT, WEBCLIENT};

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

@@ -137,4 +137,14 @@ components:
     OneOfNullAndRef3:
       oneOf:
         - $ref: '#/components/schemas/Parent'
-        - type: "null"
+        - type: "null"
+    AnyOfNullableAdditionalPropertiesTest:
+      description: to test anyOf with additional properties
+      additionalProperties: false
+      properties:
+        str:
+          anyOf:
+            - type: string
+            - type: 'null'
+            - type: null
+            - $ref: null