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

Update ApiClient.mustache for retrofit2 + rxJava3 support to use official square implementation of rxJava3 adapter (#19266)

Browse Source
This commit is contained in:
Adam Helbling 2024-07-30 06:30:50 -04:00 committed by GitHub
parent 16b28118cc
commit 753502c255
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache vendored
View File

@ -22,7 +22,7 @@ import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
{{/useRxJava2}} {{/useRxJava2}}
{{#useRxJava3}} {{#useRxJava3}}
import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory; import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
{{/useRxJava3}} {{/useRxJava3}}
{{#gson}} {{#gson}}
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;

4
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache vendored
View File

@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.11.0"
{{#jackson}} {{#jackson}}
jackson_version = "2.17.1" jackson_version = "2.17.1"
jackson_databind_version = "2.17.1" jackson_databind_version = "2.17.1"
@ -134,7 +134,7 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:$rx_java_version" implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
{{/useRxJava2}} {{/useRxJava2}}
{{#useRxJava3}} {{#useRxJava3}}
implementation 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
implementation "io.reactivex.rxjava3:rxjava:$rx_java_version" implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
{{/useRxJava3}} {{/useRxJava3}}
implementation "io.swagger:swagger-annotations:$swagger_annotations_version" implementation "io.swagger:swagger-annotations:$swagger_annotations_version"

12
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache vendored
View File

@ -9,25 +9,25 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.11.0" % "compile",
{{^usePlayWS}} {{^usePlayWS}}
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.11.0" % "compile",
{{/usePlayWS}} {{/usePlayWS}}
{{#usePlayWS}} {{#usePlayWS}}
"com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
"jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.11.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile",
{{/usePlayWS}} {{/usePlayWS}}
{{#useRxJava2}} {{#useRxJava2}}
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava2" % "2.11.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile", "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
{{/useRxJava2}} {{/useRxJava2}}
{{#useRxJava3}} {{#useRxJava3}}
"com.github.akarnokd" % "rxjava3-retrofit-adapter" % "3.0.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava3" % "2.11.0" % "compile",
"io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile", "io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile",
{{/useRxJava3}} {{/useRxJava3}}
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",

8
modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache vendored
View File

@ -278,9 +278,9 @@
<version>${rxjava-version}</version> <version>${rxjava-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.akarnokd</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>rxjava3-retrofit-adapter</artifactId> <artifactId>adapter-rxjava3</artifactId>
<version>3.0.0</version> <version>${retrofit-version}</version>
</dependency> </dependency>
{{/useRxJava3}} {{/useRxJava3}}
{{#jackson}} {{#jackson}}
@ -393,7 +393,7 @@
{{#usePlayWS}} {{#usePlayWS}}
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
{{/usePlayWS}} {{/usePlayWS}}
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.11.0</retrofit-version>
{{#useRxJava2}} {{#useRxJava2}}
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
{{/useRxJava2}} {{/useRxJava2}}

2
samples/client/petstore/java/retrofit2-play26/build.gradle
View File

@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.11.0"
jackson_version = "2.17.1" jackson_version = "2.17.1"
jackson_databind_version = "2.17.1" jackson_databind_version = "2.17.1"
javax_ws_rs_api_version = "2.1.1" javax_ws_rs_api_version = "2.1.1"

6
samples/client/petstore/java/retrofit2-play26/build.sbt
View File

@ -9,11 +9,11 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.11.0" % "compile",
"com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile", "com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
"jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile", "jakarta.validation" % "jakarta.validation-api" % "3.0.2" % "compile",
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-jackson" % "2.11.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-core" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-annotations" % "2.17.1" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile", "com.fasterxml.jackson.core" % "jackson-databind" % "2.17.1" % "compile",

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

@ -307,7 +307,7 @@
<jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version> <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
<javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version> <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
<play-version>2.6.7</play-version> <play-version>2.6.7</play-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.11.0</retrofit-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version> <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<beanvalidation-version>3.0.2</beanvalidation-version> <beanvalidation-version>3.0.2</beanvalidation-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

2
samples/client/petstore/java/retrofit2/build.gradle
View File

@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.11.0"
jakarta_annotation_version = "1.3.5" jakarta_annotation_version = "1.3.5"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "5.10.3" junit_version = "5.10.3"

6
samples/client/petstore/java/retrofit2/build.sbt
View File

@ -9,9 +9,9 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.11.0" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile", "io.gsonfire" % "gson-fire" % "1.9.0" % "compile",

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

@ -262,7 +262,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.9.0</gson-fire-version> <gson-fire-version>1.9.0</gson-fire-version>
<swagger-annotations-version>1.6.3</swagger-annotations-version> <swagger-annotations-version>1.6.3</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.11.0</retrofit-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version> <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>
<junit-version>5.10.3</junit-version> <junit-version>5.10.3</junit-version>

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

@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.11.0"
jakarta_annotation_version = "1.3.5" jakarta_annotation_version = "1.3.5"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "5.10.3" junit_version = "5.10.3"

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

@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava2" % "2.11.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile", "io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",

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

@ -272,7 +272,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.9.0</gson-fire-version> <gson-fire-version>1.9.0</gson-fire-version>
<swagger-annotations-version>1.6.3</swagger-annotations-version> <swagger-annotations-version>1.6.3</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.11.0</retrofit-version>
<rxjava-version>2.1.1</rxjava-version> <rxjava-version>2.1.1</rxjava-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version> <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

4
samples/client/petstore/java/retrofit2rx3/build.gradle
View File

@ -98,7 +98,7 @@ if(hasProperty('target') && target == 'android') {
ext { ext {
oltu_version = "1.0.1" oltu_version = "1.0.1"
retrofit_version = "2.3.0" retrofit_version = "2.11.0"
jakarta_annotation_version = "1.3.5" jakarta_annotation_version = "1.3.5"
swagger_annotations_version = "1.5.22" swagger_annotations_version = "1.5.22"
junit_version = "5.10.3" junit_version = "5.10.3"
@ -110,7 +110,7 @@ dependencies {
implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version" implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
implementation 'com.github.akarnokd:rxjava3-retrofit-adapter:3.0.0' implementation 'com.squareup.retrofit2:adapter-rxjava3:$$retrofit_version'
implementation "io.reactivex.rxjava3:rxjava:$rx_java_version" implementation "io.reactivex.rxjava3:rxjava:$rx_java_version"
implementation "io.swagger:swagger-annotations:$swagger_annotations_version" implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.google.code.findbugs:jsr305:3.0.2"

8
samples/client/petstore/java/retrofit2rx3/build.sbt
View File

@ -9,10 +9,10 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false, publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal, resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile", "com.squareup.retrofit2" % "retrofit" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-scalars" % "2.11.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile", "com.squareup.retrofit2" % "converter-gson" % "2.11.0" % "compile",
"com.github.akarnokd" % "rxjava3-retrofit-adapter" % "3.0.0" % "compile", "com.squareup.retrofit2" % "adapter-rxjava3" % "2.11.0" % "compile",
"io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile", "io.reactivex.rxjava3" % "rxjava" % "3.0.4" % "compile",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile", "io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile", "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",

8
samples/client/petstore/java/retrofit2rx3/pom.xml
View File

@ -247,9 +247,9 @@
<version>${rxjava-version}</version> <version>${rxjava-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.akarnokd</groupId> <groupId>com.squareup.retrofit2</groupId>
<artifactId>rxjava3-retrofit-adapter</artifactId> <artifactId>adapter-rxjava3</artifactId>
<version>3.0.0</version> <version>${retrofit-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.annotation</groupId> <groupId>jakarta.annotation</groupId>
@ -272,7 +272,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<gson-fire-version>1.9.0</gson-fire-version> <gson-fire-version>1.9.0</gson-fire-version>
<swagger-annotations-version>1.6.3</swagger-annotations-version> <swagger-annotations-version>1.6.3</swagger-annotations-version>
<retrofit-version>2.5.0</retrofit-version> <retrofit-version>2.11.0</retrofit-version>
<rxjava-version>3.0.4</rxjava-version> <rxjava-version>3.0.4</rxjava-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version> <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<oltu-version>1.0.1</oltu-version> <oltu-version>1.0.1</oltu-version>

2
samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -11,7 +11,7 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRe
import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder; import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder;
import retrofit2.Converter; import retrofit2.Converter;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory; import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;
import retrofit2.converter.scalars.ScalarsConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory;
import org.openapitools.client.auth.HttpBasicAuth; import org.openapitools.client.auth.HttpBasicAuth;