Skip to content

support latest Retrofit 2 v2.0.0-beta4 #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 29, 2016
Merged

support latest Retrofit 2 v2.0.0-beta4 #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
71af74a
support changes in retrofit v2.0.0-beta4
Feb 16, 2016
81ca40f
Merge branch 'master' of https://github.com/dhontecillas/swagger-codegen
dhontecillas Feb 16, 2016
4ba806f
update tests for retrofit beta4
dhontecillas Feb 25, 2016
006092f
removed end of line spaces
dhontecillas Feb 25, 2016
6788c89
fix templates for retrofit2rx and build.gradle
dhontecillas Feb 25, 2016
0fe8f7e
fix build.gradle template for retrofit2
dhontecillas Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public JavaClientCodegen() {
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);
Expand Down
26 changes: 13 additions & 13 deletions modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil

import retrofit2.Converter;
import retrofit2.Retrofit;
import retrofit2.GsonConverterFactory;
{{#useRxJava}}import retrofit2.RxJavaCallAdapterFactory;{{/useRxJava}}
import retrofit2.converter.gson.GsonConverterFactory;
{{#useRxJava}}import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;{{/useRxJava}}

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down Expand Up @@ -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 + "/";
Expand All @@ -125,7 +125,7 @@ public class ApiClient {

public <S> S createService(Class<S> serviceClass) {
return adapterBuilder.build().create(serviceClass);

}

/**
Expand Down Expand Up @@ -203,7 +203,7 @@ public class ApiClient {
}
}
}

/**
* Helper method to configure the oauth accessCode/implicit flow parameters
* @param clientId
Expand All @@ -225,7 +225,7 @@ public class ApiClient {
}
}
}

/**
* Configures a listener which is notified when a new access token is received.
* @param accessTokenListener
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -308,14 +308,14 @@ class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T>
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);
Expand All @@ -339,8 +339,8 @@ class GsonCustomConverterFactory extends Converter.Factory
}

@Override
public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
return gsonConverterFactory.requestBodyConverter(type, annotations, retrofit);
public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
}
}

36 changes: 18 additions & 18 deletions ...es/swagger-codegen/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import java.util.Arrays;
import java.util.List;

public class CollectionFormats {

public static class CSVParams {

protected List<String> params;

public CSVParams() {
}

public CSVParams(List<String> params) {
this.params = params;
}

public CSVParams(String... params) {
this.params = Arrays.asList(params);
}
Expand All @@ -27,19 +27,19 @@ public class CollectionFormats {
public void setParams(List<String> 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<String> params) {
super(params);
}
Expand All @@ -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<String> params) {
super(params);
}

public TSVParams(String... params) {
super(params);
}
Expand All @@ -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<String> params) {
super(params);
}

public PIPESParams(String... params) {
super(params);
}
Expand All @@ -91,5 +91,5 @@ public class CollectionFormats {
return StringUtil.join(params.toArray(new String[0]), "|");
}
}

}
6 changes: 1 addition & 5 deletions modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}}
Expand All @@ -113,7 +110,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"

Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<retrofit-version>2.0.0-beta3</retrofit-version>
<retrofit-version>2.0.0-beta4</retrofit-version>
{{#useRxJava}}<rxjava-version>1.0.16</rxjava-version>{{/useRxJava}}
<okhttp-version>3.0.1</okhttp-version>
<gson-version>2.4</gson-version>
Expand Down
6 changes: 1 addition & 5 deletions samples/client/petstore/java/retrofit2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,19 @@ 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"

}

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"

Expand Down
15 changes: 1 addition & 14 deletions samples/client/petstore/java/retrofit2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,21 +123,11 @@
<artifactId>converter-gson</artifactId>
<version>${retrofit-version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson-version}</version>
</dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp-version}</version>
</dependency>


<!-- test dependencies -->
Expand All @@ -150,10 +140,7 @@
</dependencies>
<properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version>
<retrofit-version>2.0.0-beta3</retrofit-version>

<okhttp-version>3.0.1</okhttp-version>
<gson-version>2.4</gson-version>
<retrofit-version>2.0.0-beta4</retrofit-version>
<oltu-version>1.0.0</oltu-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
Expand Down
30 changes: 15 additions & 15 deletions samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import retrofit2.Converter;
import retrofit2.Retrofit;
import retrofit2.GsonConverterFactory;
import retrofit2.converter.gson.GsonConverterFactory;


import com.google.gson.Gson;
Expand Down Expand Up @@ -46,10 +46,10 @@ public ApiClient(String[] authNames) {
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");
}
Expand Down Expand Up @@ -102,14 +102,14 @@ public ApiClient(String authName, String clientId, String secret, String usernam
.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 + "/";
Expand All @@ -124,7 +124,7 @@ public void createDefaultAdapter() {

public <S> S createService(Class<S> serviceClass) {
return adapterBuilder.build().create(serviceClass);

}

/**
Expand Down Expand Up @@ -202,7 +202,7 @@ public void setAccessToken(String accessToken) {
}
}
}

/**
* Helper method to configure the oauth accessCode/implicit flow parameters
* @param clientId
Expand All @@ -224,7 +224,7 @@ public void configureAuthorizationFlow(String clientId, String clientSecret, Str
}
}
}

/**
* Configures a listener which is notified when a new access token is received.
* @param accessTokenListener
Expand Down Expand Up @@ -271,7 +271,7 @@ public void setAdapterBuilder(Retrofit.Builder adapterBuilder) {
public OkHttpClient getOkClient() {
return okClient;
}

public void addAuthsToOkClient(OkHttpClient okClient) {
for(Interceptor apiAuthorization : apiAuthorizations.values()) {
okClient.interceptors().add(apiAuthorization);
Expand Down Expand Up @@ -307,14 +307,14 @@ class GsonResponseBodyConverterToString<T> implements Converter<ResponseBody, T>
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);
Expand All @@ -338,8 +338,8 @@ private GsonCustomConverterFactory(Gson gson) {
}

@Override
public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] annotations, Retrofit retrofit) {
return gsonConverterFactory.requestBodyConverter(type, annotations, retrofit);
public Converter<?, RequestBody> requestBodyConverter(Type type, Annotation[] parameterAnnotations, Annotation[] methodAnnotations, Retrofit retrofit) {
return gsonConverterFactory.requestBodyConverter(type, parameterAnnotations, methodAnnotations, retrofit);
}
}

Loading