loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[ci][cli] Allow invoking generate-samples.sh with single file + args (#6609)

Browse Source
This commit is contained in:
Jim Schubert
2020-06-11 11:39:26 -04:00
committed by GitHub
parent 28387a09bc
commit 0cb080d5f1
4 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.slf4j.Logger;
@@ -52,8 +53,8 @@ public class Generate extends OpenApiGeneratorCommand {
description = "where to write the generated files (current dir by default)")
private String output = "";
@Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
description = "location of the OpenAPI spec, as URL or file (required)")
@Option(name = {"-i", "--input-spec"}, title = "spec file",
description = "location of the OpenAPI spec, as URL or file (required if not loaded via config using -c)")
private String spec;
@Option(name = {"-t", "--template-dir"}, title = "template directory",
@@ -264,6 +265,10 @@ public class Generate extends OpenApiGeneratorCommand {
if (configFile != null && configFile.length() > 0) {
// attempt to load from configFile
configurator = CodegenConfigurator.fromFile(configFile);
} else if (StringUtils.isEmpty(spec)) {
// if user doesn't pass configFile and does not pass spec, we can fail immediately because one of these two is required to run.
System.err.println("[error] Required option '-i' is missing");
System.exit(1);
}
// if a config file wasn't specified, or we were unable to read it
@@ -295,11 +300,9 @@ public class Generate extends OpenApiGeneratorCommand {
configurator.setInputSpec(spec);
}
// Generator name should not be validated here, as it's validated in toClientOptInput
if (isNotEmpty(generatorName)) {
configurator.setGeneratorName(generatorName);
} else {
System.err.println("[error] A generator name (--generator-name / -g) is required.");
System.exit(1);
}
if (isNotEmpty(output)) {