rollback with master cause OpenAPITools#16992 fixed this issue too

dabdirb · Nov 13, 2023 · b6d1422 · b6d1422
1 parent 81bd339
commit b6d1422
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -23,7 +23,6 @@
 import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Mustache.Compiler;
 import com.samskivert.mustache.Mustache.Lambda;
@@ -3702,10 +3701,6 @@ protected void addProperties(Map<String, Schema> properties, List<String> requir
             return;
         }
         if (ModelUtils.isComposedSchema(schema)) {
-            // fix issue #16797 and #15796, constructor fail by missing parent required params
-            if (schema.getProperties() != null && !schema.getProperties().isEmpty()) {
-                properties.putAll(schema.getProperties());
-            }
 
             if (schema.getAllOf() != null) {
                 for (Object component : schema.getAllOf()) {
@@ -3728,10 +3723,10 @@ protected void addProperties(Map<String, Schema> properties, List<String> requir
                     addProperties(properties, required, (Schema) component, visitedSchemas);
                 }
             }
-
+            // add check for issue #16797 and #15796, constructor fail by missing parent required params
             for (String r : required) {
                 if (!properties.containsKey(r)) {
-                    LOGGER.error("Required not in property %s", r);
+                    LOGGER.error("Required var %s not in properties", r);
                 }
             }
             return;