From 1a662afb5bd4345e603043d1c193e90b5395130d Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 25 Jul 2025 00:19:12 +0200 Subject: [PATCH 1/2] Fix warning logs for additional properties that have not been set --- .../java/org/openapitools/codegen/DefaultCodegen.java | 4 +--- .../codegen/languages/TypeScriptClientCodegen.java | 9 +++++++-- .../codegen/languages/TypeScriptFetchClientCodegen.java | 2 +- 3 files changed, 9 insertions(+), 6 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 a4b56b15c9cb..0ae59f50b26e 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 @@ -6024,10 +6024,8 @@ protected Map unaliasPropertySchema(Map properti if (properties != null) { for (String key : properties.keySet()) { properties.put(key, unaliasSchema(properties.get(key))); - } } - return properties; } @@ -7093,7 +7091,7 @@ public boolean convertPropertyToBoolean(String propertyKey) { } else if (booleanValue instanceof String) { result = Boolean.parseBoolean((String) booleanValue); } else { - LOGGER.warn("The value (generator's option) must be either boolean or string. Default to `false`."); + LOGGER.warn("The value {} must be either boolean or string. Default to `false`.", propertyKey); } return result; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java index ef874ac4b83b..b3305c904f5b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptClientCodegen.java @@ -83,6 +83,11 @@ public class TypeScriptClientCodegen extends AbstractTypeScriptClientCodegen imp private final Map frameworkToHttpLibMap; + @Setter + private boolean useRxJS; + @Setter + private boolean useInversify; + // NPM Options private static final String NPM_REPOSITORY = "npmRepository"; @@ -461,12 +466,12 @@ public void processOpts() { additionalProperties.put(IMPORT_FILE_EXTENSION_SWITCH, ".ts"); } - final boolean useRxJS = convertPropertyToBooleanAndWriteBack(USE_RXJS_SWITCH); + convertPropertyToBooleanAndWriteBack(USE_RXJS_SWITCH, this::setUseRxJS); if (!useRxJS) { supportingFiles.add(new SupportingFile("rxjsStub.mustache", "rxjsStub.ts")); } - final boolean useInversify = convertPropertyToBooleanAndWriteBack(USE_INVERSIFY_SWITCH); + convertPropertyToBooleanAndWriteBack(USE_INVERSIFY_SWITCH, this::setUseInversify); if (useInversify) { supportingFiles.add(new SupportingFile("services" + File.separator + "index.mustache", "services", "index.ts")); supportingFiles.add(new SupportingFile("services" + File.separator + "configuration.mustache", "services", "configuration.ts")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 8b2ebbcf7f30..b6ea01a816f5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -313,7 +313,7 @@ public void processOpts() { } } - setGenerateValidationAttributes(convertPropertyToBooleanAndWriteBack(VALIDATION_ATTRIBUTES)); + convertPropertyToBooleanAndWriteBack(VALIDATION_ATTRIBUTES, this::setGenerateValidationAttributes); } @Override From a537002a1795c14cd5ab1a494f11cf9183814363 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Sat, 26 Jul 2025 18:47:18 +0200 Subject: [PATCH 2/2] Readd warning log details to clarify what option that the log refers to --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0ae59f50b26e..d69ade0c16f8 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 @@ -7091,7 +7091,7 @@ public boolean convertPropertyToBoolean(String propertyKey) { } else if (booleanValue instanceof String) { result = Boolean.parseBoolean((String) booleanValue); } else { - LOGGER.warn("The value {} must be either boolean or string. Default to `false`.", propertyKey); + LOGGER.warn("The generator's option \"{}\" must be either boolean or string. Default to `false`.", propertyKey); } return result; }