Skip to content

Commit 3ed6343

Browse files
wing328wing328
authored
remove deprecated options in java client generator (#11456)
1 parent 91087b5 commit 3ed6343

File tree

14 files changed

+21
-166
lines changed

14 files changed

+21
-166
lines changed

‎docs/generators/java.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6262
|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
6363
|parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
6464
|performBeanValidation|Perform BeanValidation| |false|
65-
|playVersion|Version of Play! Framework (possible values "play24" (Deprecated), "play25" (Deprecated), "play26" (Default))| |null|
6665
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
6766
|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
6867
|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
@@ -81,9 +80,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
8180
|usePlayWS|Use Play! Async HTTP client (Play WS API)| |false|
8281
|useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
8382
|useRuntimeException|Use RuntimeException instead of Exception| |false|
84-
|useRxJava|Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated and will be removed in the 5.x release.| |false|
85-
|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library.| |false|
86-
|useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false|
83+
|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
84+
|useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
8785
|withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
8886

8987
## IMPORT MAPPING

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java

Lines changed: 11 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen
4949

5050
private final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class);
5151

52-
public static final String USE_RX_JAVA = "useRxJava";
5352
public static final String USE_RX_JAVA2 = "useRxJava2";
5453
public static final String USE_RX_JAVA3 = "useRxJava3";
5554
public static final String DO_NOT_USE_RX = "doNotUseRx";
5655
public static final String USE_PLAY_WS = "usePlayWS";
57-
public static final String PLAY_VERSION = "playVersion";
5856
public static final String ASYNC_NATIVE = "asyncNative";
5957
public static final String CONFIG_KEY = "configKey";
6058
public static final String PARCELABLE_MODEL = "parcelableModel";
@@ -69,10 +67,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
6967
public static final String ERROR_OBJECT_TYPE= "errorObjectType";
7068
public static final String ERROR_OBJECT_SUBTYPE= "errorObjectSubtype";
7169

72-
public static final String PLAY_24 = "play24";
73-
public static final String PLAY_25 = "play25";
74-
public static final String PLAY_26 = "play26";
75-
7670
public static final String MICROPROFILE_DEFAULT = "default";
7771
public static final String MICROPROFILE_KUMULUZEE = "kumuluzee";
7872

@@ -104,7 +98,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
10498
// (mustache does not allow for boolean operators so we need this extra field)
10599
protected boolean doNotUseRx = true;
106100
protected boolean usePlayWS = false;
107-
protected String playVersion = PLAY_26;
108101
protected String microprofileFramework = MICROPROFILE_DEFAULT;
109102
protected String configKey = null;
110103

@@ -149,12 +142,10 @@ public JavaClientCodegen() {
149142

150143
modelTestTemplateFiles.put("model_test.mustache", ".java");
151144

152-
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA, "Whether to use the RxJava adapter with the retrofit2 library. IMPORTANT: this option has been deprecated and will be removed in the 5.x release."));
153-
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA2, "Whether to use the RxJava2 adapter with the retrofit2 library."));
154-
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA3, "Whether to use the RxJava3 adapter with the retrofit2 library."));
145+
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA2, "Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated."));
146+
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA3, "Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated."));
155147
cliOptions.add(CliOption.newBoolean(PARCELABLE_MODEL, "Whether to generate models for Android that implement Parcelable with the okhttp-gson library."));
156148
cliOptions.add(CliOption.newBoolean(USE_PLAY_WS, "Use Play! Async HTTP client (Play WS API)"));
157-
cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\" (Deprecated), \"play25\" (Deprecated), \"play26\" (Default))"));
158149
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
159150
cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
160151
cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
@@ -241,23 +232,14 @@ public void processOpts() {
241232
super.processOpts();
242233

243234
// RxJava
244-
if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
245-
LOGGER.warn("You specified all RxJava versions 1, 2 and 3 but they are mutually exclusive. Defaulting to v3.");
235+
if (additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
236+
LOGGER.warn("You specified all RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3.");
246237
this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
247238
} else {
248-
if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)) {
249-
LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");
250-
this.setUseRxJava2(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA2).toString()));
251-
} else if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA3)) {
252-
LOGGER.warn("You specified both RxJava versions 1 and 3 but they are mutually exclusive. Defaulting to v3.");
253-
this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
254-
} else if (additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
239+
if (additionalProperties.containsKey(USE_RX_JAVA2) && additionalProperties.containsKey(USE_RX_JAVA3)) {
255240
LOGGER.warn("You specified both RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3.");
256241
this.setUseRxJava3(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA3).toString()));
257242
} else {
258-
if (additionalProperties.containsKey(USE_RX_JAVA)) {
259-
this.setUseRxJava(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA).toString()));
260-
}
261243
if (additionalProperties.containsKey(USE_RX_JAVA2)) {
262244
this.setUseRxJava2(Boolean.parseBoolean(additionalProperties.get(USE_RX_JAVA2).toString()));
263245
}
@@ -277,11 +259,6 @@ public void processOpts() {
277259
}
278260
additionalProperties.put(USE_PLAY_WS, usePlayWS);
279261

280-
if (additionalProperties.containsKey(PLAY_VERSION)) {
281-
this.setPlayVersion(additionalProperties.get(PLAY_VERSION).toString());
282-
}
283-
additionalProperties.put(PLAY_VERSION, playVersion);
284-
285262
// Microprofile framework
286263
if (additionalProperties.containsKey(MICROPROFILE_FRAMEWORK)) {
287264
if (!MICROPROFILE_KUMULUZEE.equals(microprofileFramework)) {
@@ -560,40 +537,13 @@ public void processOpts() {
560537
}
561538

562539
apiTemplateFiles.remove("api.mustache");
540+
apiTemplateFiles.put("play26/api.mustache", ".java");
563541

564-
if (PLAY_24.equals(playVersion)) {
565-
LOGGER.warn("`play24` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
566-
additionalProperties.put(PLAY_24, true);
567-
apiTemplateFiles.put("play24/api.mustache", ".java");
568-
569-
supportingFiles.add(new SupportingFile("play24/ApiClient.mustache", invokerFolder, "ApiClient.java"));
570-
supportingFiles.add(new SupportingFile("play24/Play24CallFactory.mustache", invokerFolder, "Play24CallFactory.java"));
571-
supportingFiles.add(new SupportingFile("play24/Play24CallAdapterFactory.mustache", invokerFolder,
572-
"Play24CallAdapterFactory.java"));
573-
}
574-
575-
if (PLAY_25.equals(playVersion)) {
576-
LOGGER.warn("`play25` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
577-
additionalProperties.put(PLAY_25, true);
578-
apiTemplateFiles.put("play25/api.mustache", ".java");
579-
580-
supportingFiles.add(new SupportingFile("play25/ApiClient.mustache", invokerFolder, "ApiClient.java"));
581-
supportingFiles.add(new SupportingFile("play25/Play25CallFactory.mustache", invokerFolder, "Play25CallFactory.java"));
582-
supportingFiles.add(new SupportingFile("play25/Play25CallAdapterFactory.mustache", invokerFolder,
583-
"Play25CallAdapterFactory.java"));
584-
setJava8ModeAndAdditionalProperties(true);
585-
}
586-
587-
if (PLAY_26.equals(playVersion)) {
588-
additionalProperties.put(PLAY_26, true);
589-
apiTemplateFiles.put("play26/api.mustache", ".java");
590-
591-
supportingFiles.add(new SupportingFile("play26/ApiClient.mustache", invokerFolder, "ApiClient.java"));
592-
supportingFiles.add(new SupportingFile("play26/Play26CallFactory.mustache", invokerFolder, "Play26CallFactory.java"));
593-
supportingFiles.add(new SupportingFile("play26/Play26CallAdapterFactory.mustache", invokerFolder,
594-
"Play26CallAdapterFactory.java"));
595-
setJava8ModeAndAdditionalProperties(true);
596-
}
542+
supportingFiles.add(new SupportingFile("play26/ApiClient.mustache", invokerFolder, "ApiClient.java"));
543+
supportingFiles.add(new SupportingFile("play26/Play26CallFactory.mustache", invokerFolder, "Play26CallFactory.java"));
544+
supportingFiles.add(new SupportingFile("play26/Play26CallAdapterFactory.mustache", invokerFolder,
545+
"Play26CallAdapterFactory.java"));
546+
setJava8ModeAndAdditionalProperties(true);
597547

598548
supportingFiles.add(new SupportingFile("play-common/auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
599549
supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
@@ -989,10 +939,6 @@ public void setUsePlayWS(boolean usePlayWS) {
989939
this.usePlayWS = usePlayWS;
990940
}
991941

992-
public void setPlayVersion(String playVersion) {
993-
this.playVersion = playVersion;
994-
}
995-
996942
public void setAsyncNative(boolean asyncNative) {
997943
this.asyncNative = asyncNative;
998944
}

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ import org.threeten.bp.format.DateTimeFormatter;
1919
{{/threetenbp}}
2020
import retrofit2.Converter;
2121
import retrofit2.Retrofit;
22-
{{#useRxJava}}
23-
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
24-
{{/useRxJava}}
2522
{{#useRxJava2}}
2623
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
2724
{{/useRxJava2}}
@@ -157,9 +154,6 @@ public class ApiClient {
157154
adapterBuilder = new Retrofit
158155
.Builder()
159156
.baseUrl(baseUrl)
160-
{{#useRxJava}}
161-
.addCallAdapterFactory(RxJavaCallAdapterFactory.create())
162-
{{/useRxJava}}
163157
{{#useRxJava2}}
164158
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
165159
{{/useRxJava2}}

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/api.mustache

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ package {{package}};
22

33
import {{invokerPackage}}.CollectionFormats.*;
44

5-
{{#useRxJava}}
6-
import rx.Observable;
7-
{{/useRxJava}}
85
{{#useRxJava2}}
96
import io.reactivex.Observable;
107
{{/useRxJava2}}
@@ -47,7 +44,7 @@ public interface {{classname}} {
4744
{{#allParams}}
4845
* @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/required}}
4946
{{/allParams}}
50-
* @return {{^doNotUseRx}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}}
47+
* @return {{^doNotUseRx}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{returnType}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}}
5148
{{#isDeprecated}}
5249
* @deprecated
5350
{{/isDeprecated}}
@@ -74,7 +71,7 @@ public interface {{classname}} {
7471
{{/prioritizedContentTypes}}
7572
{{/formParams}}
7673
@{{httpMethod}}("{{{path}}}")
77-
{{^doNotUseRx}}{{#useRxJava}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/useRxJava}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}} {{operationId}}({{^allParams}});{{/allParams}}
74+
{{^doNotUseRx}}{{#useRxJava2}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava2}}{{#useRxJava3}}{{#returnType}}Observable<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}>{{/returnType}}{{^returnType}}Completable{{/returnType}}{{/useRxJava3}}{{/doNotUseRx}}{{#doNotUseRx}}Call<{{#isResponseFile}}ResponseBody{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{^returnType}}Void{{/returnType}}{{/isResponseFile}}>{{/doNotUseRx}} {{operationId}}({{^allParams}});{{/allParams}}
7875
{{#allParams}}{{>libraries/retrofit2/queryParams}}{{>libraries/retrofit2/pathParams}}{{>libraries/retrofit2/headerParams}}{{>libraries/retrofit2/bodyParams}}{{>libraries/retrofit2/formParams}}{{^-last}}, {{/-last}}{{#-last}}
7976
);{{/-last}}{{/allParams}}
8077

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,10 @@ ext {
118118
jackson_databind_nullable_version = "0.2.2"
119119
{{/openApiNullable}}
120120
jakarta_annotation_version = "1.3.5"
121-
{{#play24}}
122-
play_version = "2.4.11"
123-
{{/play24}}
124-
{{#play25}}
125-
play_version = "2.5.14"
126-
{{/play25}}
127-
{{#play26}}
128121
play_version = "2.6.7"
129-
{{/play26}}
130122
{{/usePlayWS}}
131123
swagger_annotations_version = "1.5.22"
132124
junit_version = "4.13.1"
133-
{{#useRxJava}}
134-
rx_java_version = "1.3.0"
135-
{{/useRxJava}}
136125
{{#useRxJava2}}
137126
rx_java_version = "2.1.1"
138127
{{/useRxJava2}}
@@ -152,10 +141,6 @@ dependencies {
152141
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
153142
implementation "com.squareup.retrofit2:converter-scalars:$retrofit_version"
154143
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
155-
{{#useRxJava}}
156-
implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
157-
implementation "io.reactivex:rxjava:$rx_java_version"
158-
{{/useRxJava}}
159144
{{#useRxJava2}}
160145
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
161146
implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
@@ -177,13 +162,8 @@ dependencies {
177162
implementation "org.threeten:threetenbp:$threetenbp_version"
178163
{{/threetenbp}}
179164
{{#usePlayWS}}
180-
{{#play26}}
181165
implementation "com.typesafe.play:play-ahc-ws_2.12:$play_version"
182166
implementation "jakarta.validation:jakarta.validation-api:2.0.2"
183-
{{/play26}}
184-
{{^play26}}
185-
implementation "com.typesafe.play:play-java-ws_2.11:$play_version"
186-
{{/play26}}
187167
implementation "com.squareup.retrofit2:converter-jackson:$retrofit_version"
188168
implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
189169
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,13 @@ lazy val root = (project in file(".")).
1515
"com.squareup.retrofit2" % "converter-gson" % "2.3.0" % "compile",
1616
{{/usePlayWS}}
1717
{{#usePlayWS}}
18-
{{#play24}}
19-
"com.typesafe.play" % "play-java-ws_2.11" % "2.4.11" % "compile",
20-
{{/play24}}
21-
{{#play25}}
22-
"com.typesafe.play" % "play-java-ws_2.11" % "2.5.15" % "compile",
23-
{{/play25}}
24-
{{#play26}}
2518
"com.typesafe.play" % "play-ahc-ws_2.12" % "2.6.7" % "compile",
2619
"jakarta.validation" % "jakarta.validation-api" % "2.0.2" % "compile",
27-
{{/play26}}
2820
"com.squareup.retrofit2" % "converter-jackson" % "2.3.0" % "compile",
2921
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile",
3022
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile",
3123
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile",
3224
{{/usePlayWS}}
33-
{{#useRxJava}}
34-
"com.squareup.retrofit2" % "adapter-rxjava" % "2.3.0" % "compile",
35-
"io.reactivex" % "rxjava" % "1.3.0" % "compile",
36-
{{/useRxJava}}
3725
{{#useRxJava2}}
3826
"com.squareup.retrofit2" % "adapter-rxjava2" % "2.3.0" % "compile",
3927
"io.reactivex.rxjava2" % "rxjava" % "2.1.1" % "compile",

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ package {{package}};
22

33
import {{invokerPackage}}.CollectionFormats.*;
44

5-
{{#useRxJava}}import rx.Observable;{{/useRxJava}}
6-
{{#useRxJava2}}import io.reactivex.Observable;{{/useRxJava2}}
7-
{{#doNotUseRx}}import retrofit2.Call;{{/doNotUseRx}}
5+
{{#useRxJava2}}
6+
import io.reactivex.Observable;
7+
{{/useRxJava2}}
8+
{{#doNotUseRx}}
9+
import retrofit2.Call;
10+
{{/doNotUseRx}}
811
import retrofit2.http.*;
912

1013
import okhttp3.RequestBody;

0 commit comments

Comments
 (0)