From 2cb08944fad431485d26a7f3b93231413eb075f7 Mon Sep 17 00:00:00 2001
From: Robert Stoll <robert.stoll@tegonal.com>
Date: Tue, 30 Jan 2024 18:02:58 +0100
Subject: [PATCH] fix require var logging, don't matchGenerated if allOf
 skipped

---
 .../src/main/java/org/openapitools/codegen/DefaultCodegen.java  | 2 +-
 .../main/java/org/openapitools/codegen/InlineModelResolver.java | 2 +-
 2 files changed, 2 insertions(+), 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
index 2f2fdb16183f..9a9da0173b4e 100644
--- 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
index 486eb32a1e0a..9049bfc4bdae 100644
--- 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);