Skip to content

Commit

Permalink
Decommission Retrofit play24, play25 (#6665)
Browse files Browse the repository at this point in the history
* deco play24, play25 in retrofit

* update pom.xml

* update doc
  • Loading branch information
wing328 authored Jun 16, 2020
1 parent c094eff commit 6f2e84d
Show file tree
Hide file tree
Showing 379 changed files with 5 additions and 41,518 deletions.
12 changes: 0 additions & 12 deletions bin/configs/java-retrofit2-play24.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions bin/configs/java-retrofit2-play25.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/generators/java.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ sidebar_label: java
|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|performBeanValidation|Perform BeanValidation| |false|
|playVersion|Version of Play! Framework (possible values "play24", "play25" (default), "play26")| |null|
|playVersion|Version of Play! Framework (possible values "play24" (Deprecated), "play25" (Deprecated), "play26" (Default))| |null|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
// (mustache does not allow for boolean operators so we need this extra field)
protected boolean doNotUseRx = true;
protected boolean usePlayWS = false;
protected String playVersion = PLAY_25;
protected String playVersion = PLAY_26;
protected String feignVersion = FEIGN_10;
protected boolean asyncNative = false;
protected boolean parcelableModel = false;
Expand Down Expand Up @@ -136,7 +136,7 @@ public JavaClientCodegen() {
cliOptions.add(CliOption.newBoolean(USE_RX_JAVA3, "Whether to use the RxJava3 adapter with the retrofit2 library."));
cliOptions.add(CliOption.newBoolean(PARCELABLE_MODEL, "Whether to generate models for Android that implement Parcelable with the okhttp-gson library."));
cliOptions.add(CliOption.newBoolean(USE_PLAY_WS, "Use Play! Async HTTP client (Play WS API)"));
cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\", \"play25\" (default), \"play26\")"));
cliOptions.add(CliOption.newString(PLAY_VERSION, "Version of Play! Framework (possible values \"play24\" (Deprecated), \"play25\" (Deprecated), \"play26\" (Default))"));
cliOptions.add(CliOption.newBoolean(SUPPORT_JAVA6, "Whether to support Java6 with the Jersey1 library. This option has been deprecated and will be removed in the 5.x release"));
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations"));
cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Perform BeanValidation"));
Expand Down Expand Up @@ -470,6 +470,7 @@ public void processOpts() {
apiTemplateFiles.remove("api.mustache");

if (PLAY_24.equals(playVersion)) {
LOGGER.warn("`play24` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
additionalProperties.put(PLAY_24, true);
apiTemplateFiles.put("play24/api.mustache", ".java");

Expand All @@ -480,6 +481,7 @@ public void processOpts() {
}

if (PLAY_25.equals(playVersion)) {
LOGGER.warn("`play25` option has been deprecated and will be removed in the 5.x release. Please use `play26` instead.");
additionalProperties.put(PLAY_25, true);
apiTemplateFiles.put("play25/api.mustache", ".java");

Expand Down
1 change: 0 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,6 @@
<module>samples/client/petstore/java/retrofit2</module>
<module>samples/client/petstore/java/retrofit2rx2</module>
<module>samples/client/petstore/java/retrofit2rx3</module>
<module>samples/client/petstore/java/retrofit2-play25</module>
<module>samples/client/petstore/java/retrofit2-play26</module>
<module>samples/client/petstore/jaxrs-cxf-client</module>
<module>samples/client/petstore/java/resttemplate</module>
Expand Down
21 changes: 0 additions & 21 deletions samples/client/petstore/java/retrofit2-play24/.gitignore

This file was deleted.

This file was deleted.

131 changes: 0 additions & 131 deletions samples/client/petstore/java/retrofit2-play24/.openapi-generator/FILES

This file was deleted.

This file was deleted.

22 changes: 0 additions & 22 deletions samples/client/petstore/java/retrofit2-play24/.travis.yml

This file was deleted.

39 changes: 0 additions & 39 deletions samples/client/petstore/java/retrofit2-play24/README.md

This file was deleted.

Loading

0 comments on commit 6f2e84d

Please sign in to comment.