Skip to content

[kotlin] add more tests to cover nonPublicApi, explicitApi options#23864

Merged
wing328 merged 3 commits into
masterfrom
follow-up-23796
May 24, 2026
Merged

[kotlin] add more tests to cover nonPublicApi, explicitApi options#23864
wing328 merged 3 commits into
masterfrom
follow-up-23796

Conversation

@wing328
Copy link
Copy Markdown
Member

@wing328 wing328 commented May 24, 2026

a follow up pr to #23796

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 || 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.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR solves a reported issue, reference it using GitHub's linking syntax (e.g., having "fixes #123" present in the PR description)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

Summary by cubic

Add Kotlin client samples and tests for non-discriminator oneOf/anyOf using kotlinx-serialization, covering both explicitApi and nonPublicApi, and update CI to build and verify them. This validates generateOneOfAnyOfWrappers and prevents regressions in the Kotlin generator.

  • New Features

    • Added two sample projects: kotlin-oneOf-anyOf-kotlinx-serialization-explicitApi and kotlin-oneOf-anyOf-kotlinx-serialization-nonPublicApi.
    • New configs in bin/configs/ with library=jvm-retrofit2, dateLibrary=java8, enumUnknownDefaultCase=true, serializationLibrary=kotlinx_serialization, and generateOneOfAnyOfWrappers=true (plus explicitApi or nonPublicApi).
    • Included generated models/APIs, adapters, Gradle setup, and tests to exercise oneOf/anyOf wrappers across model, primitive, and array types.
  • CI

    • Updated .github/workflows/samples-kotlin-client.yaml to include:
      • samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization*/**
      • samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization*/**
    • Ensures push and PR workflows build and check the new samples.

Written for commit 506e2ce. Summary will update on new commits. Review in cubic

@wing328 wing328 modified the milestones: 8.0.0, 7.23.0 May 24, 2026
@wing328 wing328 changed the title Follow up 23796 [kotlin] add more tests to cover nonPublicApi, explicitApi options May 24, 2026
@wing328 wing328 marked this pull request as ready for review May 24, 2026 07:15
@wing328 wing328 merged commit 9a6fa8c into master May 24, 2026
69 checks passed
@wing328 wing328 deleted the follow-up-23796 branch May 24, 2026 07:15
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.

1 participant