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

Remove JSON.java from openapi ignore file. #2818

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Remove JSON.java from openapi ignore file. #2818

merged 1 commit into from
Oct 19, 2023

Conversation

brendandburns
Copy link
Contributor

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 5, 2023
@yue9944882
Copy link
Member

telling from the comment, looks like we're stopping JSON generation due to the following two PRs:

@yue9944882
Copy link
Member

yue9944882 commented Oct 6, 2023

since we just bumped root version to 20.0.0-SNAPSHOT, we can try a code generation based on this PR to see if this is backward compatible. @brendandburns is there any other driver we want to refresh this JSON file generation?

@brendandburns
Copy link
Contributor Author

@yue9944882 there were changes in the 6.x version of the generator which make this file (generated by 4,x) incompatible with the newly generated code. So this change is definitely necessary. We may have to backport these fixes too if we want to.

But yes, let's give it a try.

@yue9944882
Copy link
Member

@brendandburns trying to pinpoint that incompatibility introduced. but it looks the last commit in the generator upstream was one year ago:

https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache

so we're probably already using 6.x generator for a while, can you help me understand which part broke the compatibilty? 🤔

@brendandburns
Copy link
Contributor Author

We've been previously locked on the 4.x release of the project, the PR to change that only merged in August:

https://github.com/kubernetes-client/gen/pull/247/files

That PR was done in an effort to migrate to jakarta.annotation instead of javax.annotation

@yue9944882
Copy link
Member

@brendandburns gotcha, as a follow-up of this. i will cherry-pick the two PRs onto 6.x generated source code

Copy link
Member

@yue9944882 yue9944882 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 19, 2023
@k8s-ci-robot k8s-ci-robot merged commit fe52cb3 into master Oct 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants