From 2129b15c8f0598126a7a259106f7018bd302eef2 Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Wed, 31 Jan 2024 14:35:43 +0100 Subject: [PATCH] fix require var logging, don't matchGenerated if allOf skipped (#17746) --- .../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 2f2fdb16183..9a9da0173b4 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 @@ public class DefaultCodegen implements CodegenConfig { 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 486eb32a1e0..9049bfc4bda 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 @@ public class InlineModelResolver { 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);