diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
index 29a669b6dcb..3b245597f21 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache
@@ -92,7 +92,7 @@ public class OAuth implements Interceptor {
 
             String requestAccessToken = new String(getAccessToken());
             try {
-                oAuthRequest = new OAuthBearerClientRequest(request.urlString())
+                oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
                         .setAccessToken(requestAccessToken)
                         .buildHeaderMessage();
             } catch (OAuthSystemException e) {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
index 497b2a09667..244ee20eb5b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-17T10:01:17.552+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-17T10:34:26.353+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
index 179bb337439..97145cec55f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/auth/OAuth.java
@@ -92,7 +92,7 @@ public class OAuth implements Interceptor {
 
             String requestAccessToken = new String(getAccessToken());
             try {
-                oAuthRequest = new OAuthBearerClientRequest(request.urlString())
+                oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
                         .setAccessToken(requestAccessToken)
                         .buildHeaderMessage();
             } catch (OAuthSystemException e) {
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
index 9fc28dc5d38..4f33efd8991 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-17T10:23:52.848+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-05-17T10:34:31.551+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
index 179bb337439..97145cec55f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/auth/OAuth.java
@@ -92,7 +92,7 @@ public class OAuth implements Interceptor {
 
             String requestAccessToken = new String(getAccessToken());
             try {
-                oAuthRequest = new OAuthBearerClientRequest(request.urlString())
+                oAuthRequest = new OAuthBearerClientRequest(request.url().toString())
                         .setAccessToken(requestAccessToken)
                         .buildHeaderMessage();
             } catch (OAuthSystemException e) {