update retrofit2 dep (#5820)

.gitignore

@@ -73,6 +73,7 @@ samples/client/petstore/java/okhttp-gson/build/
 samples/client/petstore/java/feign/build/
 samples/client/petstore/java/retrofit/build/
 samples/client/petstore/java/retrofit2/build/
+samples/client/petstore/java/retrofit2/hello.txt
 samples/client/petstore/java/retrofit2rx/build/
 samples/client/petstore/java/default/build/
 samples/client/petstore/scala/build/

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api.mustache

@@ -2,9 +2,15 @@ package {{package}};
 
 import {{invokerPackage}}.CollectionFormats.*;
 
-{{#useRxJava}}import rx.Observable;{{/useRxJava}}
+{{#useRxJava}}
-{{#useRxJava2}}import io.reactivex.Observable;{{/useRxJava2}}
+import rx.Observable;
-{{#doNotUseRx}}import retrofit2.Call;{{/doNotUseRx}}
+{{/useRxJava}}
+{{#useRxJava2}}
+import io.reactivex.Observable;
+{{/useRxJava2}}
+{{#doNotUseRx}}
+import retrofit2.Call;
+{{/doNotUseRx}}
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/api_test.mustache

@@ -25,7 +25,8 @@ public class {{classname}}Test {
         api = new ApiClient().createService({{classname}}.class);
     }
 
-    {{#operations}}{{#operation}}
+    {{#operations}}
+    {{#operation}}
     /**
      * {{summary}}
      *
@@ -40,5 +41,6 @@ public class {{classname}}Test {
 
         // TODO: test validations
     }
-    {{/operation}}{{/operations}}
+    {{/operation}}
+    {{/operations}}
 }

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

@@ -102,26 +102,26 @@ if(hasProperty('target') && target == 'android') {
 ext {
     oltu_version = "1.0.1"
     {{^usePlay24WS}}
-    retrofit_version = "2.2.0"
+    retrofit_version = "2.3.0"
     {{/usePlay24WS}}
     {{#usePlay24WS}}
     retrofit_version = "2.1.0"
     jackson_version = "2.7.5"
     play_version = "2.4.11"
     {{/usePlay24WS}}
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.13"
     junit_version = "4.12"
     {{#useRxJava}}
-    rx_java_version = "1.2.9"
+    rx_java_version = "1.3.0"
     {{/useRxJava}}
     {{#useRxJava2}}
-    rx_java_version = "2.0.7"
+    rx_java_version = "2.1.0"
     {{/useRxJava2}}
     {{#joda}}
-    jodatime_version = "2.9.4"
+    jodatime_version = "2.9.9"
     {{/joda}}
     {{#threetenbp}}
-    threetenbp_version = "1.3.2"
+    threetenbp_version = "1.3.5"
     {{/threetenbp}}
 }
 
@@ -140,10 +140,10 @@ dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     {{#joda}}
-    compile 'joda-time:joda-time:$jodatime_version'
+    compile "joda-time:joda-time:$jodatime_version"
     {{/joda}}
     {{#threetenbp}}
-    compile 'org.threeten:threetenbp:$threetenbp_version'
+    compile "org.threeten:threetenbp:$threetenbp_version"
     {{/threetenbp}}
     {{#usePlay24WS}}
     compile "com.typesafe.play:play-java-ws_2.11:$play_version"

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache

@@ -10,7 +10,7 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       {{^usePlay24WS}}
-      "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
       {{/usePlay24WS}}
@@ -25,20 +25,20 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
       {{/usePlay24WS}}
       {{#useRxJava}}
-      "com.squareup.retrofit2" % "adapter-rxjava" % "{{^usePlay24WS}}2.2.0{{/usePlay24WS}}{{#usePlay24WS}}2.1.0{{/usePlay24WS}}" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava" % "{{^usePlay24WS}}2.3.0{{/usePlay24WS}}{{#usePlay24WS}}2.1.0{{/usePlay24WS}}" % "compile",
-      "io.reactivex" % "rxjava" % "1.2.9" % "compile",
+      "io.reactivex" % "rxjava" % "1.3.0" % "compile",
       {{/useRxJava}}
       {{#useRxJava2}}
       "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
-      "io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile",
+      "io.reactivex.rxjava2" % "rxjava" % "2.1.0" % "compile",
       {{/useRxJava2}}
       "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       {{#joda}}
-      "joda-time" % "joda-time" % "2.9.4" % "compile",
+      "joda-time" % "joda-time" % "2.9.9" % "compile",
       {{/joda}}
       {{#threetenbp}}
-      "org.threeten" % "threetenbp" % "1.3.2" % "compile",
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
       {{/threetenbp}}
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"

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

@@ -280,23 +280,23 @@
     <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.13</swagger-core-version>
     {{#usePlay24WS}}
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
     {{/usePlay24WS}}
-    <retrofit-version>2.2.0</retrofit-version>
+    <retrofit-version>2.3.0</retrofit-version>
     {{#useRxJava}}
-    <rxjava-version>1.2.9</rxjava-version>
+    <rxjava-version>1.3.0</rxjava-version>
     {{/useRxJava}}
     {{#useRxJava2}}
-    <rxjava-version>2.0.7</rxjava-version>
+    <rxjava-version>2.1.0</rxjava-version>
     {{/useRxJava2}}
     {{#joda}}
-    <jodatime-version>2.9.3</jodatime-version>
+    <jodatime-version>2.9.9</jodatime-version>
     {{/joda}}
     {{#threetenbp}}
-    <threetenbp-version>1.3.2</threetenbp-version>
+    <threetenbp-version>1.3.5</threetenbp-version>
     {{/threetenbp}}
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>

samples/client/petstore/java/retrofit2-play24/build.gradle

@@ -98,9 +98,9 @@ ext {
     retrofit_version = "2.1.0"
     jackson_version = "2.7.5"
     play_version = "2.4.11"
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.13"
     junit_version = "4.12"
-    threetenbp_version = "1.3.2"
+    threetenbp_version = "1.3.5"
 }
 
 dependencies {
@@ -109,7 +109,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
-    compile 'org.threeten:threetenbp:$threetenbp_version'
+    compile "org.threeten:threetenbp:$threetenbp_version"
     compile "com.typesafe.play:play-java-ws_2.11:$play_version"
     compile "com.squareup.retrofit2:converter-jackson:$retrofit_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"

samples/client/petstore/java/retrofit2-play24/build.sbt

@@ -19,7 +19,7 @@ lazy val root = (project in file(".")).
       "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.3.2" % "compile",
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )

samples/client/petstore/java/retrofit2-play24/pom.xml

@@ -245,11 +245,11 @@
     <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.13</swagger-core-version>
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
-    <retrofit-version>2.2.0</retrofit-version>
+    <retrofit-version>2.3.0</retrofit-version>
-    <threetenbp-version>1.3.2</threetenbp-version>
+    <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>
   </properties>

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/FakeApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/PetApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/StoreApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/api/UserApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2/build.gradle

@@ -95,10 +95,10 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     oltu_version = "1.0.1"
-    retrofit_version = "2.2.0"
+    retrofit_version = "2.3.0"
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.13"
     junit_version = "4.12"
-    threetenbp_version = "1.3.2"
+    threetenbp_version = "1.3.5"
 }
 
 dependencies {
@@ -107,7 +107,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
-    compile 'org.threeten:threetenbp:$threetenbp_version'
+    compile "org.threeten:threetenbp:$threetenbp_version"
 
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/retrofit2/build.sbt

@@ -9,12 +9,12 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.3.2" % "compile",
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )

samples/client/petstore/java/retrofit2/pom.xml

@@ -214,9 +214,9 @@
     <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.13</swagger-core-version>
-    <retrofit-version>2.2.0</retrofit-version>
+    <retrofit-version>2.3.0</retrofit-version>
-    <threetenbp-version>1.3.2</threetenbp-version>
+    <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>
   </properties>

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java

@@ -2,8 +2,6 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
-
 import retrofit2.Call;
 import retrofit2.http.*;
 

samples/client/petstore/java/retrofit2rx/build.gradle

@@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     oltu_version = "1.0.1"
-    retrofit_version = "2.2.0"
+    retrofit_version = "2.3.0"
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.13"
     junit_version = "4.12"
-    rx_java_version = "1.2.9"
+    rx_java_version = "1.3.0"
-    threetenbp_version = "1.3.2"
+    threetenbp_version = "1.3.5"
 }
 
 dependencies {
@@ -110,7 +110,7 @@ dependencies {
     compile "io.reactivex:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
-    compile 'org.threeten:threetenbp:$threetenbp_version'
+    compile "org.threeten:threetenbp:$threetenbp_version"
 
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/retrofit2rx/build.sbt

@@ -9,14 +9,14 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
-      "com.squareup.retrofit2" % "adapter-rxjava" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
-      "io.reactivex" % "rxjava" % "1.2.9" % "compile",
+      "io.reactivex" % "rxjava" % "1.3.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.3.2" % "compile",
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )

samples/client/petstore/java/retrofit2rx/pom.xml

@@ -224,10 +224,10 @@
     <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.13</swagger-core-version>
-    <retrofit-version>2.2.0</retrofit-version>
+    <retrofit-version>2.3.0</retrofit-version>
-    <rxjava-version>1.2.9</rxjava-version>
+    <rxjava-version>1.3.0</rxjava-version>
-    <threetenbp-version>1.3.2</threetenbp-version>
+    <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>
   </properties>

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java

@@ -3,8 +3,6 @@ package io.swagger.client.api;
 import io.swagger.client.CollectionFormats.*;
 
 import rx.Observable;
-
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -3,8 +3,6 @@ package io.swagger.client.api;
 import io.swagger.client.CollectionFormats.*;
 
 import rx.Observable;
-
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java

@@ -3,8 +3,6 @@ package io.swagger.client.api;
 import io.swagger.client.CollectionFormats.*;
 
 import rx.Observable;
-
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java

@@ -3,8 +3,6 @@ package io.swagger.client.api;
 import io.swagger.client.CollectionFormats.*;
 
 import rx.Observable;
-
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java

@@ -3,8 +3,6 @@ package io.swagger.client.api;
 import io.swagger.client.CollectionFormats.*;
 
 import rx.Observable;
-
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/build.gradle

@@ -95,11 +95,11 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     oltu_version = "1.0.1"
-    retrofit_version = "2.2.0"
+    retrofit_version = "2.3.0"
-    swagger_annotations_version = "1.5.12"
+    swagger_annotations_version = "1.5.13"
     junit_version = "4.12"
-    rx_java_version = "2.0.7"
+    rx_java_version = "2.1.0"
-    threetenbp_version = "1.3.2"
+    threetenbp_version = "1.3.5"
 }
 
 dependencies {
@@ -110,7 +110,7 @@ dependencies {
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
-    compile 'org.threeten:threetenbp:$threetenbp_version'
+    compile "org.threeten:threetenbp:$threetenbp_version"
 
     testCompile "junit:junit:$junit_version"
 }

samples/client/petstore/java/retrofit2rx2/build.sbt

@@ -9,14 +9,14 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
+      "com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
       "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
       "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
-      "io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile",
+      "io.reactivex.rxjava2" % "rxjava" % "2.1.0" % "compile",
       "io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
-      "org.threeten" % "threetenbp" % "1.3.2" % "compile",
+      "org.threeten" % "threetenbp" % "1.3.5" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )

samples/client/petstore/java/retrofit2rx2/pom.xml

@@ -224,10 +224,10 @@
     <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.13</swagger-core-version>
-    <retrofit-version>2.2.0</retrofit-version>
+    <retrofit-version>2.3.0</retrofit-version>
-    <rxjava-version>2.0.7</rxjava-version>
+    <rxjava-version>2.1.0</rxjava-version>
-    <threetenbp-version>1.3.2</threetenbp-version>
+    <threetenbp-version>1.3.5</threetenbp-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>
   </properties>

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java

@@ -2,9 +2,7 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
 import io.reactivex.Observable;
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

@@ -2,9 +2,7 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
 import io.reactivex.Observable;
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java

@@ -2,9 +2,7 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
 import io.reactivex.Observable;
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java

@@ -2,9 +2,7 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
 import io.reactivex.Observable;
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java

@@ -2,9 +2,7 @@ package io.swagger.client.api;
 
 import io.swagger.client.CollectionFormats.*;
 
-
 import io.reactivex.Observable;
-
 import retrofit2.http.*;
 
 import okhttp3.RequestBody;

samples/client/petstore/java/retrofit2rx2/src/test/java/io/swagger/client/api/FakeApiTest.java

@@ -3,8 +3,9 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 import java.math.BigDecimal;
 import io.swagger.client.model.Client;
-import org.joda.time.DateTime;
+import org.threeten.bp.LocalDate;
-import org.joda.time.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import io.swagger.client.model.OuterComposite;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -25,7 +26,54 @@ public class FakeApiTest {
         api = new ApiClient().createService(FakeApi.class);
     }
 
+    /**
+     * 
+     *
+     * Test serialization of outer boolean types
+     */
+    @Test
+    public void fakeOuterBooleanSerializeTest() {
+        Boolean body = null;
+        // Boolean response = api.fakeOuterBooleanSerialize(body);
 
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of object with outer number type
+     */
+    @Test
+    public void fakeOuterCompositeSerializeTest() {
+        OuterComposite body = null;
+        // OuterComposite response = api.fakeOuterCompositeSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of outer number types
+     */
+    @Test
+    public void fakeOuterNumberSerializeTest() {
+        BigDecimal body = null;
+        // BigDecimal response = api.fakeOuterNumberSerialize(body);
+
+        // TODO: test validations
+    }
+    /**
+     * 
+     *
+     * Test serialization of outer string types
+     */
+    @Test
+    public void fakeOuterStringSerializeTest() {
+        String body = null;
+        // String response = api.fakeOuterStringSerialize(body);
+
+        // TODO: test validations
+    }
     /**
      * To test \"client\" model
      *
@@ -38,7 +86,6 @@ public class FakeApiTest {
 
         // TODO: test validations
     }
-    
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      *
@@ -57,14 +104,13 @@ public class FakeApiTest {
         String string = null;
         byte[] binary = null;
         LocalDate date = null;
-        DateTime dateTime = null;
+        OffsetDateTime dateTime = null;
         String password = null;
         String paramCallback = null;
         // Void response = api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
 
         // TODO: test validations
     }
-    
     /**
      * To test enum parameters
      *
@@ -84,5 +130,17 @@ public class FakeApiTest {
 
         // TODO: test validations
     }
+    /**
+     * test json serialization of form data
+     *
+     * 
+     */
+    @Test
+    public void testJsonFormDataTest() {
+        String param = null;
+        String param2 = null;
+        // Void response = api.testJsonFormData(param, param2);
 
+        // TODO: test validations
+    }
 }