Merge remote-tracking branch 'origin/master' into patch-11

Author: jmini

src/main/java/io/swagger/codegen/languages/java/JavaInflectorServerCodegen.java

@@ -1,6 +1,7 @@
 package io.swagger.codegen.languages.java;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import io.swagger.codegen.CodegenArgument;
 import io.swagger.codegen.CodegenConstants;
 import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
@@ -39,12 +40,11 @@ public JavaInflectorServerCodegen() {
         artifactId = "swagger-inflector-server";
         dateLibrary = "legacy"; //TODO: add joda support
 
-        // todo: remove when system properties are removed
-        System.setProperty(CodegenConstants.MODEL_DOCS, Boolean.FALSE.toString());
-        System.setProperty(CodegenConstants.API_DOCS, Boolean.FALSE.toString());
-        System.setProperty(CodegenConstants.MODEL_TESTS, Boolean.FALSE.toString());
-        System.setProperty(CodegenConstants.API_TESTS, Boolean.FALSE.toString());
-
+        // clear model and api doc template as this codegen
+        // does not support auto-generated markdown doc at the moment
+        //TODO: add doc templates
+        modelDocTemplateFiles.remove("model_doc.mustache");
+        apiDocTemplateFiles.remove("api_doc.mustache");
 
         apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.controllers");
         modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
@@ -79,13 +79,6 @@ public void processOpts() {
         } else {
             embeddedTemplateDir = templateDir = String.format("%s/JavaInflector", DEFAULT_TEMPLATE_VERSION);
         }
-
-        // clear model and api doc template as this codegen
-        // does not support auto-generated markdown doc at the moment
-        //TODO: add doc templates
-        modelDocTemplateFiles.remove("model_doc.mustache");
-        apiDocTemplateFiles.remove("api_doc.mustache");
-
         writeOptional(outputFolder, new SupportingFile("pom.mustache", "", "pom.xml"));
         writeOptional(outputFolder, new SupportingFile("README.mustache", "", "README.md"));
         writeOptional(outputFolder, new SupportingFile("web.mustache", "src/main/webapp/WEB-INF", "web.xml"));
@@ -204,6 +197,42 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
         return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase());
     }
 
+    @Override
+    public void setLanguageArguments(List<CodegenArgument> languageArguments) {
+        if (languageArguments == null) {
+            languageArguments = new ArrayList<>();
+        }
+        if (!languageArguments.stream()
+                .anyMatch(codegenArgument -> CodegenConstants.MODEL_DOCS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
+            languageArguments.add(new CodegenArgument()
+                    .option(CodegenConstants.MODEL_DOCS_OPTION)
+                    .type("boolean")
+                    .value(Boolean.FALSE.toString()));
+        }
+        if (!languageArguments.stream()
+                .anyMatch(codegenArgument -> CodegenConstants.API_DOCS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
+            languageArguments.add(new CodegenArgument()
+                    .option(CodegenConstants.API_DOCS_OPTION)
+                    .type("boolean")
+                    .value(Boolean.FALSE.toString()));
+        }
+        if (!languageArguments.stream()
+                .anyMatch(codegenArgument -> CodegenConstants.MODEL_TESTS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
+            languageArguments.add(new CodegenArgument()
+                    .option(CodegenConstants.MODEL_TESTS_OPTION)
+                    .type("boolean")
+                    .value(Boolean.FALSE.toString()));
+        }
+        if (!languageArguments.stream()
+                .anyMatch(codegenArgument -> CodegenConstants.API_TESTS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
+            languageArguments.add(new CodegenArgument()
+                    .option(CodegenConstants.API_TESTS_OPTION)
+                    .type("boolean")
+                    .value(Boolean.FALSE.toString()));
+        }
+        super.setLanguageArguments(languageArguments);
+    }
+
     public String apiFilename(String templateName, String tag) {
         String result = super.apiFilename(templateName, tag);
 

src/main/resources/arguments/inflector.yaml

@@ -0,0 +1,13 @@
+arguments:
+  - option: "--model-docs"
+    description: "generate models documentation."
+    type: "boolean"
+  - option: "--api-docs"
+    description: "generate apis documentation."
+    type: "boolean"
+  - option: "--model-tests"
+    description: "generate model tests."
+    type: "boolean"
+  - option: "--api-tests"
+    description: "generate apis tests."
+    type: "boolean"