fix case additionalProperties: {}

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

@@ -2637,7 +2637,6 @@ protected List<MappedModel> getOneOfAnyOfDescendants(String composedSchemaName,
 
     protected List<MappedModel> getAllOfDescendants(String thisSchemaName, OpenAPI openAPI) {
         ArrayList<String> queue = new ArrayList();
-        ;
         List<MappedModel> descendentSchemas = new ArrayList();
         Map<String, Schema> schemas = ModelUtils.getSchemas(openAPI);
         String currentSchemaName = thisSchemaName;

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

@@ -682,6 +682,12 @@ public static boolean isAnyTypeSchema(Schema schema) {
             once(LOGGER).error("Schema cannot be null in isAnyTypeSchema check");
             return false;
         }
+
+        if (isFreeFormObject(schema)) {
+            // to cover `additionalProperties: {}`
+            return false;
+        }
+
         if (schema.getClass().equals(Schema.class) && schema.get$ref() == null && schema.getType() == null &&
                 (schema.getProperties() == null || schema.getProperties().isEmpty()) &&
                 schema.getAdditionalProperties() == null && schema.getNot() == null &&

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

@@ -646,23 +646,22 @@ public void testAnyType() {
         Assert.assertEquals(property1.baseName, "any_value");
         Assert.assertEquals(property1.dataType, "oas_any_type_not_mapped");
         Assert.assertTrue(property1.hasMore);
-        Assert.assertTrue(property1.required);
         Assert.assertFalse(property1.isPrimitiveType);
         Assert.assertFalse(property1.isContainer);
 
         final CodegenProperty property2 = cm1.vars.get(1);
         Assert.assertEquals(property2.baseName, "any_value_with_desc");
         Assert.assertEquals(property2.dataType, "oas_any_type_not_mapped");
         Assert.assertTrue(property2.hasMore);
-        Assert.assertTrue(property2.required);
+        Assert.assertFalse(property2.required);
         Assert.assertFalse(property2.isPrimitiveType);
         Assert.assertFalse(property2.isContainer);
 
         final CodegenProperty property3 = cm1.vars.get(2);
         Assert.assertEquals(property3.baseName, "any_value_nullable");
         Assert.assertEquals(property3.dataType, "oas_any_type_not_mapped");
         Assert.assertTrue(property3.hasMore);
-        Assert.assertTrue(property3.required);
+        Assert.assertFalse(property3.required);
         Assert.assertFalse(property3.isPrimitiveType);
         Assert.assertFalse(property3.isContainer);