loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Updated CallAdapter & CallAdapterFactory for retrofit 2.2.0 (#5345)

Browse Source
This commit is contained in:
lukoyanov 2017-04-07 02:35:47 +03:00 committed by wing328
parent 90b14a996a
commit a7652d508d
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
View File

@ -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>() {

5
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache
View File

@ -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() {

3
modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/pom.mustache
View File

@ -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}}

2
samples/client/petstore/java/retrofit2-play24/pom.xml
View File

@ -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>

8
samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallAdapterFactory.java
View File

@ -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>() {

5
samples/client/petstore/java/retrofit2-play24/src/main/java/io/swagger/client/Play24CallFactory.java
View File

@ -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() {