Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: fix
packages:
- "@typespec/http-client-java"
---

Fix `remove-model` for TypeSpec management clients, including enum models.
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ protected FluentJavaPackage handleTemplate(Client client) {

// Enum
for (EnumType enumType : client.getEnums()) {
javaPackage.addEnum(enumType.getPackage(), enumType.getName(), enumType);
if (!getFluentJavaSettings().getJavaNamesForRemoveModel().contains(enumType.getName())) {
javaPackage.addEnum(enumType.getPackage(), enumType.getName(), enumType);
}
}

// XML sequence wrapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public FluentMapper(FluentJavaSettings fluentJavaSettings) {

public void preModelMap(CodeModel codeModel) {
processInnerModel(codeModel);
FluentModelMapper.getInstance().addRemovedModels(fluentJavaSettings.getJavaNamesForRemoveModel());
((FluentModelMapper) Mappers.getModelMapper())
.addRemovedModels(fluentJavaSettings.getJavaNamesForRemoveModel());
}

public FluentClient map(CodeModel codeModel, Client client) {
Expand Down