From 0fe8f7e375fc20efa2b42435187066a4328ce78a Mon Sep 17 00:00:00 2001 From: David Hontecillas Date: Fri, 26 Feb 2016 13:34:57 +0100 Subject: [PATCH] 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 0d3964c2a78..17dfef0f2d9 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 8eee8f18489..5f5ff488f18 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 26df289eda0..398a1014c71 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 c3cf5257514..e96d1561a7c 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 9f263c274b3..22e010034b2 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 1f5d648696f..1ab839078a4 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 05d7a3a4240..1e7e09a6aa9 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).