Merge branch '3.0.0' into kotlin

tcslater · tcslater · commit 5d89b7289566 · 2018-02-28T08:27:14.000+11:00
diff --git a/bin/jaxrs-jersey1-petstore-server.sh b/bin/jaxrs-jersey1-petstore-server.sh
@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey1 -DhideGenerationTimestamp=true,serverPort=8080 --library=jersey1 --artifact-id=swagger-jaxrs-jersey1-server"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-jersey -o samples/server/petstore/jaxrs/jersey1 -DhideGenerationTimestamp=true,serverPort=8080 --library=jersey1 --artifact-id=swagger-jaxrs-jersey1-server"
 
 echo "Removing files and folders under samples/server/petstore/jaxrs/jersey1/src/main"
 rm -rf samples/server/petstore/jaxrs/jersey1/src/main
diff --git a/bin/jaxrs-petstore-server.sh b/bin/jaxrs-petstore-server.sh
@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey2 -DhideGenerationTimestamp=true,serverPort=8080"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-jersey -o samples/server/petstore/jaxrs/jersey2 -DhideGenerationTimestamp=true,serverPort=8080"
 
 echo "Removing files and folders under samples/server/petstore/jaxrs/jersey2/src/main"
 rm -rf samples/server/petstore/jaxrs/jersey2/src/main
diff --git a/bin/jaxrs-usetags-petstore-server.sh b/bin/jaxrs-usetags-petstore-server.sh
@@ -26,7 +26,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs -o samples/server/petstore/jaxrs/jersey2-useTags -DhideGenerationTimestamp=true,serverPort=8080 --artifact-id=swagger-jaxrs-jersey2-useTags --additional-properties useTags=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-jersey -o samples/server/petstore/jaxrs/jersey2-useTags -DhideGenerationTimestamp=true,serverPort=8080 --artifact-id=swagger-jaxrs-jersey2-useTags --additional-properties useTags=true"
 
 echo "Removing files and folders under samples/server/petstore/jaxrs/jersey2-useTags/src/main"
 rm -rf samples/server/petstore/jaxrs/jersey2-useTags/src/main
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/CLIHelper.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/CLIHelper.java
@@ -18,6 +18,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -61,6 +62,17 @@ static String[] getArguments(Map<String, Object> extensions) {
         return new String[] {extensions.get("x-option").toString()};
     }
 
+    static String[] getArguments(CodegenArgument codegenArgument) {
+        List<String> options = new ArrayList<>();
+        if (StringUtils.isNotBlank(codegenArgument.getOption())) {
+            options.add(codegenArgument.getOption());
+        }
+        if (StringUtils.isNotBlank(codegenArgument.getShortOption())) {
+            options.add(codegenArgument.getShortOption());
+        }
+        return options.toArray(new String[options.size()]);
+    }
+
     static String detectCommand(String[] args) {
         if(args == null || args.length == 0) {
             return null;
@@ -72,6 +84,32 @@ static String detectCommand(String[] args) {
         return command;
     }
 
+    static String detectlanguage(String[] args) {
+        if(args == null || args.length == 0) {
+            return null;
+        }
+        boolean langFlatFound = false;
+        String language = null;
+        for (String argument : args) {
+            argument = argument.trim();
+            if (langFlatFound) {
+                if (argument.startsWith("-")) {
+                    return null;
+                }
+                return argument;
+            }
+            if ("-l".equalsIgnoreCase(argument)
+                    || "--lang".equalsIgnoreCase(argument)) {
+                langFlatFound = true;
+                continue;
+            }
+            if (argument.startsWith("-l") && argument.length() > 2) {
+                return argument.substring(2);
+            }
+        }
+        return language;
+    }
+
     static Class getClass(Schema property) {
         if(property instanceof BooleanSchema) {
             return Boolean.class;
@@ -180,7 +218,7 @@ else if (valueNode.isArray()) {
         return optionValueMap;
     }
 
-    private static String fixOptionName(String option) {
+    static String fixOptionName(String option) {
         option = option.substring(countDashes(option));
         return option.replace("-", "_");
     }
diff --git a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java b/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java
@@ -1,5 +1,6 @@
 package io.swagger.codegen;
 
+import io.swagger.codegen.cmd.Generate;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.BooleanSchema;
@@ -18,8 +19,10 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * User: lanwen Date: 24.03.15 Time: 17:56
@@ -32,6 +35,7 @@ public class SwaggerCodegen {
 
 
     private static Logger LOGGER = LoggerFactory.getLogger(SwaggerCodegen.class);
+    private static String GENERATE_COMMAND_NAME = "Generate";
 
     public static void main(String[] args) {
         final String oas3 = CLIHelper.loadResourceOAS3File();
@@ -50,6 +54,7 @@ public static void main(String[] args) {
                 .metavar("Command");
 
         final Map<String, Schema> commandMap = new HashMap<>();
+        List<CodegenArgument> codegenArguments = null;
 
         for(String schemaName : schemaNames) {
             final Schema schema = schemaMap.get(schemaName);
@@ -82,6 +87,28 @@ public static void main(String[] args) {
                     argument.nargs("*");
                 }
             }
+            if (command.equalsIgnoreCase(GENERATE_COMMAND_NAME)) {
+                String language = CLIHelper.detectlanguage(args);
+                if (StringUtils.isNotBlank(language)) {
+                    CodegenConfig config = CodegenConfigLoader.forName(language);
+                    codegenArguments = config.getLanguageArguments();
+                    if (codegenArguments != null && !codegenArguments.isEmpty()) {
+                        for (CodegenArgument codegenArgument : codegenArguments) {
+                            String[] arguments = CLIHelper.getArguments(codegenArgument);
+                            Class clazz = "boolean".equalsIgnoreCase(codegenArgument.getType()) ? Boolean.class : String.class;
+                            final Argument argument = parser.addArgument(arguments)
+                                    .type(clazz)
+                                    .help(codegenArgument.getDescription())
+                                    .metavar(StringUtils.EMPTY);
+                            if (codegenArgument.getType().equalsIgnoreCase("boolean")) {
+                                argument.nargs("?").setConst(true);
+                            } else if(codegenArgument.getArray() != null && codegenArgument.getArray()) {
+                                argument.nargs("*");
+                            }
+                        }
+                    }
+                }
+            }
         }
         final Map<String, Object> inputArgs = new HashMap<>();
         try {
@@ -112,6 +139,26 @@ public static void main(String[] args) {
             final Map<String, Object> optionValueMap = CLIHelper.createOptionValueMap(commandSchema, inputArgs);
 
             BeanUtils.populate(commandObject, optionValueMap);
+
+            if (codegenArguments != null && !codegenArguments.isEmpty() && commandObject instanceof Generate) {
+                codegenArguments = codegenArguments.stream()
+                        .filter(codegenArgument -> {
+                            final String option = CLIHelper.fixOptionName(codegenArgument.getOption());
+                            final String optionValue = String.valueOf(inputArgs.get(option));
+
+                            if (StringUtils.isNotBlank(optionValue) && !"null".equalsIgnoreCase(optionValue)) {
+                                codegenArgument.setValue(optionValue);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        })
+                        .collect(Collectors.toList());
+
+                Generate generateCommand = (Generate) commandObject;
+                generateCommand.setCodegenArguments(codegenArguments);
+            }
+
             if(commandObject instanceof Runnable) {
                 new Thread(((Runnable) commandObject)).start();
             }
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
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.codegen.CLIHelper;
 import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.CodegenArgument;
 import io.swagger.codegen.DefaultGenerator;
 import io.swagger.codegen.config.CodegenConfigurator;
 import io.swagger.v3.core.util.Json;
@@ -73,6 +74,7 @@ public class Generate implements Runnable {
     protected String ignoreFileOverride;
     protected Boolean removeOperationIdPrefix;
     private String url;
+    private List<CodegenArgument> codegenArguments;
 
     public void setVerbose(Boolean verbose) {
         this.verbose = verbose;
@@ -202,6 +204,10 @@ public void setUrl(String url) {
         this.url = url;
     }
 
+    public void setCodegenArguments(List<CodegenArgument> codegenArguments) {
+        this.codegenArguments = codegenArguments;
+    }
+
     @Override
     public void run() {
 
@@ -309,6 +315,10 @@ public void run() {
             configurator.setRemoveOperationIdPrefix(removeOperationIdPrefix);
         }
 
+        if (codegenArguments != null && !codegenArguments.isEmpty()) {
+            configurator.setCodegenArguments(codegenArguments);
+        }
+
         applySystemPropertiesKvpList(systemProperties, configurator);
         applyInstantiationTypesKvpList(instantiationTypes, configurator);
         applyImportMappingsKvpList(importMappings, configurator);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenArgument.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenArgument.java
@@ -6,6 +6,8 @@ public class CodegenArgument {
     private String shortOption;
     private String description;
     private String type;
+    private String value;
+    private Boolean isArray = Boolean.FALSE;
 
     public String getOption() {
         return option;
@@ -58,4 +60,30 @@ public CodegenArgument type(String type) {
         this.type = type;
         return this;
     }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public CodegenArgument value(String value) {
+        this.value = value;
+        return this;
+    }
+
+    public Boolean getArray() {
+        return isArray;
+    }
+
+    public void setArray(Boolean array) {
+        isArray = array;
+    }
+
+    public CodegenArgument isArray(Boolean isArray) {
+        this.isArray = isArray;
+        return this;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
@@ -221,4 +221,6 @@ public interface CodegenConfig {
     void addHandlebarHelpers(Handlebars handlebars);
 
     List<CodegenArgument> getLanguageArguments();
+
+    void processArgumentsValiues(List<CodegenArgument> codegenArguments);
 }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -3169,6 +3169,10 @@ public List<CodegenArgument> getLanguageArguments() {
         return null;
     }
 
+    @Override
+    public void processArgumentsValiues(List<CodegenArgument> codegenArguments){
+    }
+
     /**
      * Only write if the file doesn't exist
      *
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
@@ -5,6 +5,7 @@
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.ClientOptInput;
 import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenArgument;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConfigLoader;
 import io.swagger.codegen.CodegenConstants;
@@ -61,6 +62,7 @@ public class CodegenConfigurator implements Serializable {
     private String artifactVersion;
     private String library;
     private String ignoreFileOverride;
+    private List<CodegenArgument> codegenArguments;
     private Map<String, String> systemProperties = new HashMap<String, String>();
     private Map<String, String> instantiationTypes = new HashMap<String, String>();
     private Map<String, String> typeMappings = new HashMap<String, String>();
@@ -414,6 +416,8 @@ public ClientOptInput toClientOptInput() {
         config.languageSpecificPrimitives().addAll(languageSpecificPrimitives);
         config.reservedWordsMappings().putAll(reservedWordMappings);
 
+        config.processArgumentsValiues(codegenArguments);
+
         checkAndSetAdditionalProperty(apiPackage, CodegenConstants.API_PACKAGE);
         checkAndSetAdditionalProperty(modelPackage, CodegenConstants.MODEL_PACKAGE);
         checkAndSetAdditionalProperty(invokerPackage, CodegenConstants.INVOKER_PACKAGE);
@@ -474,6 +478,8 @@ public ClientOptInput toClientOptInput(String content) {
         config.languageSpecificPrimitives().addAll(languageSpecificPrimitives);
         config.reservedWordsMappings().putAll(reservedWordMappings);
 
+        config.processArgumentsValiues(codegenArguments);
+
         checkAndSetAdditionalProperty(apiPackage, CodegenConstants.API_PACKAGE);
         checkAndSetAdditionalProperty(modelPackage, CodegenConstants.MODEL_PACKAGE);
         checkAndSetAdditionalProperty(invokerPackage, CodegenConstants.INVOKER_PACKAGE);
@@ -550,6 +556,10 @@ private void setVerboseFlags() {
         System.setProperty("debugSupportingFiles", "");
     }
 
+    public void setCodegenArguments(List<CodegenArgument> codegenArguments) {
+        this.codegenArguments = codegenArguments;
+    }
+
     private void setSystemProperties() {
         for (Map.Entry<String, String> entry : systemProperties.entrySet()) {
             System.setProperty(entry.getKey(), entry.getValue());
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJerseyServerCodegen.java
@@ -62,7 +62,7 @@ public JavaJerseyServerCodegen() {
     @Override
     public String getName()
     {
-        return "jaxrs"; // TODO should be renamed as "jaxrs-jersey"
+        return "jaxrs-jersey";
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -221,4 +221,6 @@ public interface CodegenConfig {`
`221`	`221`	`void addHandlebarHelpers(Handlebars handlebars);`
`222`	`222`
`223`	`223`	`List<CodegenArgument> getLanguageArguments();`
	`224`	`+`
	`225`	`+ void processArgumentsValiues(List<CodegenArgument> codegenArguments);`
`224`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3169,6 +3169,10 @@ public List<CodegenArgument> getLanguageArguments() {`
`3169`	`3169`	`return null;`
`3170`	`3170`	`}`
`3171`	`3171`
	`3172`	`+ @Override`
	`3173`	`+ public void processArgumentsValiues(List<CodegenArgument> codegenArguments){`
	`3174`	`+ }`
	`3175`	`+`
`3172`	`3176`	`/**`
`3173`	`3177`	`* Only write if the file doesn't exist`
`3174`	`3178`	`*`