Merge remote-tracking branch 'origin/master' into 6.0.x

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java

@@ -23,7 +23,7 @@ import java.util.stream.Stream;
 @Command(name = "template", description = "Retrieve templates for local modification")
 public class AuthorTemplate extends OpenApiGeneratorCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AuthorTemplate.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(AuthorTemplate.class);
 
     @Option(name = {"-g", "--generator-name"}, title = "generator name",
             description = "generator to use (see list command for list)",

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java

@@ -43,7 +43,7 @@ import static org.apache.commons.lang3.StringUtils.isEmpty;
 @Command(name = "config-help", description = "Config help for chosen lang")
 public class ConfigHelp extends OpenApiGeneratorCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigHelp.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(ConfigHelp.class);
 
     private static final String FORMAT_TEXT = "text";
     private static final String FORMAT_MARKDOWN = "markdown";

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java

@@ -217,6 +217,10 @@ public class Generate extends OpenApiGeneratorCommand {
             description = CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DESC)
     private Boolean removeOperationIdPrefix;
 
+    @Option(name = {"--skip-operation-example"}, title = "skip examples defined in the operation",
+            description = CodegenConstants.SKIP_OPERATION_EXAMPLE_DESC)
+    private Boolean skipOperationExample;
+
     @Option(name = {"--skip-validate-spec"},
             title = "skip spec validation",
             description = "Skips the default behavior of validating an input specification.")
@@ -393,6 +397,10 @@ public class Generate extends OpenApiGeneratorCommand {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }
 
+        if (skipOperationExample != null) {
+            configurator.setSkipOperationExample(skipOperationExample);
+        }
+
         if (enablePostProcessFile != null) {
             configurator.setEnablePostProcessFile(enablePostProcessFile);
         }

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java

@@ -65,7 +65,7 @@ import java.util.stream.Stream;
 public class GenerateBatch extends OpenApiGeneratorCommand {
     private static AtomicInteger failures = new AtomicInteger(0);
     private static AtomicInteger successes = new AtomicInteger(0);
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateBatch.class);
+    private final Logger LOGGER = LoggerFactory.getLogger(GenerateBatch.class);
 
     @Option(name = {"-v", "--verbose"}, description = "verbose mode")
     private Boolean verbose;