Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JAVA] RxJava3 support #6622

Merged
merged 3 commits into from
Jun 12, 2020
Merged

[JAVA] RxJava3 support #6622

merged 3 commits into from
Jun 12, 2020

Conversation

tgerth
Copy link
Contributor

@tgerth tgerth commented Jun 11, 2020

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@tgerth tgerth changed the title rx3 support [JAVA] RxJava3 support Jun 11, 2020
@wing328
Copy link
Member

wing328 commented Jun 11, 2020

@tgerth thanks for the PR. Can you please remove the tabs with 4-space?

$ /bin/bash ./bin/utils/detect_tab_in_java_class.sh
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:		    LOGGER.warn("You specified all RxJava versions 1, 2 and 3 but they are mutually exclusive. Defaulting to v3.");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:		    this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:		}else {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:		    if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA2)){
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:			    LOGGER.warn("You specified both RxJava versions 1 and 2 but they are mutually exclusive. Defaulting to v2.");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:			    this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString()));
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:		    }else if (additionalProperties.containsKey(USE_RX_JAVA) && additionalProperties.containsKey(USE_RX_JAVA3)) {
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:			    LOGGER.warn("You specified both RxJava versions 1 and 3 but they are mutually exclusive. Defaulting to v3.");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        	    LOGGER.warn("You specified both RxJava versions 2 and 3 but they are mutually exclusive. Defaulting to v3.");
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        	    if(additionalProperties.containsKey(USE_RX_JAVA)){
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		    this.setUseRxJava(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA).toString()));
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		if(additionalProperties.containsKey(USE_RX_JAVA2)){
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		    this.setUseRxJava2(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA2).toString()));
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		}
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		if(additionalProperties.containsKey(USE_RX_JAVA3)){
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		    this.setUseRxJava3(Boolean.valueOf(additionalProperties.get(USE_RX_JAVA3).toString()));
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java:        		}
Java files contain tab '\t'. Please remove it and try again.

@wing328
Copy link
Member

wing328 commented Jun 11, 2020

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested samples/client/petstore/java/retrofit2rx3 locally and the result is good. Will merge when all the CI tests pass

@wing328
Copy link
Member

wing328 commented Jun 12, 2020

Will fix the outdated samples in a separate commit.

UPDATE: pushed f092b98

@wing328 wing328 merged commit 146bfeb into OpenAPITools:master Jun 12, 2020
@tgerth tgerth deleted the issue-6621 branch June 12, 2020 11:01
@tgerth tgerth mentioned this pull request Jul 2, 2020
5 tasks
@tgerth tgerth mentioned this pull request Jul 20, 2020
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants