Skip to content

Conversation

@hhomar
Copy link
Contributor

@hhomar hhomar commented Nov 18, 2023

This is a followup to #16929 to fix the compilation errors with the java ok-http-gson. I also tested compilation against all java libraries.

The modelEnum template needed an additional update to CodegenModel to check if the format is set as a URI as the isUri check was returning false. I followed the same code as isUuid, but noticed a comment in DefaultCodeGen about UUID being a rare use case and may be removed in future DefaultCodegen.java#L3031, so I don't know if this change is the best approach.

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    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/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @martin-mfg (2023/08)

@wing328
Copy link
Member

wing328 commented Nov 19, 2023

thanks for the PR

cc @OpenAPITools/generator-core-team

@wing328
Copy link
Member

wing328 commented Dec 11, 2023

can you please resolve the merge conflicts when you've time?

@hhomar
Copy link
Contributor Author

hhomar commented Dec 11, 2023

Conflict resolved.

private boolean hasDiscriminatorWithNonEmptyMapping;
private boolean isAnyType;
private boolean isUuid;
private boolean isUri;
Copy link
Member

Choose a reason for hiding this comment

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

FYI @OpenAPITools/generator-core-team

@wing328
Copy link
Member

wing328 commented Dec 13, 2023

tested locally to confirm the fix. thanks for the PR

@wing328 wing328 changed the title Java uri enum fixes Fix issue with URI type in the enum Dec 13, 2023
@wing328 wing328 merged commit 28b2c75 into OpenAPITools:master Dec 13, 2023
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