diff --git a/bin/java-petstore-retrofit2.sh b/bin/java-petstore-retrofit2.sh
index 8cf9468c3a1..30cb805c3ec 100755
--- a/bin/java-petstore-retrofit2.sh
+++ b/bin/java-petstore-retrofit2.sh
@@ -26,6 +26,9 @@ 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 -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2 -DhideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2.json -o samples/client/petstore/java/retrofit2 -DhideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/retrofit2/src/main"
+rm -rf samples/client/petstore/java/retrofit2/src/main
+find samples/client/petstore/java/retrofit2 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/java-petstore-retrofit2rx.sh b/bin/java-petstore-retrofit2rx.sh
index af62352c03f..4b9c6512b10 100755
--- a/bin/java-petstore-retrofit2rx.sh
+++ b/bin/java-petstore-retrofit2rx.sh
@@ -26,6 +26,9 @@ 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 -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true,hideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx.json -o samples/client/petstore/java/retrofit2rx -DuseRxJava=true,hideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/retrofit2rx/src/main"
+rm -rf samples/client/petstore/java/retrofit2rx/src/main
+find samples/client/petstore/java/retrofit2rx -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index a4d62eece24..10052f1816c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -9,11 +9,17 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+{{^java8}}
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-
+{{/java8}}
+{{#java8}}
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+{{/java8}}
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 {{#useRxJava}}import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;{{/useRxJava}}
@@ -115,7 +121,12 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                {{^java8}}
                 .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                {{/java8}}
+                {{#java8}}
+                .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeTypeAdapter())
+                {{/java8}}
                 .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
@@ -355,7 +366,7 @@ class GsonCustomConverterFactory extends Converter.Factory
     }
 }
 
-
+{{^java8}}
 /**
  * Gson TypeAdapter for Joda DateTime type
  */
@@ -385,6 +396,9 @@ class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
     }
 }
 
+/**
+ * Gson TypeAdapter for Joda LocalDate type
+ */
 class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
 
     private final DateTimeFormatter formatter = ISODateTimeFormat.date();
@@ -409,4 +423,68 @@ class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
                 return formatter.parseLocalDate(date);
         }
     }
-}
\ No newline at end of file
+}
+{{/java8}}
+{{#java8}}
+/**
+ * Gson TypeAdapter for jsr310 OffsetDateTime type
+ */
+class OffsetDateTimeTypeAdapter extends TypeAdapter<OffsetDateTime> {
+
+    private final DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+    @Override
+    public void write(JsonWriter out, OffsetDateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.format(date));
+        }
+    }
+
+    @Override
+    public OffsetDateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                if (date.endsWith("+0000")) {
+                    date = date.substring(0, date.length()-5) + "Z";
+                }
+
+                return OffsetDateTime.parse(date, formatter);
+        }
+    }
+}
+
+/**
+ * Gson TypeAdapter for jsr310 LocalDate type
+ */
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE;
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.format(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return LocalDate.parse(date, formatter);
+        }
+    }
+}
+{{/java8}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index fd2e94b582e..353d70eafdc 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
 	apply plugin: 'java'
 	apply plugin: 'maven'
 
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
+    targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
 
 	install {
 	    repositories.mavenInstaller {
@@ -97,20 +97,28 @@ ext {
     oltu_version = "1.0.1"
     retrofit_version = "2.0.2"
     swagger_annotations_version = "1.5.8"
-    junit_version = "4.12"{{#useRxJava}}
-    rx_java_version = "1.1.3"{{/useRxJava}}
+    junit_version = "4.12"
+    {{#useRxJava}}
+    rx_java_version = "1.1.3"
+    {{/useRxJava}}
+    {{^java8}}
     jodatime_version = "2.9.3"
+    {{/java8}}
 }
 
 dependencies {
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"{{#useRxJava}}
+    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    {{#useRxJava}}
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
-    compile "io.reactivex:rxjava:$rx_java_version"{{/useRxJava}}
+    compile "io.reactivex:rxjava:$rx_java_version"
+    {{/useRxJava}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
+    {{^java8}}
     compile "joda-time:joda-time:$jodatime_version"
+    {{/java8}}
 
     testCompile "junit:junit:$junit_version"
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
index ff564803b44..ac9f49c1417 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache
@@ -11,12 +11,16 @@ lazy val root = (project in file(".")).
     libraryDependencies ++= Seq(
       "com.squareup.retrofit2" % "retrofit" % "2.0.2" % "compile",
       "com.squareup.retrofit2" % "converter-scalars" % "2.0.2" % "compile",
-      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",{{#useRxJava}}
+      "com.squareup.retrofit2" % "converter-gson" % "2.0.2" % "compile",
+      {{#useRxJava}}
       "com.squareup.retrofit2" % "adapter-rxjava" % "2.0.2" % "compile",
-      "io.reactivex" % "rxjava" % "1.1.3" % "compile",{{/useRxJava}}
+      "io.reactivex" % "rxjava" % "1.1.3" % "compile",
+      {{/useRxJava}}
       "io.swagger" % "swagger-annotations" % "1.5.8" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
+      {{^java8}}
       "joda-time" % "joda-time" % "2.9.3" % "compile",
+      {{/java8}}
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 2cc806ebbd3..eee3aa05802 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -95,15 +95,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -132,11 +123,14 @@
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
     </dependency>
+    {{^java8}}
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
       <version>${jodatime-version}</version>
-    </dependency>{{#useRxJava}}
+    </dependency>
+    {{/java8}}
+    {{#useRxJava}}
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>
@@ -146,7 +140,8 @@
       <groupId>com.squareup.retrofit2</groupId>
       <artifactId>adapter-rxjava</artifactId>
       <version>${retrofit-version}</version>
-    </dependency>{{/useRxJava}}
+    </dependency>
+    {{/useRxJava}}
 
     <!-- test dependencies -->
     <dependency>
@@ -157,10 +152,17 @@
     </dependency>
   </dependencies>
   <properties>
+    <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.8</swagger-core-version>
-    <retrofit-version>2.0.2</retrofit-version>{{#useRxJava}}
-    <rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
+    <retrofit-version>2.0.2</retrofit-version>
+    {{#useRxJava}}
+    <rxjava-version>1.1.3</rxjava-version>
+    {{/useRxJava}}
+    {{^java8}}
     <jodatime-version>2.9.3</jodatime-version>
+    {{/java8}}
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore b/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
index 19d3377182e..c5fa491b4c5 100644
--- a/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
+++ b/samples/client/petstore/java/retrofit2/.swagger-codegen-ignore
@@ -14,7 +14,7 @@
 
 # You can recursively match patterns against a directory, file or extension with a double asterisk (**):
 #foo/**/qux
-# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/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:
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 26c32613c1f..ef0fdc18d8a 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -95,15 +95,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -147,6 +138,9 @@
     </dependency>
   </dependencies>
   <properties>
+    <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.8</swagger-core-version>
     <retrofit-version>2.0.2</retrofit-version>
     <jodatime-version>2.9.3</jodatime-version>
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index 97a6048f95f..69e14b0b52d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -13,7 +13,6 @@
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 
@@ -54,10 +53,10 @@ public ApiClient(String[] authNames) {
         this();
         for(String authName : authNames) { 
             Interceptor auth;
-            if (authName == "api_key") { 
-                auth = new ApiKeyAuth("header", "api_key");
-            } else if (authName == "petstore_auth") { 
+            if (authName == "petstore_auth") { 
                 auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+            } else if (authName == "api_key") { 
+                auth = new ApiKeyAuth("header", "api_key");
             } else {
                 throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
             }
@@ -354,7 +353,6 @@ public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] pa
     }
 }
 
-
 /**
  * Gson TypeAdapter for Joda DateTime type
  */
@@ -384,6 +382,9 @@ public DateTime read(JsonReader in) throws IOException {
     }
 }
 
+/**
+ * Gson TypeAdapter for Joda LocalDate type
+ */
 class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
 
     private final DateTimeFormatter formatter = ISODateTimeFormat.date();
@@ -408,4 +409,4 @@ public LocalDate read(JsonReader in) throws IOException {
                 return formatter.parseLocalDate(date);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
index 2a9b639511c..91bd85c1b33 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
@@ -9,8 +9,8 @@
 import okhttp3.RequestBody;
 
 import org.joda.time.LocalDate;
-import org.joda.time.DateTime;
 import java.math.BigDecimal;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
index dd39a864f06..ec9d67a7449 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java
@@ -9,8 +9,8 @@
 import okhttp3.RequestBody;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
index 8b554674623..bbaa0000f44 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/PetApiTest.java
@@ -4,7 +4,6 @@
 
 import io.swagger.client.ApiClient;
 import io.swagger.client.CollectionFormats.*;
-import io.swagger.client.api.*;
 import io.swagger.client.model.*;
 
 import java.io.BufferedWriter;
diff --git a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
index 4a8fd9a50bd..055039c407a 100644
--- a/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -9,8 +9,6 @@
 import java.lang.reflect.Field;
 import java.util.Map;
 
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.junit.*;
 
 import retrofit2.Response;
@@ -39,7 +37,7 @@ public void testPlaceOrder() throws Exception {
         assertEquals(order.getId(), fetched.getId());
         assertEquals(order.getPetId(), fetched.getPetId());
         assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+        assertEquals(order.getShipDate().toInstant(), fetched.getShipDate().toInstant());
     }
 
     @Test
@@ -60,7 +58,7 @@ private Order createOrder() {
         Order order = new Order();
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
-        order.setShipDate(DateTime.now());
+        order.setShipDate(org.joda.time.DateTime.now());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);
 
diff --git a/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore b/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
index 19d3377182e..c5fa491b4c5 100644
--- a/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
+++ b/samples/client/petstore/java/retrofit2rx/.swagger-codegen-ignore
@@ -14,7 +14,7 @@
 
 # You can recursively match patterns against a directory, file or extension with a double asterisk (**):
 #foo/**/qux
-# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/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:
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 322fd209415..d2049248533 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -95,15 +95,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -157,6 +148,9 @@
     </dependency>
   </dependencies>
   <properties>
+    <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.8</swagger-core-version>
     <retrofit-version>2.0.2</retrofit-version>
     <rxjava-version>1.1.3</rxjava-version>
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
index 0315ae62751..0255d7c0e91 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/ApiClient.java
@@ -13,7 +13,6 @@
 import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
-
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
@@ -54,10 +53,10 @@ public ApiClient(String[] authNames) {
         this();
         for(String authName : authNames) { 
             Interceptor auth;
-            if (authName == "api_key") { 
-                auth = new ApiKeyAuth("header", "api_key");
-            } else if (authName == "petstore_auth") { 
+            if (authName == "petstore_auth") { 
                 auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+            } else if (authName == "api_key") { 
+                auth = new ApiKeyAuth("header", "api_key");
             } else {
                 throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
             }
@@ -354,7 +353,6 @@ public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] pa
     }
 }
 
-
 /**
  * Gson TypeAdapter for Joda DateTime type
  */
@@ -384,6 +382,9 @@ public DateTime read(JsonReader in) throws IOException {
     }
 }
 
+/**
+ * Gson TypeAdapter for Joda LocalDate type
+ */
 class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
 
     private final DateTimeFormatter formatter = ISODateTimeFormat.date();
@@ -408,4 +409,4 @@ public LocalDate read(JsonReader in) throws IOException {
                 return formatter.parseLocalDate(date);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
index 0276255f68b..5e0511922fb 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
@@ -9,8 +9,8 @@
 import okhttp3.RequestBody;
 
 import org.joda.time.LocalDate;
-import org.joda.time.DateTime;
 import java.math.BigDecimal;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
index 304ea7a29a8..4a2e64b726e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
@@ -9,8 +9,8 @@
 import okhttp3.RequestBody;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
index 62f1b194766..e034257911c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/test/java/io/swagger/client/api/StoreApiTest.java
@@ -6,12 +6,8 @@
 import java.lang.reflect.Field;
 import java.util.Map;
 
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.junit.*;
 
-import retrofit2.Response;
-
 import static org.junit.Assert.*;
 
 public class StoreApiTest {
@@ -43,7 +39,7 @@ public void onNext(Order fetched) {
                 assertEquals(order.getId(), fetched.getId());
                 assertEquals(order.getPetId(), fetched.getPetId());
                 assertEquals(order.getQuantity(), fetched.getQuantity());
-                assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
+                assertEquals(order.getShipDate().toInstant(), fetched.getShipDate().toInstant());
             }
         });
     }
@@ -81,7 +77,7 @@ private Order createOrder() {
         Order order = new Order();
         order.setPetId(new Long(200));
         order.setQuantity(new Integer(13));
-        order.setShipDate(DateTime.now());
+        order.setShipDate(org.joda.time.DateTime.now());
         order.setStatus(Order.StatusEnum.PLACED);
         order.setComplete(true);