diff --git a/docs/usage.md b/docs/usage.md index 62ca03b84b6b..26bc451f1923 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -312,8 +312,8 @@ SYNOPSIS [--model-name-suffix ] [--model-package ] [(-o | --output )] [(-p | --additional-properties )...] - [--package-name ] [--release-note ] - [--remove-operation-id-prefix] + [--package-name ] [(-q | --quiet)] + [--release-note ] [--remove-operation-id-prefix] [--reserved-words-mappings ...] [(-s | --skip-overwrite)] [--server-variables ...] [--skip-operation-example] [--skip-validate-spec] @@ -464,6 +464,9 @@ OPTIONS --package-name package for generated classes (where supported) + -q, --quiet + quiet mode + --release-note Release note, default to 'Minor update'. diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java index 317666b7a07c..f0e748ad09b1 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java @@ -46,6 +46,9 @@ public class Generate extends OpenApiGeneratorCommand { @Option(name = {"-v", "--verbose"}, description = "verbose mode") private Boolean verbose; + @Option(name = {"-q", "--quiet"}, description = "quiet mode") + private Boolean quiet; + @Option(name = {"-g", "--generator-name"}, title = "generator name", description = "generator to use (see list command for list)") private String generatorName; @@ -376,6 +379,10 @@ public void execute() { configurator.setVerbose(verbose); } + if (quiet != null) { + configurator.setQuiet(quiet); + } + if (skipOverwrite != null) { configurator.setSkipOverwrite(skipOverwrite); } diff --git a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java index 594a5f5f1864..af1e8342b805 100644 --- a/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java @@ -432,6 +432,24 @@ public void testVerboseShort() { verifyNoMoreInteractions(configurator); } + @Test + public void testQuietLong() { + setupAndRunGenericTest("--quiet"); + verify(configurator).setQuiet(true); + verify(configurator).toClientOptInput(); + verify(configurator).toContext(); + verifyNoMoreInteractions(configurator); + } + + @Test + public void testQuietShort() { + setupAndRunGenericTest("-q"); + verify(configurator).setQuiet(true); + verify(configurator).toClientOptInput(); + verify(configurator).toContext(); + verifyNoMoreInteractions(configurator); + } + /** * This test ensures that when the */ diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java index f943fef3aa62..eda34b125bf0 100644 --- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java +++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java @@ -44,6 +44,7 @@ public class WorkflowSettings { public static final boolean DEFAULT_VALIDATE_SPEC = true; public static final boolean DEFAULT_ENABLE_POST_PROCESS_FILE = false; public static final boolean DEFAULT_ENABLE_MINIMAL_UPDATE = false; + public static final boolean DEFAULT_QUIET = false; public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true; public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false; public static final String DEFAULT_TEMPLATING_ENGINE_NAME = null; // this is set by the generator @@ -59,6 +60,7 @@ public class WorkflowSettings { private boolean validateSpec = DEFAULT_VALIDATE_SPEC; private boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE; private boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE; + private boolean quiet = DEFAULT_QUIET; private boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR; private boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL; private String templateDir; @@ -77,6 +79,7 @@ private WorkflowSettings(Builder builder) { this.validateSpec = builder.validateSpec; this.enablePostProcessFile = builder.enablePostProcessFile; this.enableMinimalUpdate = builder.enableMinimalUpdate; + this.quiet = builder.quiet; this.strictSpecBehavior = builder.strictSpecBehavior; this.templateDir = builder.templateDir; this.templatingEngineName = builder.templatingEngineName; @@ -109,6 +112,7 @@ public static Builder newBuilder(WorkflowSettings copy) { builder.validateSpec = copy.isValidateSpec(); builder.enablePostProcessFile = copy.isEnablePostProcessFile(); builder.enableMinimalUpdate = copy.isEnableMinimalUpdate(); + builder.quiet = copy.isQuiet(); builder.generateAliasAsModel = copy.isGenerateAliasAsModel(); builder.strictSpecBehavior = copy.isStrictSpecBehavior(); builder.templatingEngineName = copy.getTemplatingEngineName(); @@ -227,6 +231,15 @@ public boolean isEnableMinimalUpdate() { return enableMinimalUpdate; } + /** + * Indicates whether or not generation should run in quiet mode. + * + * @return true if quiet mode is enabled, otherwise false. + */ + public boolean isQuiet() { + return quiet; + } + /** * Indicates whether or not the generation should convert aliases (primitives defined as schema for use within documents) as models. * @@ -307,6 +320,7 @@ public static final class Builder { private Boolean validateSpec = DEFAULT_VALIDATE_SPEC; private Boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE; private Boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE; + private Boolean quiet = DEFAULT_QUIET; private Boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR; private Boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL; private String templateDir; @@ -436,6 +450,17 @@ public Builder withEnableMinimalUpdate(Boolean enableMinimalUpdate) { return this; } + /** + * Sets the {@code quiet} and returns a reference to this Builder so that the methods can be chained together. + * + * @param quiet the {@code quiet} to set + * @return a reference to this Builder + */ + public Builder withQuiet(Boolean quiet) { + this.quiet = quiet != null ? quiet : Boolean.valueOf(DEFAULT_QUIET); + return this; + } + /** * Sets the {@code strictSpecBehavior} and returns a reference to this Builder so that the methods can be chained together. * @@ -580,6 +605,7 @@ public String toString() { ", validateSpec=" + validateSpec + ", enablePostProcessFile=" + enablePostProcessFile + ", enableMinimalUpdate=" + enableMinimalUpdate + + ", quiet=" + quiet + ", strictSpecBehavior=" + strictSpecBehavior + ", templateDir='" + templateDir + '\'' + ", templatingEngineName='" + templatingEngineName + '\'' + @@ -602,6 +628,7 @@ public boolean equals(Object o) { isValidateSpec() == that.isValidateSpec() && isEnablePostProcessFile() == that.isEnablePostProcessFile() && isEnableMinimalUpdate() == that.isEnableMinimalUpdate() && + isQuiet() == that.isQuiet() && isStrictSpecBehavior() == that.isStrictSpecBehavior() && isGenerateAliasAsModel() == that.isGenerateAliasAsModel() && Objects.equals(getInputSpec(), that.getInputSpec()) && @@ -626,6 +653,7 @@ public int hashCode() { isGenerateAliasAsModel(), isEnablePostProcessFile(), isEnableMinimalUpdate(), + isQuiet(), isStrictSpecBehavior(), getTemplateDir(), getTemplatingEngineName(), diff --git a/modules/openapi-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java b/modules/openapi-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java index 1ae078841d14..f95b0a538e6a 100644 --- a/modules/openapi-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java +++ b/modules/openapi-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java @@ -35,6 +35,7 @@ public void defaultValuesNotOverriddenByNulls() { .withValidateSpec(null) .withEnablePostProcessFile(null) .withEnableMinimalUpdate(null) + .withQuiet(null) .withStrictSpecBehavior(null) .build(); @@ -46,6 +47,7 @@ public void defaultValuesNotOverriddenByNulls() { assertTrue(settings.isValidateSpec()); assertFalse(settings.isEnablePostProcessFile()); assertFalse(settings.isEnableMinimalUpdate()); + assertFalse(settings.isQuiet()); assertTrue(settings.isStrictSpecBehavior()); } @@ -78,6 +80,7 @@ private void assertOnChangesToDefaults(WorkflowSettings defaultSettings) { .withValidateSpec(false) .withEnablePostProcessFile(true) .withEnableMinimalUpdate(true) + .withQuiet(true) .withStrictSpecBehavior(false) .build(); @@ -105,6 +108,9 @@ private void assertOnChangesToDefaults(WorkflowSettings defaultSettings) { assertNotEquals(defaultSettings.isEnableMinimalUpdate(), newSettings.isEnableMinimalUpdate()); assertTrue(newSettings.isEnableMinimalUpdate()); + assertNotEquals(defaultSettings.isQuiet(), newSettings.isQuiet()); + assertTrue(newSettings.isQuiet()); + assertNotEquals(defaultSettings.isStrictSpecBehavior(), newSettings.isStrictSpecBehavior()); assertFalse(newSettings.isStrictSpecBehavior()); } diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc index 73150eee039c..a1597ea05643 100644 --- a/modules/openapi-generator-gradle-plugin/README.adoc +++ b/modules/openapi-generator-gradle-plugin/README.adoc @@ -405,6 +405,10 @@ apply plugin: 'org.openapi.generator' |false |To write all log messages (not just errors) to STDOUT +|quiet +|Boolean / Provider +|false +|Whether generation should run in quiet mode. |enablePostProcessFile |Boolean / Provider |false diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt index 901383ac6378..6020b5b9b5d3 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/OpenApiGeneratorPlugin.kt @@ -95,6 +95,7 @@ class OpenApiGeneratorPlugin : Plugin { "Generate code via Open API Tools Generator for Open API 2.0 or 3.x specification documents." verbose.set(generate.verbose) + quiet.set(generate.quiet) validateSpec.set(generate.validateSpec) generatorName.set(generate.generatorName) outputDir.set(generate.outputDir) diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt index 556d6acb72a6..7147aaa802de 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt @@ -36,6 +36,11 @@ open class OpenApiGeneratorGenerateExtension(private val project: Project) { */ val verbose = project.objects.property() + /** + * Whether generation should run in quiet mode. + */ + val quiet = project.objects.property() + /** * Whether an input specification should be validated upon generation. */ @@ -448,6 +453,7 @@ open class OpenApiGeneratorGenerateExtension(private val project: Project) { generateApiDocumentation.convention(true) configOptions.convention(mapOf()) validateSpec.convention(true) + quiet.convention(false) logToStderr.convention(false) enablePostProcessFile.convention(false) skipValidateSpec.convention(false) diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt index fa8be13d5cdd..5a75a5bae599 100644 --- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt +++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt @@ -50,6 +50,7 @@ interface OpenApiWorkParameters : WorkParameters { val outputDir: DirectoryProperty val configFile: RegularFileProperty val verbose: Property + val quiet: Property val validateSpec: Property val generatorName: Property val auth: Property @@ -159,6 +160,7 @@ abstract class OpenApiWorkAction : WorkAction { params.resolvedInputSpec.orNull?.let { configurator.setInputSpec(it) } params.outputDir.orNull?.let { configurator.setOutputDir(it.asFile.absolutePath) } params.verbose.orNull?.let { configurator.setVerbose(it) } + params.quiet.orNull?.let { configurator.setQuiet(it) } params.validateSpec.orNull?.let { configurator.setValidateSpec(it) } params.skipOverwrite.orNull?.let { configurator.setSkipOverwrite(it) } params.generatorName.orNull?.let { configurator.setGeneratorName(it) } @@ -316,6 +318,13 @@ abstract class GenerateTask : DefaultTask() { @get:Input abstract val verbose: Property + /** + * Whether generation should run in quiet mode. + */ + @get:Optional + @get:Input + abstract val quiet: Property + /** * Whether an input specification should be validated upon generation. */ @@ -928,6 +937,7 @@ abstract class GenerateTask : DefaultTask() { parameters.outputDir.set(outputDir) parameters.configFile.set(configFile) parameters.verbose.set(verbose) + parameters.quiet.set(quiet) parameters.validateSpec.set(validateSpec) parameters.generatorName.set(generatorName) parameters.auth.set(auth) diff --git a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt index 7927fe0cc39b..312d08f334a8 100644 --- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt +++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt @@ -244,6 +244,49 @@ class GenerateTaskDslTest : TestBase() { ) } + @Test(dataProvider = "property_format_provider") + fun `openApiGenerate should suppress promo banner in quiet mode`(format: String) { + val propertyFormat = PropertyFormat.valueOf(format) + val projectFiles = mapOf( + "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0.yaml") + ) + withProject( + """ + plugins { + id 'org.openapi.generator' + } + openApiGenerate { + generatorName = "kotlin" + inputSpec = ${"spec.yaml".toPropertyReference(propertyFormat)} + outputDir = ${"build/kotlin".toPropertyReference(propertyFormat)} + apiPackage = "org.openapitools.example.api" + invokerPackage = "org.openapitools.example.invoker" + modelPackage = "org.openapitools.example.model" + quiet = true + configOptions = [ + dateLibrary: "java8" + ] + } + """.trimIndent(), + projectFiles + ) + + val result = GradleRunner.create() + .withProjectDir(temp) + .withArguments("openApiGenerate") + .withPluginClasspath() + .build() + + assertFalse( + result.output.contains("# Thanks for using OpenAPI Generator."), + "Promo banner is shown even when quiet mode is enabled." + ) + assertEquals( + TaskOutcome.SUCCESS, result.task(":openApiGenerate")?.outcome, + "Expected a successful run, but found ${result.task(":openApiGenerate")?.outcome}" + ) + } + @Test(dataProvider = "property_format_provider") fun `openApiGenerate should cleanup outputDir`(format: String) { val propertyFormat = PropertyFormat.valueOf(format) diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md index 4119b1c615ce..44bb78714997 100644 --- a/modules/openapi-generator-maven-plugin/README.md +++ b/modules/openapi-generator-maven-plugin/README.md @@ -44,6 +44,7 @@ mvn clean compile | Option | Property | Description | |--------|----------|-------------| | `verbose` | `openapi.generator.maven.plugin.verbose` | verbose mode (`false` by default) +| `quiet` | `openapi.generator.maven.plugin.quiet` | quiet mode (`false` by default) | `inputSpec` | `openapi.generator.maven.plugin.inputSpec` | OpenAPI Spec file path | `inputSpecRootDirectory` | `openapi.generator.maven.plugin.inputSpecRootDirectory` | Local root folder with spec file(s) | `mergedFileName` | `openapi.generator.maven.plugin.mergedFileName` | Name of the file that will contain all merged specs diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java index 443f5b52b482..9a00d3cea3b3 100644 --- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java +++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java @@ -83,6 +83,9 @@ public class CodeGenMojo extends AbstractMojo { @Parameter(name = "verbose", defaultValue = "false") private boolean verbose; + @Parameter(name = "quiet", property = "openapi.generator.maven.plugin.quiet", defaultValue = "false") + private boolean quiet; + /** * The name of the generator to use. */ @@ -647,6 +650,7 @@ public void execute() throws MojoExecutionException { } configurator.setVerbose(verbose); + configurator.setQuiet(quiet); if (skipOverwrite != null) { configurator.setSkipOverwrite(skipOverwrite); diff --git a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java index d08c88b8fac6..bc1b838341eb 100644 --- a/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java +++ b/modules/openapi-generator-maven-plugin/src/test/java/org/openapitools/codegen/plugin/CodeGenMojoTest.java @@ -83,6 +83,7 @@ private void testCommonConfiguration(String profile) throws Exception { assertEquals("remote.org.openapitools.client.api", getVariableValueFromObject(mojo, "apiPackage")); assertEquals("remote.org.openapitools.client.model", getVariableValueFromObject(mojo, "modelPackage")); assertEquals("remote.org.openapitools.client", getVariableValueFromObject(mojo, "invokerPackage")); + assertEquals(Boolean.TRUE, getVariableValueFromObject(mojo, "quiet")); Map configOptions = (Map) getVariableValueFromObject(mojo, "configOptions"); assertNotNull(configOptions); diff --git a/modules/openapi-generator-maven-plugin/src/test/resources/default/pom.xml b/modules/openapi-generator-maven-plugin/src/test/resources/default/pom.xml index b1465ab0e3b0..1273dbaf9edd 100644 --- a/modules/openapi-generator-maven-plugin/src/test/resources/default/pom.xml +++ b/modules/openapi-generator-maven-plugin/src/test/resources/default/pom.xml @@ -80,6 +80,7 @@ remote.org.openapitools.client.api remote.org.openapitools.client.model remote.org.openapitools.client + true petstore-full-spec true 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 d000cde76814..844f04103531 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 @@ -1011,11 +1011,17 @@ public void setOpenAPI(OpenAPI openAPI) { @Override @SuppressWarnings("static-method") public void postProcess() { - System.out.println("############################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# We appreciate your support! Please consider donation to help us maintain this project. #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("############################################################################################"); + if (!isQuietMode()) { + System.out.println("############################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# We appreciate your support! Please consider donation to help us maintain this project. #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("############################################################################################"); + } + } + + protected boolean isQuietMode() { + return Boolean.parseBoolean(GlobalSettings.getProperty("quiet", "false")); } // override with any special post-processing diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java index a3597fa37f2e..9f5161c52788 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java @@ -577,6 +577,11 @@ public CodegenConfigurator setPackageName(String packageName) { return this; } + public CodegenConfigurator setQuiet(boolean quiet) { + workflowSettingsBuilder.withQuiet(quiet); + return this; + } + public CodegenConfigurator setReleaseNote(String releaseNote) { if (StringUtils.isNotEmpty(releaseNote)) { addAdditionalProperty(CodegenConstants.RELEASE_NOTE, releaseNote); @@ -672,6 +677,8 @@ public Context toContext() { GlobalSettings.setProperty("verbose", "false"); } + GlobalSettings.setProperty("quiet", Boolean.toString(workflowSettings.isQuiet())); + for (Map.Entry entry : workflowSettings.getGlobalProperties().entrySet()) { GlobalSettings.setProperty(entry.getKey(), entry.getValue()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java index efd1dd7c4ccf..799714719b41 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java @@ -954,17 +954,19 @@ public void postProcessFile(File file, String fileType) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator is contributed by Hemant Zope (https://github.com/zhemant) #"); - System.out.println("# and Niklas Werner (https://github.com/PowerOfCreation). #"); - System.out.println("# Please support their work directly \uD83D\uDE4F #"); - System.out.println("# > Hemant Zope - https://www.patreon.com/zhemant #"); - System.out.println("# > Niklas Werner - https://paypal.me/wernerdevelopment #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator is contributed by Hemant Zope (https://github.com/zhemant) #"); + System.out.println("# and Niklas Werner (https://github.com/PowerOfCreation). #"); + System.out.println("# Please support their work directly \uD83D\uDE4F #"); + System.out.println("# > Hemant Zope - https://www.patreon.com/zhemant #"); + System.out.println("# > Niklas Werner - https://paypal.me/wernerdevelopment #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java index 72c1fdf0921c..75f3bc4c79eb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java @@ -1773,14 +1773,16 @@ protected boolean isValueType(CodegenProperty var) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); - System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); + System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java index 99ba87ce923e..5b4f7abfb60a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpReducedClientCodegen.java @@ -1099,14 +1099,16 @@ public ModelsMap postProcessModels(ModelsMap objs) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); - System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); + System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java index 89d34518ea0e..231e799fc901 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FsharpGiraffeServerCodegen.java @@ -282,14 +282,16 @@ public String toRegularExpression(String pattern) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Nick Fisher (https://github.com/nmfisher) #"); - System.out.println("# Please support his work directly via https://paypal.me/nickfisher1984 \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Nick Fisher (https://github.com/nmfisher) #"); + System.out.println("# Please support his work directly via https://paypal.me/nickfisher1984 \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java index 4dd8f65fe6d9..8f5dfc8d53f9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java @@ -720,19 +720,21 @@ public void setSerializationLibrary(final String serializationLibrary) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# WARNING! This generator is outdated. Please use the official generator for #"); - System.out.println("# Micronaut: https://github.com/micronaut-projects/micronaut-openapi with the #"); - System.out.println("# help of the plugin for Gradle #"); - System.out.println("# (https://github.com/micronaut-projects/micronaut-gradle-plugin) and Maven #"); - System.out.println("# (https://github.com/micronaut-projects/micronaut-maven-plugin). #"); - System.out.println("# #"); - System.out.println("# Supported generators for micronaut client / server side, java and kotlin #"); - System.out.println("# languages. #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# WARNING! This generator is outdated. Please use the official generator for #"); + System.out.println("# Micronaut: https://github.com/micronaut-projects/micronaut-openapi with the #"); + System.out.println("# help of the plugin for Gradle #"); + System.out.println("# (https://github.com/micronaut-projects/micronaut-gradle-plugin) and Maven #"); + System.out.println("# (https://github.com/micronaut-projects/micronaut-maven-plugin). #"); + System.out.println("# #"); + System.out.println("# Supported generators for micronaut client / server side, java and kotlin #"); + System.out.println("# languages. #"); + System.out.println("################################################################################"); + } } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JetbrainsHttpClientClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JetbrainsHttpClientClientCodegen.java index 647502edda6f..f307dac72eb0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JetbrainsHttpClientClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JetbrainsHttpClientClientCodegen.java @@ -279,13 +279,15 @@ private List handleCustomVariablesInRequests(List item @Override public void postProcess() { - System.out.println("##########################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator was written by Julien Lengrand-Lambert (https://github.com/jlengrand) #"); - System.out.println("##########################################################################################"); + if (!isQuietMode()) { + System.out.println("##########################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator was written by Julien Lengrand-Lambert (https://github.com/jlengrand) #"); + System.out.println("##########################################################################################"); + } } @Getter diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java index 6d6230b2c94c..c8d99cab3f85 100755 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinClientCodegen.java @@ -1227,14 +1227,16 @@ public String formatFragment(String fragment) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); - System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); + System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java index 27604bdfca66..980ef7c980c9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java @@ -689,14 +689,16 @@ public Map postProcessAllModels(Map objs) @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); - System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Jim Schubert (https://github.com/jimschubert)#"); + System.out.println("# Please support his work directly via https://patreon.com/jimschubert \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinWiremockServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinWiremockServerCodegen.java index 948e5142c680..3f8a8fe6fe25 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinWiremockServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinWiremockServerCodegen.java @@ -141,13 +141,15 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Stefan Koppier (https://github.com/stefankoppier)#"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Stefan Koppier (https://github.com/stefankoppier)#"); + System.out.println("################################################################################"); + } } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java index 23e6a4cf06c2..56f4c98bd9bc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/LuaClientCodegen.java @@ -596,14 +596,16 @@ public String toModelImport(String name) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator is contributed by daurnimator (https://github.com/daurnimator)#"); - System.out.println("# Pls support his work directly via https://github.com/sponsors/daurnimator \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator is contributed by daurnimator (https://github.com/daurnimator)#"); + System.out.println("# Pls support his work directly via https://github.com/sponsors/daurnimator \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java index 6188b21f8797..69c820671194 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PerlClientCodegen.java @@ -648,15 +648,17 @@ public void postProcessFile(File file, String fileType) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator is created by wing328 (https://github.com/wing328) #"); - System.out.println("# Please support his work directly by purchasing a copy of the eBook \ud83d\udcd8 #"); - System.out.println("# - OpenAPI Generator for Perl Developers https://bit.ly/2OId6p3 #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator is created by wing328 (https://github.com/wing328) #"); + System.out.println("# Please support his work directly by purchasing a copy of the eBook \ud83d\udcd8 #"); + System.out.println("# - OpenAPI Generator for Perl Developers https://bit.ly/2OId6p3 #"); + System.out.println("################################################################################"); + } } /** diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java index 8fcf726110bc..42285488dba8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java @@ -1512,15 +1512,17 @@ public String toDefaultValue(Schema p) { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator has been refactored by wing328 (https://github.com/wing328) #"); - System.out.println("# Please support his work directly by purchasing a copy of the eBook \ud83d\udcd8 #"); - System.out.println("# - OpenAPI Generator for PowerShell Developers https://bit.ly/3qBWfRJ #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator has been refactored by wing328 (https://github.com/wing328) #"); + System.out.println("# Please support his work directly by purchasing a copy of the eBook \ud83d\udcd8 #"); + System.out.println("# - OpenAPI Generator for PowerShell Developers https://bit.ly/3qBWfRJ #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java index ea617b75581b..068350a4ffc8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java @@ -508,14 +508,16 @@ public String modelFileFolder() { @Override public void postProcess() { - System.out.println("################################################################################"); - System.out.println("# Thanks for using OpenAPI Generator. #"); - System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); - System.out.println("# https://opencollective.com/openapi_generator/donate #"); - System.out.println("# #"); - System.out.println("# This generator's contributed by Nikita Vakula (https://github.com/krjakbrjak)#"); - System.out.println("# Please support his work directly via https://paypal.me/krjakbrjak \uD83D\uDE4F #"); - System.out.println("################################################################################"); + if (!isQuietMode()) { + System.out.println("################################################################################"); + System.out.println("# Thanks for using OpenAPI Generator. #"); + System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #"); + System.out.println("# https://opencollective.com/openapi_generator/donate #"); + System.out.println("# #"); + System.out.println("# This generator's contributed by Nikita Vakula (https://github.com/krjakbrjak)#"); + System.out.println("# Please support his work directly via https://paypal.me/krjakbrjak \uD83D\uDE4F #"); + System.out.println("################################################################################"); + } } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java index 03f84dfab7fa..cee37bb6666f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RClientCodegen.java @@ -1014,15 +1014,17 @@ public String constructExampleCode(CodegenModel codegenModel, HashMap