fix require var logging, don't matchGenerated if allOf skipped (#17746)

OpenAPITools · Jan 31, 2024 · 2129b15 · 2129b15
1 parent 4d3121c
commit 2129b15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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
@@ -3753,7 +3753,7 @@ protected void addProperties(Map<String, Schema> properties, List<String> requir
 
             for (String r : required) {
                 if (!properties.containsKey(r)) {
-                    LOGGER.error("Required var %s not in properties", r);
+                    LOGGER.error("Required var {} not in properties", r);
                 }
             }
             return;

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -612,8 +612,8 @@ private void flattenComposedChildren(String key, List<Schema> children, boolean
                 Schema innerModel = modelFromProperty(openAPI, component, innerModelName);
                 // Recurse to create $refs for inner models
                 gatherInlineModels(innerModel, innerModelName);
-                String existing = matchGenerated(innerModel);
                 if (!skipAllOfInlineSchemas) {
+                    String existing = matchGenerated(innerModel);
                     if (existing == null) {
                         innerModelName = addSchemas(innerModelName, innerModel);
                         Schema schema = new Schema().$ref(innerModelName);