Fix duplicate inherited discriminators in Java models by XiaofeiCao · Pull Request #11824 · microsoft/typespec

Xiaofei Cao (XiaofeiCao) · 2026-09-02T09:54:47Z

Summary

merge redundant leaf discriminator declarations with propagated parent discriminators
validate that duplicate declarations have matching constant values and Java types
emit fixed propagated discriminator fields as final without changing shared serialization behavior
regenerate Java clientcore and generator-test golden models

Testing

Java generator build
Java emitter build
generator core tests (53 passed)
full http-client-generator-clientcore-test/Generate.ps1 regeneration
full http-client-generator-test/Generate.ps1 regeneration
generated the Foundry Agents service spec from Java emitter generates duplicate fixed discriminator members in Realtime message leaves #11802, including a partial-update pass, and compiled all 496 Java sources with Java 17
Java formatting and lint checks

Merge redundant leaf discriminator declarations with propagated parent discriminators and preserve fixed discriminator fields as final. Fixes microsoft#11802 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

github-actions · 2026-09-02T09:59:07Z

All changed packages have been documented.

✅ @typespec/http-client-java

Show changes

`@typespec/http-client-java` - fix ✏️

Prevent duplicate Java discriminator members while preserving inherited discriminators in stream-style XML serialization.

azure-sdk-automation · 2026-09-02T10:21:21Z

You can try these changes here

🛝 Playground	🌐 Website	🛝 VSCode Extension

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

Keep active discriminators mutable so unknown values can round-trip through fallback deserialization, while fixed ancestor branch discriminators remain final. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

Copilot

🟢 Approval recommended

The changes are well-scoped to discriminator propagation/emission, include validation, and add/regenerate coverage via golden models for the reported edge case.

Pull request overview

Fixes Java model generation for nested polymorphic discriminators by merging redundant leaf discriminator declarations with propagated parent discriminators, preventing duplicate fields/accessors and making fixed inherited discriminators final where safe.

Changes:

Merge same-serialized-name discriminator properties during parent-discriminator propagation, with validation that constant value and types match.
Emit inherited fixed discriminator fields as final (while keeping the active discriminator mutable to preserve unknown values on fallback deserialization).
Add a discriminator edge-case TypeSpec scenario and regenerate Java golden outputs (generator-test and clientcore-test).

File summaries

File	Description
packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java	Propagates parent discriminators as constant and merges duplicate child declarations to avoid duplicate emission.
packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/implementation/PolymorphicDiscriminatorHandler.java	Makes fixed inherited discriminators `final` when they aren’t the active discriminator.
packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/implementation/ClientModelPropertiesManager.java	Treats merged parent discriminators as masking ancestor properties during property management.
packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/template/ModelTemplate.java	Ensures super-constructor argument resolution can see propagated parent discriminators.
packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp	Adds a nested discriminator + duplicate leaf discriminator scenario to exercise merging behavior.
packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-discriminatoredgecases_metadata.json	Regenerated metadata to include new discriminator edge-case models.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/GrandChildWithNestedDiscriminator.java	New golden model for nested discriminator hierarchy.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/GreatGrandChildWithDuplicateDiscriminator.java	New golden leaf model that repeats propagated discriminator to validate merging.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/discriminatoredgecases/models/ChildWithRequiredPropertyAsDiscriminator.java	Regenerated subtype dispatch to include the new nested discriminator branch.
packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/models/Shark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/models/SawShark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/type/model/inheritance/nesteddiscriminator/models/GoblinShark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/models/Shark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/patch/models/SawShark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/models/Shark.java	Regenerated golden: fixed discriminator enum field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/models/SawShark.java	Regenerated golden: fixed discriminator enum field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/enumnesteddiscriminator/models/GoblinShark.java	Regenerated golden: fixed discriminator enum field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Shark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java	Regenerated golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/model/inheritance/nesteddiscriminator/Shark.java	Regenerated clientcore golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/model/inheritance/nesteddiscriminator/SawShark.java	Regenerated clientcore golden: fixed discriminator field becomes `final`.
packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/type/model/inheritance/nesteddiscriminator/GoblinShark.java	Regenerated clientcore golden: fixed discriminator field becomes `final`.
.chronus/changes/fix-java-duplicate-discriminators-2026-09-02.md	Changelog entry for the generator fix.

Review details

Files reviewed: 24/24 changed files
Comments generated: 1
Review effort level: Lite

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Advance the pinned core commit to the latest microsoft/typespec#11824 head and resync its discriminator regression fixtures. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 00e7fd30-d342-4b5a-ad7e-f16198c7dbde

Advance to the latest microsoft/typespec#11824 commit and sync its XML discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Copilot

🔵 Needs a closer look

Core generator logic for polymorphic discriminator propagation and XML stream serialization is subtly behavior-affecting and should get a final human review despite tests/regenerations passing.

Review details

Files reviewed: 23/23 changed files
Comments generated: 1
Review effort level: Lite

Keep merged fixed discriminators in parentPolymorphicDiscriminators so JSON, constructors, and XML share one canonical representation. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 00e7fd30-d342-4b5a-ad7e-f16198c7dbde

Advance to the latest microsoft/typespec#11824 commit and sync the restored propagated discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Copilot

🔵 Needs a closer look

It changes core polymorphic discriminator mapping and stream-style XML (de)serialization behavior, which can have broad downstream impact beyond the regenerated golden baselines.

Review details

Files reviewed: 28/28 changed files
Comments generated: 0 new
Review effort level: Lite

Pin the Java emitter to microsoft/typespec#11824 and sync its inherited discriminator regression case. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance the pinned core commit to the latest microsoft/typespec#11824 head and resync its discriminator regression fixtures. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance to the latest microsoft/typespec#11824 commit and sync its XML discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance to the latest microsoft/typespec#11824 commit and sync the restored propagated discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Explain nested discriminator propagation with a concrete type and role example, including why matching child properties are removed from normal model properties. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e6933b7d-0cee-4855-a585-2e15b24c70c5

Copilot

🔵 Needs a closer look

It changes core Java model-mapping and stream-style XML polymorphism logic, so a final human review is warranted to validate broader compatibility beyond the updated golden outputs and described test runs.

Review details

Files reviewed: 28/28 changed files
Comments generated: 0 new
Review effort level: Lite

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf17f8b53d

Copilot

🔵 Needs a closer look

It changes core Java codegen behavior for polymorphic discriminator propagation and stream-style XML/JSON serialization across regenerated golden outputs, warranting a final human validation pass.

Review details

Files reviewed: 38/38 changed files
Comments generated: 0 new
Review effort level: Lite

Xiaofei Cao (XiaofeiCao) · 2026-09-08T06:46:22Z

Updated comments. Added dedicated tests, and detailed red/green scenario-fix can be found https://gist.github.com/XiaofeiCao/7ff7531da56345eedf61d01eff18c1f3

AFAIK, current fix touches little of "parent class in different package". model.getParentPolymorphicDiscriminators() stores parent fixed discriminators in outer->inner order for hierarchical serialization/deserialization, and will be written to child classes field for this exact purpose.

There's a dedicated simplified serialization/deserialization path for share-jsonserializable-code settings, where discriminator can remain in parent with package-private access. But this setting is never enabled, and doesn't affect model.getParentPolymorphicDiscriminators(), or vice-versa.

Advance to the latest microsoft/typespec#11824 head and sync its focused inherited discriminator tests. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Pin the Java emitter to microsoft/typespec#11824 and sync its inherited discriminator regression case. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance the pinned core commit to the latest microsoft/typespec#11824 head and resync its discriminator regression fixtures. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance to the latest microsoft/typespec#11824 commit and sync its XML discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance to the latest microsoft/typespec#11824 commit and sync the restored propagated discriminator regression fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Advance to the latest microsoft/typespec#11824 head and sync its focused inherited discriminator tests. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf-ba5f78405f73

Copilot

🔵 Needs a closer look

The change alters core polymorphism mapping plus stream-style XML/JSON serialization behavior and triggers broad golden regenerations, which warrants final human verification.

Review details

Files reviewed: 39/44 changed files
Comments generated: 0 new
Review effort level: Lite

Advance the Java emitter pin to the merged microsoft/typespec#11824 main commit and sync the latest core tests. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: e11a1a40-39fd-4e62-a567-584fde94178c

microsoft-github-policy-service Bot added the emitter:client:java Issue for the Java client emitter: @typespec/http-client-java label Sep 2, 2026

Xiaofei Cao (XiaofeiCao) mentioned this pull request Sep 2, 2026

Sync Java core duplicate discriminator fix Azure/typespec-azure#5381

Open

Xiaofei Cao (XiaofeiCao) and others added 3 commits September 3, 2026 11:13

test(http-client-java): regenerate discriminator models

58badce

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

fix(http-client-java): preserve merged discriminator masking

627bdaa

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 54b93dc2-48ce-4250-a6ea-5bd9b9a7ab2b

Xiaofei Cao (XiaofeiCao) requested a lite review from Copilot September 4, 2026 02:20

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 4, 2026 02:21 View session

Copilot AI reviewed Sep 4, 2026

View reviewed changes

Comment thread ...core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java

Xiaofei Cao (XiaofeiCao) and others added 2 commits September 4, 2026 10:33

Enhance error message for polymorphic discriminator mismatch

01a8261

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

fix(http-client-java): preserve XML discriminators

6527551

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 00e7fd30-d342-4b5a-ad7e-f16198c7dbde

Xiaofei Cao (XiaofeiCao) requested a lite review from Copilot September 4, 2026 06:38

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 4, 2026 06:39 View session

Copilot AI reviewed Sep 4, 2026

View reviewed changes

Comment thread ...r-test/src/main/java/tsptest/discriminatoredgecases/models/NestedDiscriminatorAssistant.java

Xiaofei Cao (XiaofeiCao) requested a lite review from Copilot September 4, 2026 08:59

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 4, 2026 09:01 View session

Copilot AI reviewed Sep 4, 2026

View reviewed changes

Xiaofei Cao (XiaofeiCao) commented Sep 7, 2026

View reviewed changes

Comment thread ...microsoft/typespec/http/client/generator/core/template/StreamSerializationModelTemplate.java

Xiaofei Cao (XiaofeiCao) commented Sep 7, 2026

View reviewed changes

Comment thread ...core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ModelMapper.java

Xiaofei Cao (XiaofeiCao) marked this pull request as ready for review September 7, 2026 03:39

Copilot AI review requested due to automatic review settings September 7, 2026 06:07

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 7, 2026 06:08 View session

Copilot AI reviewed Sep 7, 2026

View reviewed changes

Xiaofei Cao (XiaofeiCao) commented Sep 7, 2026

View reviewed changes

Comment thread ...crosoft/typespec/http/client/generator/core/implementation/ClientModelPropertiesManager.java

Xiaofei Cao (XiaofeiCao) and others added 3 commits September 8, 2026 13:41

test(http-client-java): document inherited discriminator regressions

ac026a9

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf17f8b53d

fix(http-client-java): reuse inherited discriminator metadata

d1ff7bd

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf17f8b53d

fix(http-client-java): validate inherited discriminator names

9b009c4

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf17f8b53d

Copilot AI review requested due to automatic review settings September 8, 2026 06:16

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 8, 2026 06:17 View session

Copilot AI reviewed Sep 8, 2026

View reviewed changes

Weidong Xu (weidongxu-microsoft) approved these changes Sep 8, 2026

View reviewed changes

chore(http-client-java): regenerate test clients

ce17d65

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: d4e8259f-d938-4448-9321-8eaf-ba5f78405f73

Copilot AI review requested due to automatic review settings September 8, 2026 08:04

Copilot started reviewing on behalf of Xiaofei Cao (XiaofeiCao) September 8, 2026 08:05 View session

Copilot AI reviewed Sep 8, 2026

View reviewed changes

Xiaofei Cao (XiaofeiCao) enabled auto-merge September 8, 2026 08:39

Weidong Xu (weidongxu-microsoft) approved these changes Sep 8, 2026

View reviewed changes

Xiaofei Cao (XiaofeiCao) added this pull request to the merge queue Sep 8, 2026

Merged via the queue into microsoft:main with commit a61e908 Sep 8, 2026
35 of 36 checks passed

Xiaofei Cao (XiaofeiCao) deleted the fix-java-duplicate-discriminators branch September 8, 2026 09:44

Navigation Menu

Uh oh!

Fix duplicate inherited discriminators in Java models - #11824

Fix duplicate inherited discriminators in Java models#11824
Xiaofei Cao (XiaofeiCao) merged 12 commits into
microsoft:mainfrom
XiaofeiCao:fix-java-duplicate-discriminators

Xiaofei Cao (XiaofeiCao) commented Sep 2, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 2, 2026 •

edited

Loading

`@typespec/http-client-java` - fix ✏️

Uh oh!

azure-sdk-automation Bot commented Sep 2, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Xiaofei Cao (XiaofeiCao) commented Sep 8, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Xiaofei Cao (XiaofeiCao) commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Testing

Uh oh!

github-actions Bot commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

@typespec/http-client-java - fix ✏️

Uh oh!

azure-sdk-automation Bot commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟢 Approval recommended

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🔵 Needs a closer look

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🔵 Needs a closer look

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🔵 Needs a closer look

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🔵 Needs a closer look

Uh oh!

Xiaofei Cao (XiaofeiCao) commented Sep 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🔵 Needs a closer look

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Xiaofei Cao (XiaofeiCao) commented Sep 2, 2026 •

edited

Loading

github-actions Bot commented Sep 2, 2026 •

edited

Loading

`@typespec/http-client-java` - fix ✏️

azure-sdk-automation Bot commented Sep 2, 2026 •

edited

Loading