[Java][jaxrs] support disableDiscriminatorJsonIgnoreProperties in typeInfoAnnotation

Merged
AN
4mo ago
+74-3

Align modules/openapi-generator/src/main/resources/JavaJaxRS/spec/typeInfoAnnotation.mustache
with the behavior already implemented in modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache.

This adds disableDiscriminatorJsonIgnoreProperties support to jaxrs-spec:

  • false (default): keep existing behavior
  • true: omit generated @JsonIgnoreProperties and use JsonTypeInfo.As.EXISTING_PROPERTY

This is the same pattern introduced for Java in:

This allows us to add a custom @JsonIgnoreProperties annotation via
additionalModelTypeAnnotations, which is currently possible because Jackson does not
allow duplicate @JsonIgnoreProperties annotations.

PR checklist

  • Read the contribution guidelines.
  • Run the following to build the project and update samples: 
    ./mvnw clean package || exit
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
./bin/utils/export_docs_generators.sh || exit
    (For Windows users, please run the script in WSL)
    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.
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

cc Java technical committee: @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) @KannaKim (2026/07)

Summary by cubic

Add support for disableDiscriminatorJsonIgnoreProperties in jaxrs-spec typeInfoAnnotation to match the Java generator. Default behavior is unchanged; when enabled, it omits @JsonIgnoreProperties and uses JsonTypeInfo.As.EXISTING_PROPERTY to allow custom annotations.

  • New Features

    • Honor disableDiscriminatorJsonIgnoreProperties (default: false).
    • If true: omit @JsonIgnoreProperties; use JsonTypeInfo.As.EXISTING_PROPERTY.
    • Added tests covering both modes.

  • Dependencies

    • Updated kotlin-spring-cloud-4 sample to Jackson 3.1.5.
    • Bumped Gradle wrapper to 8.14.5.