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

fix retrofit2 rxjava2 script (#5321)

Browse Source
This commit is contained in:
wing328 2017-04-04 22:58:03 +08:00 committed by GitHub
parent f0b0226e46
commit 22c80588f6
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/java-petstore-retrofit2rx2.sh
View File

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

6
samples/client/petstore/java/retrofit2rx2/build.gradle
View File

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

4
samples/client/petstore/java/retrofit2rx2/build.sbt
View File

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

10
samples/client/petstore/java/retrofit2rx2/pom.xml
View File

@ -200,14 +200,14 @@
<version>${jodatime-version}</version>
</dependency>
<dependency>
<groupId>io.reactivex</groupId>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rxjava-version}</version>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
<artifactId>adapter-rxjava</artifactId>
<version>${retrofit-version}</version>
<groupId>com.jakewharton.retrofit</groupId>
<artifactId>retrofit2-rxjava2-adapter</artifactId>
<version>1.0.0</version>
</dependency>
@ -226,7 +226,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.12</swagger-core-version>
<retrofit-version>2.2.0</retrofit-version>
<rxjava-version>1.2.9</rxjava-version>
<rxjava-version>2.0.7</rxjava-version>
<jodatime-version>2.9.4</jodatime-version>
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>

4
samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/ApiClient.java
View File

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

2
samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/FakeApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.client.api;
import io.swagger.client.CollectionFormats.*;
import rx.Observable;
import io.reactivex.Observable;
import retrofit2.http.*;

2
samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.client.api;
import io.swagger.client.CollectionFormats.*;
import rx.Observable;
import io.reactivex.Observable;
import retrofit2.http.*;

2
samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.client.api;
import io.swagger.client.CollectionFormats.*;
import rx.Observable;
import io.reactivex.Observable;
import retrofit2.http.*;

2
samples/client/petstore/java/retrofit2rx2/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -2,8 +2,8 @@ package io.swagger.client.api;
import io.swagger.client.CollectionFormats.*;
import rx.Observable;
import io.reactivex.Observable;
import retrofit2.http.*;