Simplifying CliOption class

Author: hrachya

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CliOption.java

@@ -5,40 +5,24 @@
  */
 package com.wordnik.swagger.codegen;
 
-import org.apache.commons.cli.Option;
+public class CliOption {
+  private final String opt;
+  private String description;
 
-public class CliOption extends Option {
-
-  private Boolean langSpecific = false;
-
-  public CliOption(String opt, String description) throws IllegalArgumentException {
-    super(opt, description);
-  }
-
-  public CliOption(String opt, boolean hasArg, String description) throws IllegalArgumentException {
-    super(opt, hasArg, description);
-  }
-
-  public CliOption(String opt, String longOpt, boolean hasArg, String description) throws IllegalArgumentException {
-    super(opt, longOpt, hasArg, description);
-  }
-
-  public CliOption(String opt, String description, Boolean langSpecific) throws IllegalArgumentException {
-    this(opt, description);
-    this.langSpecific = langSpecific;
+  public CliOption(String opt, String description) {
+    this.opt = opt;
+    this.description = description;
   }
 
-  public CliOption(String opt, boolean hasArg, String description, Boolean langSpecific) throws IllegalArgumentException {
-    this(opt, hasArg, description);
-    this.langSpecific = langSpecific;
+  public String getOpt() {
+    return opt;
   }
 
-  public CliOption(String opt, String longOpt, boolean hasArg, String description, Boolean langSpecific) throws IllegalArgumentException {
-    this(opt, longOpt, hasArg, description);
-    this.langSpecific = langSpecific;
+  public String getDescription() {
+    return description;
   }
 
-  public Boolean isLangSpecific() {
-    return langSpecific;
+  public void setDescription(String description) {
+    this.description = description;
   }
 }

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java

@@ -303,8 +303,8 @@ public DefaultCodegen() {
     importMapping.put("LocalDate", "org.joda.time.*");
     importMapping.put("LocalTime", "org.joda.time.*");
 
-    cliOptions.add(new CliOption("modelPackage", "model-package", true, "Package for generated models"));
-    cliOptions.add(new CliOption("apiPackage", "api-package", true, "Package for generated api classes"));
+    cliOptions.add(new CliOption("modelPackage", "package for generated models"));
+    cliOptions.add(new CliOption("apiPackage", "package for generated api classes"));
   }
 
 

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java

@@ -59,11 +59,11 @@ public JavaClientCodegen() {
     instantiationTypes.put("array", "ArrayList");
     instantiationTypes.put("map", "HashMap");
 
-    cliOptions.add(new CliOption("invokerPackage", "invoker-package", true, "Root package for generated code", true));
-    cliOptions.add(new CliOption("groupId", "group-id", true, "groupId in pom.xml", true));
-    cliOptions.add(new CliOption("artifactId", "artifact-id", true, "groupId in pom.xml", true));
-    cliOptions.add(new CliOption("artifactVersion", "artifact-version", true, "artifact version in pom.xml", true));
-    cliOptions.add(new CliOption("sourceFolder", "source-folder", true, "Source folder for generated code", true));
+    cliOptions.add(new CliOption("invokerPackage", "root package for generated code"));
+    cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml"));
+    cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml"));
+    cliOptions.add(new CliOption("artifactVersion", "artifact version in generated pom.xml"));
+    cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
   }
 
   @Override

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java

@@ -106,9 +106,9 @@ public ObjcClientCodegen() {
     instantiationTypes.put("array", "NSMutableArray");
     instantiationTypes.put("map", "NSMutableDictionary");
 
-    cliOptions.add(new CliOption("classPrefix", "class-prefix", true, "prefix for generated classes", true));
-    cliOptions.add(new CliOption("sourceFolder", "source-folder", true, "source folder for generated code", true));
-    cliOptions.add(new CliOption("projectName", "project-name", true, "name of the Xcode project in generated Podfile", true));
+    cliOptions.add(new CliOption("classPrefix", "prefix for generated classes"));
+    cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+    cliOptions.add(new CliOption("projectName", "name of the Xcode project in generated Podfile"));
   }
 
   @Override