From 71af74adf3a925120661f088fa75a46f66615c5b Mon Sep 17 00:00:00 2001 From: dhontecillas Date: Tue, 16 Feb 2016 14:04:42 +0100 Subject: [PATCH 1/5] support changes in retrofit v2.0.0-beta4 --- .../io/swagger/codegen/languages/JavaClientCodegen.java | 2 +- .../resources/Java/libraries/retrofit2/ApiClient.mustache | 6 +++--- .../main/resources/Java/libraries/retrofit2/pom.mustache | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 67750ea790cc..6bac87dfad35 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -100,7 +100,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.6"); supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1"); supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.4.0. JSON processing: Gson 2.3.1 (Retrofit 1.9.0)"); - supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta2). Enable the RxJava adapter using '-DuseRxJava=true'."); + supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 2.5.0. JSON processing: Gson 2.4 (Retrofit 2.0.0-beta4). Enable the RxJava adapter using '-DuseRxJava=true'."); CliOption library = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use"); library.setDefault(DEFAULT_LIBRARY); 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 11903b535f56..28df92a038c7 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 @@ -12,7 +12,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil import retrofit2.Converter; import retrofit2.Retrofit; -import retrofit2.GsonConverterFactory; +import retrofit2.converter.gson.GsonConverterFactory; {{#useRxJava}}import retrofit2.RxJavaCallAdapterFactory;{{/useRxJava}} import com.google.gson.Gson; @@ -339,8 +339,8 @@ class GsonCustomConverterFactory extends Converter.Factory } @Override - public Converter requestBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) { - return gsonConverterFactory.requestBodyConverter(type, annotations, retrofit); + public Converter requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) { + return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit); } } 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 40e537161c02..0cb14c49304d 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 @@ -161,7 +161,7 @@ 1.5.0 - 2.0.0-beta3 + 2.0.0-beta4 {{#useRxJava}}1.0.16{{/useRxJava}} 3.0.1 2.4 From 4ba806f656d57647839323c723368c5bce05e150 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Thu, 25 Feb 2016 11:34:48 +0100 Subject: [PATCH 2/5] update tests for retrofit beta4 --- samples/client/petstore/java/retrofit2/pom.xml | 15 +-------------- .../main/java/io/swagger/client/ApiClient.java | 12 ++++++------ .../main/java/io/swagger/client/StringUtil.java | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml index 39f3857db33a..07c24f981161 100644 --- a/samples/client/petstore/java/retrofit2/pom.xml +++ b/samples/client/petstore/java/retrofit2/pom.xml @@ -123,21 +123,11 @@ converter-gson ${retrofit-version} - - com.google.code.gson - gson - ${gson-version} - org.apache.oltu.oauth2 org.apache.oltu.oauth2.client ${oltu-version} - - com.squareup.okhttp3 - okhttp - ${okhttp-version} - @@ -150,10 +140,7 @@ 1.5.0 - 2.0.0-beta3 - - 3.0.1 - 2.4 + 2.0.0-beta4 1.0.0 1.0.0 4.12 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 dd3bde9372dd..26df289eda01 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 @@ -12,7 +12,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil import retrofit2.Converter; import retrofit2.Retrofit; -import retrofit2.GsonConverterFactory; +import retrofit2.converter.gson.GsonConverterFactory; import com.google.gson.Gson; @@ -46,10 +46,10 @@ public class ApiClient { this(); for(String authName : authNames) { Interceptor 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") { + if (authName == "api_key") { auth = new ApiKeyAuth("header", "api_key"); + } else if (authName == "petstore_auth") { + auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } @@ -338,8 +338,8 @@ class GsonCustomConverterFactory extends Converter.Factory } @Override - public Converter requestBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) { - return gsonConverterFactory.requestBodyConverter(type, annotations, retrofit); + public Converter requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) { + return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit); } } 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 f77418464bfb..34bc6ac91782 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-02-02T15:33:05.826+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-25T10:57:20.452+01:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). From 006092f45330ce344ed3bf35268115be0bc2cc62 Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Thu, 25 Feb 2016 12:23:27 +0100 Subject: [PATCH 3/5] removed end of line spaces --- .../libraries/retrofit2/ApiClient.mustache | 18 +++++----- .../retrofit2/CollectionFormats.mustache | 36 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) 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 28df92a038c7..736066c8b41f 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 @@ -103,14 +103,14 @@ public class ApiClient { .setUsername(username) .setPassword(password); } - + public void createDefaultAdapter() { Gson gson = new GsonBuilder() .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .create(); okClient = new OkHttpClient(); - + String baseUrl = "{{basePath}}"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/"; @@ -125,7 +125,7 @@ public class ApiClient { public S createService(Class serviceClass) { return adapterBuilder.build().create(serviceClass); - + } /** @@ -203,7 +203,7 @@ public class ApiClient { } } } - + /** * Helper method to configure the oauth accessCode/implicit flow parameters * @param clientId @@ -225,7 +225,7 @@ public class ApiClient { } } } - + /** * Configures a listener which is notified when a new access token is received. * @param accessTokenListener @@ -272,7 +272,7 @@ public class ApiClient { public OkHttpClient getOkClient() { return okClient; } - + public void addAuthsToOkClient(OkHttpClient okClient) { for(Interceptor apiAuthorization : apiAuthorizations.values()) { okClient.interceptors().add(apiAuthorization); @@ -308,14 +308,14 @@ class GsonResponseBodyConverterToString implements Converter String returned = value.string(); try { return gson.fromJson(returned, type); - } + } catch (JsonParseException e) { return (T) returned; - } + } } } -class GsonCustomConverterFactory extends Converter.Factory +class GsonCustomConverterFactory extends Converter.Factory { public static GsonCustomConverterFactory create(Gson gson) { return new GsonCustomConverterFactory(gson); diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache index a549ea59d1c2..8c91c335dfce 100644 --- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache @@ -4,18 +4,18 @@ import java.util.Arrays; import java.util.List; public class CollectionFormats { - + public static class CSVParams { protected List params; - + public CSVParams() { } - + public CSVParams(List params) { this.params = params; } - + public CSVParams(String... params) { this.params = Arrays.asList(params); } @@ -27,19 +27,19 @@ public class CollectionFormats { public void setParams(List params) { this.params = params; } - + @Override public String toString() { return StringUtil.join(params.toArray(new String[0]), ","); } - + } - + public static class SSVParams extends CSVParams { - + public SSVParams() { } - + public SSVParams(List params) { super(params); } @@ -53,16 +53,16 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), " "); } } - + public static class TSVParams extends CSVParams { - + public TSVParams() { } - + public TSVParams(List params) { super(params); } - + public TSVParams(String... params) { super(params); } @@ -72,16 +72,16 @@ public class CollectionFormats { return StringUtil.join( params.toArray(new String[0]), "\t"); } } - + public static class PIPESParams extends CSVParams { - + public PIPESParams() { } - + public PIPESParams(List params) { super(params); } - + public PIPESParams(String... params) { super(params); } @@ -91,5 +91,5 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), "|"); } } - + } From 6788c8981663dee42d2850fa90b095a2c25562ea Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Thu, 25 Feb 2016 17:00:56 +0100 Subject: [PATCH 4/5] fix templates for retrofit2rx and build.gradle --- .../libraries/retrofit2/ApiClient.mustache | 2 +- .../libraries/retrofit2/build.gradle.mustache | 3 +- .../java/io/swagger/client/StringUtil.java | 2 +- .../petstore/java/retrofit2rx/build.gradle | 3 +- .../client/petstore/java/retrofit2rx/pom.xml | 14 +------- .../java/io/swagger/client/ApiClient.java | 32 ++++++++--------- .../io/swagger/client/CollectionFormats.java | 36 +++++++++---------- .../java/io/swagger/client/StringUtil.java | 2 +- 8 files changed, 40 insertions(+), 54 deletions(-) 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 736066c8b41f..91a88c5476cf 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 @@ -13,7 +13,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil import retrofit2.Converter; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; -{{#useRxJava}}import retrofit2.RxJavaCallAdapterFactory;{{/useRxJava}} +{{#useRxJava}}import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;{{/useRxJava}} import com.google.gson.Gson; import com.google.gson.GsonBuilder; 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 d7dd471b18cb..0d3964c2a789 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 @@ -92,7 +92,7 @@ if(hasProperty('target') && target == 'android') { ext { okhttp_version = "3.0.1" oltu_version = "1.0.0" - retrofit_version = "2.0.0-beta3" + retrofit_version = "2.0.0-beta4" gson_version = "2.4" swagger_annotations_version = "1.5.0" junit_version = "4.12" @@ -113,7 +113,6 @@ dependencies { {{/useRxJava}} {{^useRxJava}}{{/useRxJava}} - compile "com.google.code.gson:gson:$gson_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" 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 34bc6ac91782..9f263c274b33 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-02-25T10:57:20.452+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-25T16:20:24.158+01: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/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle index 6b72ef69557e..1f5d648696f8 100644 --- a/samples/client/petstore/java/retrofit2rx/build.gradle +++ b/samples/client/petstore/java/retrofit2rx/build.gradle @@ -92,7 +92,7 @@ if(hasProperty('target') && target == 'android') { ext { okhttp_version = "3.0.1" oltu_version = "1.0.0" - retrofit_version = "2.0.0-beta3" + retrofit_version = "2.0.0-beta4" gson_version = "2.4" swagger_annotations_version = "1.5.0" junit_version = "4.12" @@ -109,7 +109,6 @@ dependencies { compile "io.reactivex:rxjava:$rx_java_version" - compile "com.google.code.gson:gson:$gson_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml index 2881967993d8..e5c4e6875118 100644 --- a/samples/client/petstore/java/retrofit2rx/pom.xml +++ b/samples/client/petstore/java/retrofit2rx/pom.xml @@ -123,21 +123,11 @@ converter-gson ${retrofit-version} - - com.google.code.gson - gson - ${gson-version} - org.apache.oltu.oauth2 org.apache.oltu.oauth2.client ${oltu-version} - - com.squareup.okhttp3 - okhttp - ${okhttp-version} - io.reactivex @@ -161,10 +151,8 @@ 1.5.0 - 2.0.0-beta3 + 2.0.0-beta4 1.0.16 - 3.0.1 - 2.4 1.0.0 1.0.0 4.12 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 5b05ce22e667..800e4db8bd88 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 @@ -12,8 +12,8 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil import retrofit2.Converter; import retrofit2.Retrofit; -import retrofit2.GsonConverterFactory; -import retrofit2.RxJavaCallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; +import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -46,10 +46,10 @@ public class ApiClient { this(); for(String authName : authNames) { Interceptor 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") { + if (authName == "api_key") { auth = new ApiKeyAuth("header", "api_key"); + } else if (authName == "petstore_auth") { + auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets"); } else { throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names"); } @@ -102,14 +102,14 @@ public class ApiClient { .setUsername(username) .setPassword(password); } - + public void createDefaultAdapter() { Gson gson = new GsonBuilder() .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .create(); okClient = new OkHttpClient(); - + String baseUrl = "http://petstore.swagger.io/v2"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/"; @@ -124,7 +124,7 @@ public class ApiClient { public S createService(Class serviceClass) { return adapterBuilder.build().create(serviceClass); - + } /** @@ -202,7 +202,7 @@ public class ApiClient { } } } - + /** * Helper method to configure the oauth accessCode/implicit flow parameters * @param clientId @@ -224,7 +224,7 @@ public class ApiClient { } } } - + /** * Configures a listener which is notified when a new access token is received. * @param accessTokenListener @@ -271,7 +271,7 @@ public class ApiClient { public OkHttpClient getOkClient() { return okClient; } - + public void addAuthsToOkClient(OkHttpClient okClient) { for(Interceptor apiAuthorization : apiAuthorizations.values()) { okClient.interceptors().add(apiAuthorization); @@ -307,14 +307,14 @@ class GsonResponseBodyConverterToString implements Converter String returned = value.string(); try { return gson.fromJson(returned, type); - } + } catch (JsonParseException e) { return (T) returned; - } + } } } -class GsonCustomConverterFactory extends Converter.Factory +class GsonCustomConverterFactory extends Converter.Factory { public static GsonCustomConverterFactory create(Gson gson) { return new GsonCustomConverterFactory(gson); @@ -338,8 +338,8 @@ class GsonCustomConverterFactory extends Converter.Factory } @Override - public Converter requestBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) { - return gsonConverterFactory.requestBodyConverter(type, annotations, retrofit); + public Converter requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) { + return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit); } } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java index c3cf52575143..e96d1561a7cc 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/CollectionFormats.java @@ -4,18 +4,18 @@ import java.util.Arrays; import java.util.List; public class CollectionFormats { - + public static class CSVParams { protected List params; - + public CSVParams() { } - + public CSVParams(List params) { this.params = params; } - + public CSVParams(String... params) { this.params = Arrays.asList(params); } @@ -27,19 +27,19 @@ public class CollectionFormats { public void setParams(List params) { this.params = params; } - + @Override public String toString() { return StringUtil.join(params.toArray(new String[0]), ","); } - + } - + public static class SSVParams extends CSVParams { - + public SSVParams() { } - + public SSVParams(List params) { super(params); } @@ -53,16 +53,16 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), " "); } } - + public static class TSVParams extends CSVParams { - + public TSVParams() { } - + public TSVParams(List params) { super(params); } - + public TSVParams(String... params) { super(params); } @@ -72,16 +72,16 @@ public class CollectionFormats { return StringUtil.join( params.toArray(new String[0]), "\t"); } } - + public static class PIPESParams extends CSVParams { - + public PIPESParams() { } - + public PIPESParams(List params) { super(params); } - + public PIPESParams(String... params) { super(params); } @@ -91,5 +91,5 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), "|"); } } - + } 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 9f06b50e8b93..05d7a3a4240e 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-02-02T15:33:07.490+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-25T16:58:59.076+01:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). From 0fe8f7e375fc20efa2b42435187066a4328ce78a Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Fri, 26 Feb 2016 13:34:57 +0100 Subject: [PATCH 5/5] fix build.gradle template for retrofit2 --- .../libraries/retrofit2/build.gradle.mustache | 3 -- .../petstore/java/retrofit2/build.gradle | 6 +--- .../java/io/swagger/client/ApiClient.java | 18 +++++----- .../io/swagger/client/CollectionFormats.java | 36 +++++++++---------- .../java/io/swagger/client/StringUtil.java | 2 +- .../petstore/java/retrofit2rx/build.gradle | 3 -- .../java/io/swagger/client/StringUtil.java | 2 +- 7 files changed, 30 insertions(+), 40 deletions(-) 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 0d3964c2a789..17dfef0f2d92 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 @@ -90,7 +90,6 @@ if(hasProperty('target') && target == 'android') { } ext { - okhttp_version = "3.0.1" oltu_version = "1.0.0" retrofit_version = "2.0.0-beta4" gson_version = "2.4" @@ -103,8 +102,6 @@ ext { } dependencies { - compile "com.squareup.okhttp3:okhttp:$okhttp_version" - compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version" {{#useRxJava}} diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle index 8eee8f18489b..5f5ff488f18e 100644 --- a/samples/client/petstore/java/retrofit2/build.gradle +++ b/samples/client/petstore/java/retrofit2/build.gradle @@ -90,9 +90,8 @@ if(hasProperty('target') && target == 'android') { } ext { - okhttp_version = "3.0.1" oltu_version = "1.0.0" - retrofit_version = "2.0.0-beta3" + retrofit_version = "2.0.0-beta4" gson_version = "2.4" swagger_annotations_version = "1.5.0" junit_version = "4.12" @@ -100,13 +99,10 @@ ext { } dependencies { - compile "com.squareup.okhttp3:okhttp:$okhttp_version" - compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile "com.google.code.gson:gson:$gson_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_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 26df289eda01..398a1014c71b 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 @@ -102,14 +102,14 @@ public class ApiClient { .setUsername(username) .setPassword(password); } - + public void createDefaultAdapter() { Gson gson = new GsonBuilder() .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") .create(); okClient = new OkHttpClient(); - + String baseUrl = "http://petstore.swagger.io/v2"; if(!baseUrl.endsWith("/")) baseUrl = baseUrl + "/"; @@ -124,7 +124,7 @@ public class ApiClient { public S createService(Class serviceClass) { return adapterBuilder.build().create(serviceClass); - + } /** @@ -202,7 +202,7 @@ public class ApiClient { } } } - + /** * Helper method to configure the oauth accessCode/implicit flow parameters * @param clientId @@ -224,7 +224,7 @@ public class ApiClient { } } } - + /** * Configures a listener which is notified when a new access token is received. * @param accessTokenListener @@ -271,7 +271,7 @@ public class ApiClient { public OkHttpClient getOkClient() { return okClient; } - + public void addAuthsToOkClient(OkHttpClient okClient) { for(Interceptor apiAuthorization : apiAuthorizations.values()) { okClient.interceptors().add(apiAuthorization); @@ -307,14 +307,14 @@ class GsonResponseBodyConverterToString implements Converter String returned = value.string(); try { return gson.fromJson(returned, type); - } + } catch (JsonParseException e) { return (T) returned; - } + } } } -class GsonCustomConverterFactory extends Converter.Factory +class GsonCustomConverterFactory extends Converter.Factory { public static GsonCustomConverterFactory create(Gson gson) { return new GsonCustomConverterFactory(gson); diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java index c3cf52575143..e96d1561a7cc 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/CollectionFormats.java @@ -4,18 +4,18 @@ import java.util.Arrays; import java.util.List; public class CollectionFormats { - + public static class CSVParams { protected List params; - + public CSVParams() { } - + public CSVParams(List params) { this.params = params; } - + public CSVParams(String... params) { this.params = Arrays.asList(params); } @@ -27,19 +27,19 @@ public class CollectionFormats { public void setParams(List params) { this.params = params; } - + @Override public String toString() { return StringUtil.join(params.toArray(new String[0]), ","); } - + } - + public static class SSVParams extends CSVParams { - + public SSVParams() { } - + public SSVParams(List params) { super(params); } @@ -53,16 +53,16 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), " "); } } - + public static class TSVParams extends CSVParams { - + public TSVParams() { } - + public TSVParams(List params) { super(params); } - + public TSVParams(String... params) { super(params); } @@ -72,16 +72,16 @@ public class CollectionFormats { return StringUtil.join( params.toArray(new String[0]), "\t"); } } - + public static class PIPESParams extends CSVParams { - + public PIPESParams() { } - + public PIPESParams(List params) { super(params); } - + public PIPESParams(String... params) { super(params); } @@ -91,5 +91,5 @@ public class CollectionFormats { return StringUtil.join(params.toArray(new String[0]), "|"); } } - + } 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 9f263c274b33..22e010034b2a 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-02-25T16:20:24.158+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:07.836+01: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/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle index 1f5d648696f8..1ab839078a46 100644 --- a/samples/client/petstore/java/retrofit2rx/build.gradle +++ b/samples/client/petstore/java/retrofit2rx/build.gradle @@ -90,7 +90,6 @@ if(hasProperty('target') && target == 'android') { } ext { - okhttp_version = "3.0.1" oltu_version = "1.0.0" retrofit_version = "2.0.0-beta4" gson_version = "2.4" @@ -101,8 +100,6 @@ ext { } dependencies { - compile "com.squareup.okhttp3:okhttp:$okhttp_version" - compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" 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 05d7a3a4240e..1e7e09a6aa99 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-02-25T16:58:59.076+01:00") +@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:13.630+01:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison).