add joda support to retrofit clients and use it in samples

also adds back the petstore tests

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

@@ -9,6 +9,10 @@ import java.util.Map;
 
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder;
 import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
+import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
 
 import retrofit2.Converter;
 import retrofit2.Retrofit;
@@ -19,6 +23,9 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
@@ -108,6 +115,8 @@ public class ApiClient {
    public void createDefaultAdapter() {
         Gson gson = new GsonBuilder()
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(DateTime.class, new DateTimeTypeAdapter())
+                .registerTypeAdapter(LocalDate.class, new LocalDateTypeAdapter())
                 .create();
 
         okClient = new OkHttpClient();
@@ -346,3 +355,58 @@ class GsonCustomConverterFactory extends Converter.Factory
     }
 }
 
+
+/**
+ * Gson TypeAdapter for Joda DateTime type
+ */
+class DateTimeTypeAdapter extends TypeAdapter<DateTime> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.dateTime();
+
+    @Override
+    public void write(JsonWriter out, DateTime date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public DateTime read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseDateTime(date);
+        }
+    }
+}
+
+class LocalDateTypeAdapter extends TypeAdapter<LocalDate> {
+
+    private final DateTimeFormatter formatter = ISODateTimeFormat.date();
+
+    @Override
+    public void write(JsonWriter out, LocalDate date) throws IOException {
+        if (date == null) {
+            out.nullValue();
+        } else {
+            out.value(formatter.print(date));
+        }
+    }
+
+    @Override
+    public LocalDate read(JsonReader in) throws IOException {
+        switch (in.peek()) {
+            case NULL:
+                in.nextNull();
+                return null;
+            default:
+                String date = in.nextString();
+                return formatter.parseLocalDate(date);
+        }
+    }
+}

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

@@ -97,25 +97,20 @@ 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}}
-{{^useRxJava}}{{/useRxJava}}
+    junit_version = "4.12"{{#useRxJava}}
+    rx_java_version = "1.1.3"{{/useRxJava}}
+    jodatime_version = "2.9.3"
 }
 
 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}}
-{{^useRxJava}}{{/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"
+    compile "joda-time:joda-time:$jodatime_version"
 
     testCompile "junit:junit:$junit_version"
 }

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

@@ -11,13 +11,12 @@ 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",
+      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "junit" % "junit" % "4.12" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test"
     )

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

@@ -131,6 +131,11 @@
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>${jodatime-version}</version>
     </dependency>{{#useRxJava}}
     <dependency>
       <groupId>io.reactivex</groupId>
@@ -153,9 +158,9 @@
   </dependencies>
   <properties>
     <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}}
-    <okhttp-version>3.2.0</okhttp-version>
+    <retrofit-version>2.0.2</retrofit-version>{{#useRxJava}}
+    <rxjava-version>1.1.3</rxjava-version>{{/useRxJava}}
+    <jodatime-version>2.9.3</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <junit-version>4.12</junit-version>