Merge pull request #5858 from swagger-api/issue-5753

Update Swagger Codegen to v1.5.15
2017-06-26 14:20:20 -07:00 · 2017-06-26 14:20:20 -07:00 · 62c0f17f98
commit 62c0f17f98
parent 5fbb674cac 73df07d64c
32 changed files with 34 additions and 34 deletions
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@ -1123,8 +1123,6 @@ public class DefaultCodegen {
        String datatype = null;
        if (p instanceof StringProperty && "number".equals(p.getFormat())) {
            datatype = "BigDecimal";
-        } else if (p instanceof StringProperty) {
-            datatype = "string";
        } else if (p instanceof ByteArrayProperty) {
            datatype = "ByteArray";
        } else if (p instanceof BinaryProperty) {
@ -1163,6 +1161,8 @@ public class DefaultCodegen {
                datatype = "Object";
                LOGGER.error(e.getMessage(), e);
            }
+        } else if (p instanceof StringProperty) {
+            datatype = "string";
        } else {
            if (p != null) {
                datatype = p.getType();
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
@ -247,7 +247,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <feign-version>9.4.0</feign-version>
    <feign-form-version>2.1.0</feign-form-version>
    <jackson-version>2.8.7</jackson-version>
--- a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@ -119,7 +119,7 @@
    </repositories>
    <properties>
        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-inflector-version>1.0.11</swagger-inflector-version>
+        <swagger-inflector-version>1.0.14</swagger-inflector-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <logback-version>1.0.1</logback-version>
        <junit-version>4.8.2</junit-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
@ -178,7 +178,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@ -229,7 +229,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache
@ -191,7 +191,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey-version>1.19.1</jersey-version>
    <jackson-version>2.8.7</jackson-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@ -188,7 +188,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <jackson-version>2.8.7</jackson-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache
@ -174,7 +174,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@ -159,7 +159,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@ -9,7 +9,7 @@
        <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
        <maven.compiler.source>${java.version}</maven.compiler.source>
        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
    </properties>
    <parent>
        <groupId>org.springframework.boot</groupId>
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@ -75,7 +75,7 @@
    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/akka-scala/pom.mustache
@ -216,7 +216,7 @@
        <akka-version>2.3.9</akka-version>
        <joda-version>1.2</joda-version>
        <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <maven-plugin.version>1.0.0</maven-plugin.version>

        <junit-version>4.8.1</junit-version>
--- a/modules/swagger-codegen/src/main/resources/android/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/android/pom.mustache
@ -145,7 +145,7 @@
    </repository>
  </repositories>
  <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <gson-version>2.3.1</gson-version>
    <junit-version>4.8.1</junit-version>
    <maven-plugin-version>1.0.0</maven-plugin-version>
--- a/modules/swagger-codegen/src/main/resources/scala/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/scala/pom.mustache
@ -215,7 +215,7 @@
    <joda-version>1.2</joda-version>
    <joda-time-version>2.2</joda-time-version>
    <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jersey-async-version>1.0.5</jersey-async-version>
    <maven-plugin.version>1.0.0</maven-plugin.version>
    <jackson-version>2.4.2</jackson-version>
--- a/pom.xml
+++ b/pom.xml
@ -888,10 +888,10 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-parser-version>1.0.29</swagger-parser-version>
+        <swagger-parser-version>1.0.30</swagger-parser-version>
        <scala-version>2.11.1</scala-version>
        <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <commons-io-version>2.4</commons-io-version>
        <commons-cli-version>1.2</commons-cli-version>
        <junit-version>4.8.1</junit-version>
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@ -900,7 +900,7 @@
        <swagger-parser-version>1.0.28</swagger-parser-version>
        <scala-version>2.11.1</scala-version>
        <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <commons-io-version>2.4</commons-io-version>
        <commons-cli-version>1.2</commons-cli-version>
        <junit-version>4.8.1</junit-version>
--- a/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore-security-test/java/okhttp-gson/pom.xml
@ -206,7 +206,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <okhttp-version>2.7.5</okhttp-version>
    <gson-version>2.6.2</gson-version>
    <jodatime-version>2.9.3</jodatime-version>
--- a/samples/client/petstore-security-test/scala/pom.xml
+++ b/samples/client/petstore-security-test/scala/pom.xml
@ -215,7 +215,7 @@
    <joda-version>1.2</joda-version>
    <joda-time-version>2.2</joda-time-version>
    <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jersey-async-version>1.0.5</jersey-async-version>
    <maven-plugin.version>1.0.0</maven-plugin.version>
    <jackson-version>2.4.2</jackson-version>
--- a/samples/client/petstore/akka-scala/pom.xml
+++ b/samples/client/petstore/akka-scala/pom.xml
@ -216,7 +216,7 @@
        <akka-version>2.3.9</akka-version>
        <joda-version>1.2</joda-version>
        <joda-time-version>2.2</joda-time-version>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <maven-plugin.version>1.0.0</maven-plugin.version>

        <junit-version>4.8.1</junit-version>
--- a/samples/client/petstore/android/httpclient/pom.xml
+++ b/samples/client/petstore/android/httpclient/pom.xml
@ -145,7 +145,7 @@
    </repository>
  </repositories>
  <properties>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <gson-version>2.3.1</gson-version>
    <junit-version>4.8.1</junit-version>
    <maven-plugin-version>1.0.0</maven-plugin-version>
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@ -247,7 +247,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <feign-version>9.4.0</feign-version>
    <feign-form-version>2.1.0</feign-form-version>
    <jackson-version>2.8.7</jackson-version>
--- a/samples/client/petstore/jaxrs-cxf-client/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@ -184,7 +184,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/samples/client/petstore/jaxrs-cxf/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf/pom.xml
@ -162,7 +162,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/samples/client/petstore/scala/pom.xml
+++ b/samples/client/petstore/scala/pom.xml
@ -215,7 +215,7 @@
    <joda-version>1.2</joda-version>
    <joda-time-version>2.2</joda-time-version>
    <jersey-version>1.19</jersey-version>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jersey-async-version>1.0.5</jersey-async-version>
    <maven-plugin.version>1.0.0</maven-plugin.version>
    <jackson-version>2.4.2</jackson-version>
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@ -9,7 +9,7 @@
        <java.version>1.7</java.version>
        <maven.compiler.source>${java.version}</maven.compiler.source>
        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
    </properties>
    <parent>
        <groupId>org.springframework.boot</groupId>
--- a/samples/server/petstore/java-inflector/pom.xml
+++ b/samples/server/petstore/java-inflector/pom.xml
@ -111,7 +111,7 @@
    </repositories>
    <properties>
        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <swagger-inflector-version>1.0.4</swagger-inflector-version>
+        <swagger-inflector-version>1.0.14</swagger-inflector-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <logback-version>1.0.1</logback-version>
        <junit-version>4.8.2</junit-version>
--- a/samples/server/petstore/java-msf4j/pom.xml
+++ b/samples/server/petstore/java-msf4j/pom.xml
@ -92,7 +92,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@ -184,7 +184,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <junit-version>4.12</junit-version>
--- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml
@ -163,7 +163,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
+++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml
@ -158,7 +158,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-core-version>1.5.12</swagger-core-version>
+        <swagger-core-version>1.5.15</swagger-core-version>
        <jetty-version>9.2.9.v20150224</jetty-version>
        <resteasy-version>3.0.11.Final</resteasy-version>
        <slf4j-version>1.6.3</slf4j-version>
--- a/samples/server/petstore/jaxrs/jersey1/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey1/pom.xml
@ -189,7 +189,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey-version>1.19.1</jersey-version>
    <jackson-version>2.8.7</jackson-version>
--- a/samples/server/petstore/jaxrs/jersey2/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey2/pom.xml
@ -173,7 +173,7 @@
    <java.version>1.7</java.version>
    <maven.compiler.source>${java.version}</maven.compiler.source>
    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <swagger-core-version>1.5.12</swagger-core-version>
+    <swagger-core-version>1.5.15</swagger-core-version>
    <jetty-version>9.2.9.v20150224</jetty-version>
    <jersey2-version>2.22.2</jersey2-version>
    <jackson-version>2.8.7</jackson-version>