Skip to content

http-client-java, bug fix duplicate resource name #8176

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.

Sign up for GitHub

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

Merged
weidongxu-microsoft merged 5 commits into from
Aug 13, 2025
Merged

http-client-java, bug fix duplicate resource name #8176

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e9342b
fix parent resource name, when adaptForParentSchema
weidongxu-microsoft Aug 13, 2025
a47a7ab
Merge branch 'main' into http-client-java_bug-fix-duplicate-resource-…
weidongxu-microsoft Aug 13, 2025
3ca282e
move rename part to renameSchemaOnResourceType func
weidongxu-microsoft Aug 13, 2025
40e990c
fix
weidongxu-microsoft Aug 13, 2025
7337f2b
code comments
weidongxu-microsoft Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions .../microsoft/typespec/http/client/generator/mgmt/transformer/ResourceTypeNormalization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ public CodeModel process(CodeModel codeModel) {
objectSchemas.forEach(compositeType -> {
Optional<ObjectSchema> parentType = getObjectParent(compositeType);
if (parentType.isPresent()) {
getSchemaResourceType(parentType.get())
.ifPresent(type -> adaptForParentSchema(compositeType, parentType.get(), type));
getSchemaResourceType(parentType.get()).ifPresent(type -> {
renameSchemaOnResourceType(parentType.get(), type);
adaptForParentSchema(compositeType, parentType.get(), type);
});

if (FluentType.SYSTEM_DATA.getName().equals(Utils.getJavaName(parentType.get()))) {
adaptAsSystemData(compositeType);
Expand Down Expand Up @@ -231,6 +233,12 @@ private static void adaptAsSystemData(ObjectSchema compositeType) {
}
}

/**
* Check the object schema, determine its resource type.
*
* @param compositeType the object schema to check
* @return the resource type
*/
private static Optional<ResourceType> getSchemaResourceType(ObjectSchema compositeType) {
ResourceType type = null;

Expand Down Expand Up @@ -261,6 +269,28 @@ private static Optional<ResourceType> getSchemaResourceType(ObjectSchema composi
return Optional.ofNullable(type);
}

/**
* Rename the schema based on the resource type.
*
* @param compositeType the object schema to rename
* @param type the resource type
*/
private static void renameSchemaOnResourceType(ObjectSchema compositeType, ResourceType type) {
switch (type) {
case SUB_RESOURCE:
compositeType.getLanguage().getJava().setName(ResourceTypeName.SUB_RESOURCE);
break;

case PROXY_RESOURCE:
compositeType.getLanguage().getJava().setName(ResourceTypeName.PROXY_RESOURCE);
break;

case RESOURCE:
compositeType.getLanguage().getJava().setName(ResourceTypeName.RESOURCE);
break;
}
}

private static void adaptForParentSchema(ObjectSchema compositeType, ObjectSchema parentType, ResourceType type) {
switch (type) {
case SUB_RESOURCE: {
Expand Down
Loading