diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
index c41dc9ba1aa..89fca2613b9 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
@@ -14,7 +14,7 @@ import java.lang.reflect.WildcardType;
 public class Play24CallAdapterFactory extends CallAdapter.Factory {
 
     @Override
-    public CallAdapter<?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
+    public CallAdapter<?, ?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
         if (!(returnType instanceof ParameterizedType)) {
             return null;
         }
@@ -41,7 +41,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
         return paramType;
     }
 
-    private CallAdapter<F.Promise<?>> createAdapter(ParameterizedType returnType) {
+    private CallAdapter<?, F.Promise<?>> createAdapter(ParameterizedType returnType) {
         Type parameterType = getTypeParam(returnType);
         return new ValueAdapter(parameterType);
     }
@@ -49,7 +49,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
     /**
      * Adpater that coverts values returned by API interface into Play promises
      */
-    static final class ValueAdapter implements CallAdapter<F.Promise<?>> {
+    static final class ValueAdapter<R> implements CallAdapter<R, F.Promise<R>> {
 
         private final Type responseType;
 
@@ -63,7 +63,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
         }
 
         @Override
-        public <R> F.Promise<R> adapt(final Call<R> call) {
+        public F.Promise<R> adapt(final Call<R> call) {
             final F.RedeemablePromise<R> promise = F.RedeemablePromise.empty();
 
             call.enqueue(new Callback<R>() {
diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
index 2a8dce8329e..62df91f7983 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
@@ -196,6 +196,11 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         public void cancel() {
             throw new UnsupportedOperationException("Not supported");
         }
+        
+        @Override
+        public PlayWSCall clone() {
+            throw new UnsupportedOperationException("Not supported");
+        }
 
         @Override
         public boolean isExecuted() {
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 ab8a6662261..2bcbdd3fa11 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
@@ -275,13 +275,10 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.12</swagger-core-version>
     {{#usePlay24WS}}
-    <retrofit-version>2.1.0</retrofit-version>
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
     {{/usePlay24WS}}
-    {{^usePlay24WS}}
     <retrofit-version>2.2.0</retrofit-version>
-    {{/usePlay24WS}}
     {{#useRxJava}}
     <rxjava-version>1.2.9</rxjava-version>
     {{/useRxJava}}
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index 2de325f76b4..a1e7f6eeff2 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -246,9 +246,9 @@
     <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>
-    <retrofit-version>2.1.0</retrofit-version>
     <jackson-version>2.7.5</jackson-version>
     <play-version>2.4.11</play-version>
+    <retrofit-version>2.2.0</retrofit-version>
     <jodatime-version>2.9.4</jodatime-version>
     <oltu-version>1.0.1</oltu-version>
     <junit-version>4.12</junit-version>
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallAdapterFactory.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallAdapterFactory.java
index cb930cbbff7..c5e91a4da4c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallAdapterFactory.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallAdapterFactory.java
@@ -14,7 +14,7 @@ import java.lang.reflect.WildcardType;
 public class Play24CallAdapterFactory extends CallAdapter.Factory {
 
     @Override
-    public CallAdapter<?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
+    public CallAdapter<?, ?> get(Type returnType, Annotation[] annotations, Retrofit retrofit) {
         if (!(returnType instanceof ParameterizedType)) {
             return null;
         }
@@ -41,7 +41,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
         return paramType;
     }
 
-    private CallAdapter<F.Promise<?>> createAdapter(ParameterizedType returnType) {
+    private CallAdapter<?, F.Promise<?>> createAdapter(ParameterizedType returnType) {
         Type parameterType = getTypeParam(returnType);
         return new ValueAdapter(parameterType);
     }
@@ -49,7 +49,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
     /**
      * Adpater that coverts values returned by API interface into Play promises
      */
-    static final class ValueAdapter implements CallAdapter<F.Promise<?>> {
+    static final class ValueAdapter<R> implements CallAdapter<R, F.Promise<R>> {
 
         private final Type responseType;
 
@@ -63,7 +63,7 @@ public class Play24CallAdapterFactory extends CallAdapter.Factory {
         }
 
         @Override
-        public <R> F.Promise<R> adapt(final Call<R> call) {
+        public F.Promise<R> adapt(final Call<R> call) {
             final F.RedeemablePromise<R> promise = F.RedeemablePromise.empty();
 
             call.enqueue(new Callback<R>() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java
index f2421d80678..64e2278ad98 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java
@@ -196,6 +196,11 @@ public class Play24CallFactory implements okhttp3.Call.Factory {
         public void cancel() {
             throw new UnsupportedOperationException("Not supported");
         }
+        
+        @Override
+        public PlayWSCall clone() {
+            throw new UnsupportedOperationException("Not supported");
+        }
 
         @Override
         public boolean isExecuted() {