Merge branch 'master' into dart-double-cast

Author: HugoMario

.travis.yml

@@ -39,6 +39,10 @@ before_install:
   - gem install bundler -v '< 2'
   - gem update --system 2.7.8
   - gem --version
+  # install node version 10.x
+  - nvm install 10.22.0
+  - nvm use 10.22.0
+  # install typescript
   - npm install -g typescript
   - npm install -g npm
   - npm config set registry http://registry.npmjs.org/
@@ -64,7 +68,18 @@ before_install:
   - cat /etc/hosts
   # show java version
   - java -version
-
+  # show node version
+  - node -v
+  # show node executable
+  - which node
+  # show npm version
+  - npm -v
+  # show npm executable
+  - which npm
+  # show typescript version
+  - tsc -v
+  # show tsc executable
+  - which tsc
 install:
   # Add Godeps dependencies to GOPATH and PATH
   - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.4 bash)"

.whitesource

@@ -0,0 +1,15 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken": "",
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

README.md

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.15-SNAPSHOT</version>
+        <version>2.4.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-codegen-cli/pom.xml

@@ -123,6 +123,6 @@
         <jackson-version>2.10.1</jackson-version>
         <jodatime-version>2.7</jodatime-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.8.1</junit-version>
+        <junit-version>4.13.1</junit-version>
     </properties>
 </project>

modules/swagger-codegen-maven-plugin/examples/java-client.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.15-SNAPSHOT</version>
+        <version>2.4.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>

modules/swagger-codegen-maven-plugin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>2.4.15-SNAPSHOT</version>
+        <version>2.4.18-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-codegen/pom.xml

@@ -56,6 +56,14 @@ public class CodegenModel {
         allMandatory = mandatory;
     }
 
+    public boolean getIsInteger() {
+        return "Integer".equalsIgnoreCase(this.dataType);
+    }
+
+    public boolean getIsNumber() {
+        return "BigDecimal".equalsIgnoreCase(this.dataType);
+    }
+
     @Override
     public String toString() {
         return String.format("%s(%s)", name, classname);

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

@@ -11,6 +11,7 @@
 import java.util.regex.Pattern;
 
 import io.swagger.models.properties.UntypedProperty;
+import io.swagger.util.Yaml;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -293,8 +294,8 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
     }
 
     /**
-     * Returns the common prefix of variables for enum naming if 
-     * two or more variables are present
+     * Returns the common prefix of variables for enum naming if
+     * two or more variables are present.
      *
      * @param vars List of variable names
      * @return the common prefix for naming
@@ -347,7 +348,7 @@ public String toEnumDefaultValue(String value, String datatype) {
      * @return the sanitized value for enum
      */
     public String toEnumValue(String value, String datatype) {
-        if ("number".equalsIgnoreCase(datatype)) {
+        if (isPrimivite(datatype)) {
             return value;
         } else {
             return "\"" + escapeText(value) + "\"";
@@ -374,6 +375,12 @@ public String toEnumVarName(String value, String datatype) {
         }
     }
 
+    public boolean isPrimivite(String datatype) {
+        return "number".equalsIgnoreCase(datatype)
+                || "integer".equalsIgnoreCase(datatype)
+                || "boolean".equalsIgnoreCase(datatype);
+    }
+
     // override with any special post-processing
     @SuppressWarnings("static-method")
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
@@ -1500,6 +1507,10 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
                 properties.putAll(model.getProperties());
             }
 
+            if (composed.getRequired() != null) {
+                required.addAll(composed.getRequired());
+            }
+
             // child model (properties owned by the model itself)
             Model child = composed.getChild();
             if (child != null && child instanceof RefModel && allDefinitions != null) {
@@ -1525,6 +1536,9 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
                 // comment out below as allowableValues is not set in post processing model enum
                 m.allowableValues = new HashMap<String, Object>();
                 m.allowableValues.put("values", impl.getEnum());
+                if (m.dataType.equals("BigDecimal")) {
+                    addImport(m, "BigDecimal");
+                }
             }
             if (impl.getAdditionalProperties() != null) {
                 addAdditionPropertiesToCodeGenModel(m, impl);
@@ -2762,6 +2776,7 @@ public CodegenParameter fromParameter(Parameter param, Set<String> imports) {
                 p.isPrimitiveType = cp.isPrimitiveType;
                 p.isContainer = true;
                 p.isListContainer = true;
+                p.uniqueItems = impl.getUniqueItems() == null ? false : impl.getUniqueItems();
 
                 // set boolean flag (e.g. isString)
                 setParameterBooleanFlagWithCodegenProperty(p, cp);

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -261,6 +261,9 @@ protected void configureSwaggerInfo() {
         if (info.getTermsOfService() != null) {
             config.additionalProperties().put("termsOfService", config.escapeText(info.getTermsOfService()));
         }
+        if (info.getVendorExtensions() != null && !info.getVendorExtensions().isEmpty()) {
+            config.additionalProperties().put("info-extensions", info.getVendorExtensions());
+        }
     }
 
     protected void generateModelTests(List<File> files, Map<String, Object> models, String modelName) throws IOException {