[3.1] Fixed lack of check for ´booleanSchemaValue`

Author: EduMenges

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

@@ -808,7 +808,13 @@ public static boolean isModelWithPropertiesOnly(Schema schema) {
                 (null != schema.getProperties() && !schema.getProperties().isEmpty()) &&
                 // no additionalProperties is set
                 (schema.getAdditionalProperties() == null ||
-                        (schema.getAdditionalProperties() instanceof Boolean && !(Boolean) schema.getAdditionalProperties()));
+                // additionalProperties is boolean and set to false
+                (schema.getAdditionalProperties() instanceof Boolean && !(Boolean) schema.getAdditionalProperties()) ||
+                // additionalProperties is a schema with its boolean value set to false
+                (schema.getAdditionalProperties() instanceof Schema &&
+                        ((Schema) schema.getAdditionalProperties()).getBooleanSchemaValue() != null &&
+                              !((Schema) schema.getAdditionalProperties()).getBooleanSchemaValue())
+                );
     }
 
     public static boolean hasValidation(Schema sc) {
@@ -2415,7 +2421,7 @@ public static void copyMetadata(Schema from, Schema to) {
      * For example, a schema that only has a `description` without any `properties` or `$ref` defined.
      *
      * @param schema the schema
-     * @return       if the schema is only metadata and not an actual type
+     * @return if the schema is only metadata and not an actual type
      */
     public static boolean isMetadataOnlySchema(Schema schema) {
         return !(schema.get$ref() != null ||

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

@@ -585,4 +585,35 @@ public void isUnsupportedSchemaTest() {
         assertFalse(ModelUtils.isUnsupportedSchema(openAPI, (Schema) property2.getProperties().get("condition")));
         assertFalse(ModelUtils.isUnsupportedSchema(openAPI, (Schema) property2.getProperties().get("purpose")));
     }
+
+    @Test
+    public void testModelWithPropertiesOnly() {
+        // Schema with no properties
+        Schema testSchema = new ObjectSchema().properties(null);
+        assertFalse(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // Schema with properties
+        testSchema.setProperties(Map.of("foo", new Schema()));
+        assertTrue(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // Explicitly no additional properties
+        testSchema.setAdditionalProperties(false);
+        assertTrue(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // With additional properties
+        testSchema.setAdditionalProperties(true);
+        assertFalse(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // Additional properties is a schema set to false
+        testSchema.setAdditionalProperties(new Schema().booleanSchemaValue(false));
+        assertTrue(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // Additional properties is a schema set to true
+        testSchema.setAdditionalProperties(new Schema().booleanSchemaValue(true));
+        assertFalse(ModelUtils.isModelWithPropertiesOnly(testSchema));
+
+        // Additional properties is a custom schema
+        testSchema.setAdditionalProperties(new Schema().type("string"));
+        assertFalse(ModelUtils.isModelWithPropertiesOnly(testSchema));
+    }
 }