#6041 removed annotations and imports from airline library.

HugoMario · HugoMario · commit 48c570442279 · 2017-10-18T00:32:27.000-05:00
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
@@ -1,16 +1,10 @@
 package io.swagger.codegen.cmd;
 
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConfigLoader;
 
-@Command(name = "config-help", description = "Config help for chosen lang")
 public class ConfigHelp implements Runnable {
-
-    @Option(name = {"-l", "--lang"}, title = "language", required = true,
-            description = "language to get config help for")
     private String lang;
 
     @Override
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java
@@ -1,175 +1,60 @@
 package io.swagger.codegen.cmd;
 
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
 import io.swagger.codegen.ClientOptInput;
-import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.DefaultGenerator;
 import io.swagger.codegen.config.CodegenConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.swagger.codegen.config.CodegenConfiguratorUtils.*;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvpList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvpList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applySystemPropertiesKvpList;
+import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvpList;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
 /**
  * User: lanwen Date: 24.03.15 Time: 20:22
  */
 
-@Command(name = "generate", description = "Generate code with chosen lang")
 public class Generate implements Runnable {
 
     public static final Logger LOG = LoggerFactory.getLogger(Generate.class);
 
-    @Option(name = {"-v", "--verbose"}, description = "verbose mode")
     private Boolean verbose;
-
-    @Option(name = {"-l", "--lang"}, title = "language", required = true,
-            description = "client language to generate (maybe class name in classpath, required)")
     private String lang;
-
-    @Option(name = {"-o", "--output"}, title = "output directory",
-            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 swagger spec, as URL or file (required)")
     private String spec;
-
-    @Option(name = {"-t", "--template-dir"}, title = "template directory",
-            description = "folder containing the template files")
     private String templateDir;
-
-    @Option(
-            name = {"-a", "--auth"},
-            title = "authorization",
-            description = "adds authorization headers when fetching the swagger definitions remotely. "
-                    + "Pass in a URL-encoded string of name:header with a comma separating multiple values")
     private String auth;
-
-    @Option(
-            name = {"-D"},
-            title = "system properties",
-            description = "sets specified system properties in "
-                    + "the format of name=value,name=value (or multiple options, each with name=value)")
     private List<String> systemProperties = new ArrayList<>();
-
-    @Option(
-            name = {"-c", "--config"},
-            title = "configuration file",
-            description = "Path to json configuration file. "
-                    + "File content should be in a json format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...} "
-                    + "Supported options can be different for each language. Run config-help -l {lang} command for language specific config options.")
     private String configFile;
-
-    @Option(name = {"-s", "--skip-overwrite"}, title = "skip overwrite",
-            description = "specifies if the existing files should be "
-                    + "overwritten during the generation.")
     private Boolean skipOverwrite;
-
-    @Option(name = {"--api-package"}, title = "api package",
-            description = CodegenConstants.API_PACKAGE_DESC)
     private String apiPackage;
-
-    @Option(name = {"--model-package"}, title = "model package",
-            description = CodegenConstants.MODEL_PACKAGE_DESC)
     private String modelPackage;
-
-    @Option(name = {"--model-name-prefix"}, title = "model name prefix",
-            description = CodegenConstants.MODEL_NAME_PREFIX_DESC)
     private String modelNamePrefix;
-
-    @Option(name = {"--model-name-suffix"}, title = "model name suffix",
-            description = CodegenConstants.MODEL_NAME_SUFFIX_DESC)
     private String modelNameSuffix;
-
-    @Option(
-            name = {"--instantiation-types"},
-            title = "instantiation types",
-            description = "sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType."
-                    + "For example (in Java): array=ArrayList,map=HashMap. In other words array types will get instantiated as ArrayList in generated code."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> instantiationTypes = new ArrayList<>();
-
-    @Option(
-            name = {"--type-mappings"},
-            title = "type mappings",
-            description = "sets mappings between swagger spec types and generated code types "
-                    + "in the format of swaggerType=generatedType,swaggerType=generatedType. For example: array=List,map=Map,string=String."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> typeMappings = new ArrayList<>();
-
-    @Option(
-            name = {"--additional-properties"},
-            title = "additional properties",
-            description = "sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> additionalProperties = new ArrayList<>();
-
-    @Option(
-            name = {"--language-specific-primitives"},
-            title = "language specific primitives",
-            description = "specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: String,boolean,Boolean,Double."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> languageSpecificPrimitives = new ArrayList<>();
-
-    @Option(
-            name = {"--import-mappings"},
-            title = "import mappings",
-            description = "specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> importMappings = new ArrayList<>();
-
-    @Option(name = {"--invoker-package"}, title = "invoker package",
-            description = CodegenConstants.INVOKER_PACKAGE_DESC)
     private String invokerPackage;
-
-    @Option(name = {"--group-id"}, title = "group id", description = CodegenConstants.GROUP_ID_DESC)
     private String groupId;
-
-    @Option(name = {"--artifact-id"}, title = "artifact id",
-            description = CodegenConstants.ARTIFACT_ID_DESC)
     private String artifactId;
-
-    @Option(name = {"--artifact-version"}, title = "artifact version",
-            description = CodegenConstants.ARTIFACT_VERSION_DESC)
     private String artifactVersion;
-
-    @Option(name = {"--library"}, title = "library", description = CodegenConstants.LIBRARY_DESC)
     private String library;
-
-    @Option(name = {"--git-user-id"}, title = "git user id",
-            description = CodegenConstants.GIT_USER_ID_DESC)
     private String gitUserId;
-
-    @Option(name = {"--git-repo-id"}, title = "git repo id",
-            description = CodegenConstants.GIT_REPO_ID_DESC)
     private String gitRepoId;
-
-    @Option(name = {"--release-note"}, title = "release note",
-            description = CodegenConstants.RELEASE_NOTE_DESC)
     private String releaseNote;
-
-    @Option(name = {"--http-user-agent"}, title = "http user agent",
-            description = CodegenConstants.HTTP_USER_AGENT_DESC)
     private String httpUserAgent;
-
-    @Option(
-            name = {"--reserved-words-mappings"},
-            title = "reserved word mappings",
-            description = "specifies how a reserved name should be escaped to. Otherwise, the default _<name> is used. For example id=identifier."
-                    + " You can also have multiple occurrences of this option.")
     private List<String> reservedWordsMappings = new ArrayList<>();
-
-    @Option(name = {"--ignore-file-override"}, title = "ignore file override location",
-            description = CodegenConstants.IGNORE_FILE_OVERRIDE_DESC)
     private String ignoreFileOverride;
-
-    @Option(name = {"--remove-operation-id-prefix"}, title = "remove prefix of the operationId",
-            description = CodegenConstants.REMOVE_OPERATION_ID_PREFIX_DESC)
     private Boolean removeOperationIdPrefix;
 
     @Override
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java
@@ -1,7 +1,6 @@
 package io.swagger.codegen.cmd;
 
 import ch.lambdaj.collection.LambdaIterable;
-import io.airlift.airline.Command;
 import io.swagger.codegen.CodegenConfig;
 
 import static ch.lambdaj.Lambda.on;
@@ -11,7 +10,6 @@
 /**
  * User: lanwen Date: 24.03.15 Time: 20:25
  */
-@Command(name = "langs", description = "Shows available langs")
 public class Langs implements Runnable {
     @Override
     public void run() {
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
@@ -5,8 +5,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
 import io.swagger.codegen.DefaultGenerator;
 import io.swagger.codegen.SupportingFile;
 import org.apache.commons.io.FileUtils;
@@ -25,27 +23,15 @@
 /**
  * User: lanwen Date: 24.03.15 Time: 20:22
  */
-
-@Command(name = "meta", description = "MetaGenerator. Generator for creating a new template set "
-        + "and configuration for Codegen.  The output will be based on the language you "
-        + "specify, and includes default templates to include.")
 public class Meta implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class);
 
     private static final String TEMPLATE_DIR_CLASSPATH = "codegen";
     private static final String MUSTACHE_EXTENSION = ".mustache";
 
-    @Option(name = {"-o", "--output"}, title = "output directory",
-            description = "where to write the generated files (current dir by default)")
     private String outputFolder = "";
-
-    @Option(name = {"-n", "--name"}, title = "name",
-            description = "the human-readable name of the generator")
     private String name = "default";
-
-    @Option(name = {"-p", "--package"}, title = "package",
-            description = "the package to put the main class into (defaults to io.swagger.codegen)")
     private String targetPackage = "io.swagger.codegen";
 
     @Override
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Validate.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Validate.java
@@ -1,20 +1,14 @@
 package io.swagger.codegen.cmd;
 
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
-
 import io.swagger.parser.SwaggerParser;
 import io.swagger.parser.util.SwaggerDeserializationResult;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-@Command(name = "validate", description = "Validate specification")
 public class Validate implements Runnable {
 
-    @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
-            description = "location of the swagger spec, as URL or file (required)")
     private String spec;
 
     @Override
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Version.java
@@ -1,14 +1,12 @@
 package io.swagger.codegen.cmd;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import io.airlift.airline.Command;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Command(name = "version", description = "Show version information")
 public class Version implements Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class);
