-
Notifications
You must be signed in to change notification settings - Fork 243
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
tsp, dpg, keep enum type for client parameters, not change it to string type #4911
Merged
haolingdong-msft
merged 12 commits into
microsoft:main
from
haolingdong-msft:host-parameter-enum-as-enum
Nov 15, 2024
Merged
tsp, dpg, keep enum type for client parameters, not change it to string type #4911
haolingdong-msft
merged 12 commits into
microsoft:main
from
haolingdong-msft:host-parameter-enum-as-enum
Nov 15, 2024
Conversation
This file contains 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
No changes needing a change description found. |
You can try these changes here
|
2d26fa8
to
ee68228
Compare
...a/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java
Outdated
Show resolved
Hide resolved
...or-core/src/main/java/com/microsoft/typespec/http/client/generator/core/util/SchemaUtil.java
Outdated
Show resolved
Hide resolved
...a/com/microsoft/typespec/http/client/generator/core/template/example/ProtocolTestWriter.java
Outdated
Show resolved
Hide resolved
…s-enum # Conflicts: # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientAClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ClientBClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/FirstClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/RenamedOperationClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/ServiceClientClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/TwoOperationGroupClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/client/structure/service/subnamespace/SecondClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/AddedClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/AddedClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/implementation/InterfaceV2sImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/added/models/Versions.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/MadeOptionalClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/implementation/MadeOptionalClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/madeoptional/models/Versions.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/RemovedClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/implementation/RemovedClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/removed/models/Versions.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/RenamedFromClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/NewInterfacesImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/implementation/RenamedFromClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/renamedfrom/models/Versions.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/ReturnTypeChangedFromClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/returntypechangedfrom/implementation/ReturnTypeChangedFromClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/TypeChangedFromClientBuilder.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/implementation/TypeChangedFromClientImpl.java # packages/http-client-java/generator/http-client-generator-test/src/main/java/versioning/typechangedfrom/models/Versions.java # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-added_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-madeoptional_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-renamedfrom_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-returntypechangedfrom_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-typechangedfrom_apiview_properties.json # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/ClientOperationGroupTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/DefaultClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/MultiClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/OperationGroupClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/RenameOperationTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ClientAClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/FirstClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/RenamedOperationClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/ServiceClientClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/client/structure/service/generated/TwoOperationGroupClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/type/scalar/ScalarTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/AddedClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/added/generated/AddedClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/MadeOptionalClienTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/madeoptional/generated/MadeOptionalClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/RemovedClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/removed/generated/RemovedClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/RenamedFromClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/renamedfrom/generated/RenamedFromClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/returntypechangedfrom/generated/ReturnTypeChangedFromClientTestBase.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/TypeChangedFromClientTests.java # packages/http-client-java/generator/http-client-generator-test/src/test/java/versioning/typechangedfrom/generated/TypeChangedFromClientTestBase.java
weidongxu-microsoft
approved these changes
Nov 15, 2024
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.
Fix Azure/autorest.java#2974
related with https://gist.github.com/haolingdong-msft/df3f25a048baf83d8fabf5206aacc7db#8-clienttype-will-be-generated-after-adopting-tcgc
Existing code
We change enum type to string type in two classes:
typespec/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ProxyParameterMapper.java
Lines 69 to 71 in 08384aa
typespec/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ServiceClientMapper.java
Lines 235 to 239 in 08384aa
Logic in this pr
Above classes calls
SchemaUtil.removeModelFromParameter
to remove enum type and change it to string type.Currently I modify the logic in
removeModelFromParameter()
to not chang enum type to string type for dataplane path/uri parameters.Would like to hear your thoughts on below: @weidongxu-microsoft @XiaofeiCao
SchemaUtil
class.path-parameter-enum-as-string
.Latest logics
After discussing with Weidong, we aggreed to put the logics into the mappers and keep the type in protocol method be enum as well.
protected boolean isRemoveModelFromParameter(Parameter parameter, IType type)
in bothProxyParameterMapper
andServiceClientMapper
.enum
and parameter location isclient
.