Merged
Conversation
sugmanue
reviewed
Oct 17, 2025
codegen/codegen-core/src/main/java/software/amazon/smithy/java/codegen/CodegenUtils.java
Outdated
Show resolved
Hide resolved
...odegen-core/src/main/java/software/amazon/smithy/java/codegen/generators/UnionGenerator.java
Outdated
Show resolved
Hide resolved
codegen/codegen-core/src/main/java/software/amazon/smithy/java/codegen/writer/JavaWriter.java
Outdated
Show resolved
Hide resolved
codegen/codegen-core/src/main/java/software/amazon/smithy/java/codegen/writer/JavaWriter.java
Outdated
Show resolved
Hide resolved
codegen/codegen-core/src/main/java/software/amazon/smithy/java/codegen/writer/JavaWriter.java
Outdated
Show resolved
Hide resolved
codegen/codegen-core/src/main/java/software/amazon/smithy/java/codegen/writer/JavaWriter.java
Outdated
Show resolved
Hide resolved
sugmanue
reviewed
Oct 21, 2025
...urces/software/amazon/smithy/java/codegen/types/test-cases/naming-conflict/model/main.smithy
Outdated
Show resolved
Hide resolved
...urces/software/amazon/smithy/java/codegen/types/test-cases/naming-conflict/model/main.smithy
Show resolved
Hide resolved
sugmanue
approved these changes
Oct 22, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes:
This PR is aimed to fix two problems:
Current implementation added
typeinto thereserved-words.txtand this approach is too broad.We want to only resolve the conflict when the name
typeis used, for example,UnionorEnum.The original approach to resolve implicit name conflict tried to add all symbols generated under the same package into each file's
symbolTablewhich caused some unnecessary name conflicts.We only want to resolve the conflicts when those auto-imported
java.lang.*classes likeillegalArgumentExceptionare used and one class with the same name defined under the same namespace.For example, the
ShapeSerializeris used with a fully qualified name even though it is imported. This happened because one shape also calledShapeSerializerwas generated under the same namespace and added into this file's symbol table.By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.