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

fix(spring): fix method javadoc missing @param and @return #1226

Merged
merged 4 commits into from
Jan 10, 2023

Conversation

zhumin8
Copy link
Contributor

@zhumin8 zhumin8 commented Jan 6, 2023

Adds @param and @return to method javadoc comments in generated autoconfiguration classes.
Also adding a change to JavaDocComment to enable @return in comment. (this change in 537e33c can be copied to main branch of gapic-generator-java if useful.)

@zhumin8 zhumin8 marked this pull request as ready for review January 6, 2023 20:33
@zhumin8 zhumin8 requested a review from a team as a code owner January 6, 2023 20:33
@zhumin8 zhumin8 added the spring pr that's related to spring code gen, intend to merge into autoconfig-gen-draft2 branch. label Jan 6, 2023
componentsList.addAll(paramsList);
if (!Strings.isNullOrEmpty(returnText)) {
componentsList.add(String.format("@return %s", returnText));
Copy link
Contributor

Choose a reason for hiding this comment

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

This is great, and will be a big win for for the main branch. Any chance we could get this implemented in main, then merge the update from main into autoconfig-gen-draft2? (It may not be that simple, though -- since it looks like this branch still has to sync with the multimodule update.)

Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this cause a large scale change in the golden files, or am I misunderstanding the scope of this change?

Copy link
Contributor

Choose a reason for hiding this comment

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

@burkedavison with the multimodule update, it's not too feasible to merge main into autoconfig-gen-draft2 (which will always stay as a separate branch) - but copying the relevant changes in a separate PR to main might be the easier way to go here?

(For context: have a similar commit in this situation as part of #1208 - given that spring codegen plans to eventually move to use the gapic-generator-java jar, these changes do also need to be made in main; we are adding them directly to the spring branch for now given the current repo structure divergence.)

Copy link
Collaborator

Choose a reason for hiding this comment

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

This change is enabling us to add @return to the JavaDocs. You would still need to set returnText in the composers class for each method to actually generate the JavaDocs.
@burkedavison We decided that the SpringCodeGen will continue to work on a branch until preview release to prevent disruptions. That being said, I agree this change is important to the main branch as well and we should backport it, @zhumin8 can you please add it to the TODO list? We can create a PR against main with just this change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for clarifying!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do!

Copy link
Contributor

@diegomarquezp diegomarquezp left a comment

Choose a reason for hiding this comment

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

Nice!

Copy link
Contributor

@emmileaf emmileaf left a comment

Choose a reason for hiding this comment

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

One small test comment fix, otherwise LGTM!

Co-authored-by: Emily Wang <emmwang@google.com>
@sonarcloud
Copy link

sonarcloud bot commented Jan 9, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

82.4% 82.4% Coverage
0.0% 0.0% Duplication

@zhumin8 zhumin8 merged commit 31d4406 into autoconfig-gen-draft2 Jan 10, 2023
@zhumin8 zhumin8 deleted the javadoc-params branch January 10, 2023 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
spring pr that's related to spring code gen, intend to merge into autoconfig-gen-draft2 branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants