Added new option to define spring5 for resttemplate

Author: e507804

bin/java-petstore-all.sh

@@ -14,6 +14,7 @@
 ./bin/java-petstore-retrofit2-play24.sh
 ./bin/java-petstore-jersey2-java6.sh
 ./bin/java-petstore-resttemplate.sh
+./bin/java-petstore-resttemplate-spring5.sh
 ./bin/java-petstore-resttemplate-withxml.sh
 ./bin/java-petstore-resteasy.sh
 ./bin/java-petstore-google-api-client.sh

bin/java-petstore-resttemplate-spring5.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+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 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml --artifact-id swagger-pestore-resttemplate-spring5 -l java -c bin/java-petstore-resttemplate.json -o samples/client/petstore/java/resttemplate-spring5 -DhideGenerationTimestamp=true,spring5=true"
+
+echo "Removing files and folders under samples/client/petstore/java/resttemplate/src/main"
+rm -rf samples/client/petstore/java/resttemplate-spring5/src/main
+find samples/client/petstore/java/resttemplate-spring5 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen-maven-plugin/README.md

@@ -63,7 +63,8 @@ mvn clean compile
 
 ### Custom Generator
 
-Specifying a custom generator is a bit different. It doesn't support the classpath:/ syntax, but it does support the fully qualified name of the package. You can also specify your custom templates, which also get pulled in. Notice the dependency on a project, in the plugin scope. That would be your generator/template jar.
+Specifying a custom generator is a bit different. It doesn't support the classpath:/ syntax, but it does support the fully qualified name of the package. You can also specify your custom templates, whi
+ch also get pulled in. Notice the dependency on a project, in the plugin scope. That would be your generator/template jar.
 
 ```xml
 <plugin>

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -37,6 +37,8 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String PLAY_24 = "play24";
     public static final String PLAY_25 = "play25";
 
+    public static final String SPRING_5 = "spring5";
+
     public static final String RETROFIT_1 = "retrofit";
     public static final String RETROFIT_2 = "retrofit2";
     public static final String REST_ASSURED = "rest-assured";
@@ -52,6 +54,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     protected boolean performBeanValidation = false;
     protected boolean useGzipFeature = false;
     protected boolean useRuntimeException = false;
+    protected boolean useSpring5 = false;
 
 
     public JavaClientCodegen() {
@@ -73,14 +76,15 @@ public JavaClientCodegen() {
         cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
         cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
+        cliOptions.add(CliOption.newBoolean(SPRING_5, "Spring version. Default is 4, if the flag is set, Spring 5 is used. Currently only used with Resttemplate"));
 
         supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
         supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
-        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9. Using -Dspring5=true uses Spring 5.1.5 and Jackson 2.9.4");
         supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("vertx", "HTTP client: VertX client 3.2.4. JSON processing: Jackson 2.8.9");
         supportedLibraries.put("google-api-client", "HTTP client: Google API client 1.23.0. JSON processing: Jackson 2.8.9");
@@ -157,6 +161,10 @@ public void processOpts() {
             this.setUseRuntimeException(convertPropertyToBooleanAndWriteBack(USE_RUNTIME_EXCEPTION));
         }
 
+        if(additionalProperties.containsKey(SPRING_5)) {
+            this.setUseSpring5(Boolean.valueOf(additionalProperties.get(SPRING_5).toString()));
+        }
+
         final String invokerFolder = (sourceFolder + '/' + invokerPackage).replace(".", "/");
         final String authFolder = (sourceFolder + '/' + invokerPackage + ".auth").replace(".", "/");
         final String apiFolder = (sourceFolder + '/' + apiPackage).replace(".", "/");
@@ -611,4 +619,7 @@ static boolean isJsonVendorMimeType(String mime) {
         return mime != null && JSON_VENDOR_MIME_PATTERN.matcher(mime).matches();
     }
 
+    public void setUseSpring5(boolean useSpring5) {
+        this.useSpring5 = useSpring5;
+    }
 }

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache

@@ -60,7 +60,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TimeZone;
-import java.util.stream.IntStream;
 
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
@@ -336,6 +335,9 @@ public class ApiClient {
 
     /**
      * Parse the given string into Date object.
+     *
+     * @param str Date
+     * @return Date in string format
      */
     public Date parseDate(String str) {
         try {
@@ -347,6 +349,9 @@ public class ApiClient {
 
     /**
      * Format the given Date object into string.
+     *
+     * @param date Date
+     * @return Date in string format
      */
     public String formatDate(Date date) {
         return dateFormat.format(date);
@@ -527,24 +532,28 @@ public class ApiClient {
         updateParamsForAuth(authNames, queryParams, headerParams);
 
         Map<String, String> params = new HashMap<>();
-        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path).encode();
+        final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
 
         if (queryParams != null) {
             builder.queryParams(queryParams);
             LinkedMultiValueMap<String, String> keys = new LinkedMultiValueMap<>();
 
             for (Map.Entry<String, List<String>> e : queryParams.entrySet()) {
-                IntStream.range(0, e.getValue().size())
-                    .forEach(i -> {
-                        keys.add(e.getKey(), "{" + e.getKey() + i + "}");
-                        params.put(e.getKey() + i, e.getValue().get(i));
-                    });
+                for(int i = 0; i < e.getValue().size(); i++) {
+                    keys.add(e.getKey(), "{" + e.getKey() + i + "}");
+                    params.put(e.getKey() + i, e.getValue().get(i));
+                }
             }
 
             builder.queryParams(keys);
         }
-        
-        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.buildAndExpand(params).toUri());
+
+        {{#spring5}}
+        final BodyBuilder requestBuilder = RequestEntity.method(method, builder.encode().buildAndExpand(params).toUri());
+        {{/spring5}}
+        {{^spring5}}
+            final BodyBuilder requestBuilder = RequestEntity.method(method, builder.buildAndExpand(params).toUri());
+        {{/spring5}}
         if(accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

modules/swagger-codegen/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -217,6 +217,13 @@
             <artifactId>spring-web</artifactId>
             <version>${spring-web-version}</version>
         </dependency>
+        {{#spring5}}
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-web-version}</version>
+        </dependency>
+        {{/spring5}}
 
         <!-- JSON processing: jackson -->
         <dependency>
@@ -287,8 +294,14 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.17</swagger-annotations-version>
+        {{#spring5}}
+        <spring-web-version>5.1.5.RELEASE</spring-web-version>
+        <jackson-version>2.9.4</jackson-version>
+        {{/spring5}}
+        {{^spring5}}
         <spring-web-version>4.3.9.RELEASE</spring-web-version>
         <jackson-version>2.8.9</jackson-version>
+        {{/spring5}}
         {{#joda}}
         <jodatime-version>2.9.9</jodatime-version>
         {{/joda}}

modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaClientOptionsProvider.java

@@ -27,6 +27,7 @@ public Map<String, String> createOptions() {
         options.put(JavaClientCodegen.USE_GZIP_FEATURE, "false");
         options.put(JavaClientCodegen.USE_RUNTIME_EXCEPTION, "false");
         options.put(JavaClientCodegen.JAVA8_MODE, "false");
+        options.put(JavaClientCodegen.SPRING_5, "false");
         return options;
     }
 

pom.xml.circleci

@@ -836,6 +836,7 @@
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
+                <module>samples/client/petstore/java/resttemplate-spring5</module>
                 <module>samples/client/petstore/java/resttemplate-withXml</module>
                 <module>samples/client/petstore/java/vertx</module>
                 <module>samples/client/petstore/java/resteasy</module>

pom.xml.circleci.java7

@@ -836,6 +836,7 @@
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
+                <module>samples/client/petstore/java/resttemplate-spring5</module>
                 <module>samples/client/petstore/java/resttemplate-withXml</module>
                 <module>samples/client/petstore/java/vertx</module>
                 <module>samples/client/petstore/java/resteasy</module>

pom.xml.jenkins

@@ -878,6 +878,7 @@
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/jaxrs-cxf-client</module>
                 <module>samples/client/petstore/java/resttemplate</module>
+                <module>samples/client/petstore/java/resttemplate-spring5</module>
                 <module>samples/client/petstore/java/resttemplate-withXml</module>
                 <module>samples/client/petstore/java/vertx</module>
                 <module>samples/client/petstore/java/resteasy</module>

pom.xml.jenkins.java7

@@ -830,6 +830,7 @@
                 <module>samples/client/petstore/java/retrofit2</module>
                 <module>samples/client/petstore/java/retrofit2rx</module>
                 <module>samples/client/petstore/java/resttemplate</module>
+                <module>samples/client/petstore/java/resttemplate-spring5</module>
                 <module>samples/client/petstore/java/resttemplate-withXml</module>
                 <module>samples/client/petstore/java/google-api-client</module>
                 <module>samples/client/petstore/kotlin/</module>

samples/client/petstore/java/resttemplate-spring5/.gitignore

@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build

samples/client/petstore/java/resttemplate-spring5/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/java/resttemplate-spring5/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+2.4.5-SNAPSHOT

samples/client/petstore/java/resttemplate-spring5/.travis.yml

@@ -0,0 +1,17 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test