From 22c80588f63629a17ae0113da11e2d9b437bd4cf Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 4 Apr 2017 22:58:03 +0800 Subject: [PATCH] fix retrofit2 rxjava2 script (#5321) --- bin/java-petstore-retrofit2rx2.sh | 2 +- samples/client/petstore/java/retrofit2rx2/build.gradle | 6 +++--- samples/client/petstore/java/retrofit2rx2/build.sbt | 4 ++-- samples/client/petstore/java/retrofit2rx2/pom.xml | 10 +++++----- .../src/main/java/io/swagger/client/ApiClient.java | 4 ++-- .../src/main/java/io/swagger/client/api/FakeApi.java | 2 +- .../src/main/java/io/swagger/client/api/PetApi.java | 2 +- .../src/main/java/io/swagger/client/api/StoreApi.java | 2 +- .../src/main/java/io/swagger/client/api/UserApi.java | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/java-petstore-retrofit2rx2.sh b/bin/java-petstore-retrofit2rx2.sh index c13d0a5ebef..145d5a994fe 100755 --- a/bin/java-petstore-retrofit2rx2.sh +++ b/bin/java-petstore-retrofit2rx2.sh @@ -26,7 +26,7 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx2.json -o samples/client/petstore/java/retrofit2rx2 -DuseRxJava=true,hideGenerationTimestamp=true" +ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2 -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-retrofit2rx2.json -o samples/client/petstore/java/retrofit2rx2 -DuseRxJava2=true,hideGenerationTimestamp=true" echo "Removing files and folders under samples/client/petstore/java/retrofit2rx2/src/main" rm -rf samples/client/petstore/java/retrofit2rx2/src/main diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle index 517e6ec9927..2ce2914186d 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.gradle +++ b/samples/client/petstore/java/retrofit2rx2/build.gradle @@ -98,7 +98,7 @@ ext { retrofit_version = "2.2.0" swagger_annotations_version = "1.5.12" junit_version = "4.12" - rx_java_version = "1.2.9" + rx_java_version = "2.0.7" jodatime_version = "2.9.4" } @@ -106,8 +106,8 @@ dependencies { compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:converter-scalars:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version" - compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" - compile "io.reactivex:rxjava:$rx_java_version" + compile "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0" + compile "io.reactivex.rxjava2:rxjava:$rx_java_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "joda-time:joda-time:$jodatime_version" diff --git a/samples/client/petstore/java/retrofit2rx2/build.sbt b/samples/client/petstore/java/retrofit2rx2/build.sbt index 61a5f5363e6..b989cdf3269 100644 --- a/samples/client/petstore/java/retrofit2rx2/build.sbt +++ b/samples/client/petstore/java/retrofit2rx2/build.sbt @@ -12,8 +12,8 @@ lazy val root = (project in file(".")). "com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile", - "com.squareup.retrofit2" % "adapter-rxjava" % "2.2.0" % "compile", - "io.reactivex" % "rxjava" % "1.2.9" % "compile", + "com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile", + "io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile", "io.swagger" % "swagger-annotations" % "1.5.12" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "joda-time" % "joda-time" % "2.9.4" % "compile", diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml index d9fe33f9b16..cd806e757b0 100644 --- a/samples/client/petstore/java/retrofit2rx2/pom.xml +++ b/samples/client/petstore/java/retrofit2rx2/pom.xml @@ -200,14 +200,14 @@ ${jodatime-version} - io.reactivex + io.reactivex.rxjava2 rxjava ${rxjava-version} - com.squareup.retrofit2 - adapter-rxjava - ${retrofit-version} + com.jakewharton.retrofit + retrofit2-rxjava2-adapter + 1.0.0 @@ -226,7 +226,7 @@ ${java.version} 1.5.12 2.2.0 - 1.2.9 + 2.0.7 2.9.4 1.0.1 4.12 diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java index 272d118db65..a31ed6222f5 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java @@ -15,7 +15,7 @@ import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; import retrofit2.Converter; import retrofit2.Retrofit; -import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory; +import com.jakewharton.retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; @@ -126,7 +126,7 @@ public class ApiClient { adapterBuilder = new Retrofit .Builder() .baseUrl(baseUrl) - .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) .addConverterFactory(ScalarsConverterFactory.create()) .addConverterFactory(GsonCustomConverterFactory.create(gson)); } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java index 16f75c85e08..9fb95265bd1 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java @@ -2,8 +2,8 @@ package io.swagger.client.api; import io.swagger.client.CollectionFormats.*; -import rx.Observable; +import io.reactivex.Observable; import retrofit2.http.*; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java index ca50dfdeb64..8d012d48ade 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java @@ -2,8 +2,8 @@ package io.swagger.client.api; import io.swagger.client.CollectionFormats.*; -import rx.Observable; +import io.reactivex.Observable; import retrofit2.http.*; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java index c2dc749a331..c6a5558ea60 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java @@ -2,8 +2,8 @@ package io.swagger.client.api; import io.swagger.client.CollectionFormats.*; -import rx.Observable; +import io.reactivex.Observable; import retrofit2.http.*; diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java index a4e7e138b75..00a7729d32b 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java @@ -2,8 +2,8 @@ package io.swagger.client.api; import io.swagger.client.CollectionFormats.*; -import rx.Observable; +import io.reactivex.Observable; import retrofit2.http.*;