Fixed issue #20139 with additionalProperties in the Java Client

Author: DavidGrath

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

@@ -2868,6 +2868,8 @@ protected void updateModelForObject(CodegenModel m, Schema schema) {
         if (ModelUtils.isMapSchema(schema)) {
             // an object or anyType composed schema that has additionalProperties set
             addAdditionPropertiesToCodeGenModel(m, schema);
+        } else if(!ModelUtils.isDisallowAdditionalPropertiesIfNotPresent()) {
+            addAdditionPropertiesToCodeGenModel(m, schema);
         } else if (ModelUtils.isFreeFormObject(schema, openAPI)) {
             // non-composed object type with no properties + additionalProperties
             // additionalProperties must be null, ObjectSchema, or empty Schema

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

@@ -34,6 +34,7 @@
 import org.openapitools.codegen.java.assertions.JavaFileAssert;
 import org.openapitools.codegen.languages.AbstractJavaCodegen;
 import org.openapitools.codegen.languages.JavaClientCodegen;
+import org.openapitools.codegen.languages.KotlinServerCodegen;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 import org.openapitools.codegen.languages.features.CXFServerFeatures;
 import org.openapitools.codegen.meta.features.SecurityFeature;
@@ -56,14 +57,17 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 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.openapitools.codegen.CodegenConstants.SERIALIZATION_LIBRARY;
-import static org.openapitools.codegen.TestUtils.newTempFolder;
-import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles;
+import static org.openapitools.codegen.CodegenConstants.*;
+import static org.openapitools.codegen.TestUtils.*;
+import static org.openapitools.codegen.languages.AbstractKotlinCodegen.USE_JAKARTA_EE;
 import static org.openapitools.codegen.languages.JavaClientCodegen.*;
+import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.INTERFACE_ONLY;
+import static org.openapitools.codegen.languages.KotlinServerCodegen.Constants.JAXRS_SPEC;
 import static org.testng.Assert.*;
 
 public class JavaClientCodegenTest {
@@ -3592,4 +3596,27 @@ public void testClassesAreValidJavaOkHttpGson() {
                 "public some.pkg.B getsomepkgB() throws ClassCastException {"
         );
     }
+
+    @Test(description = "Issue #20139")
+    public void givenAdditionalPropertiesNotDefinedAndIsDisallowAdditionalPropertiesIfNotPresentIsFalseWhenGenerateModelThenAdditionalPropertiesTypeIsObject() throws Exception {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        JavaClientCodegen codegen = new JavaClientCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.setUseBeanValidation(true);
+        codegen.additionalProperties().put(DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT, false);
+        // The default, okhttp-gson, relies on isAdditionalPropertiesTrue and doesn't use additionalPropertiesType
+        codegen.additionalProperties().put(LIBRARY, JERSEY2);
+        new DefaultGenerator().opts(new ClientOptInput()
+                        .openAPI(TestUtils.parseSpec("src/test/resources/2_0/issue_20139.yaml"))
+                        .config(codegen))
+                .generate();
+
+        String outputPath = output.getAbsolutePath() + "/src/main/java/org/openapitools/client";
+        Path jsonWebKey = Paths.get(outputPath + "/model/JsonWebKey.java");
+        JavaFileAssert.assertThat(jsonWebKey)
+                        .assertProperty("additionalProperties")
+                                .withType("Map<String, Object>");
+    }
 }

modules/openapi-generator/src/test/resources/2_0/issue_20139.yaml

@@ -0,0 +1,23 @@
+swagger: '2.0'
+info:
+  version: '1.0'
+  title: FooBar
+paths:
+  /jwks:
+    get:
+      operationId: getJwks
+      responses:
+        200:
+          description: "Success"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/JsonWebKey"
+definitions:
+  JsonWebKey:
+    title: JSON Web Key
+    type: object
+    properties:
+      kid:
+        type: string
+    # No additionalProperties specified