From 24bf9f3e93fcfe932fab0246eae5994607c8efd9 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 10 Apr 2026 16:18:59 +0800 Subject: [PATCH 1/4] fix singluar on "caches" --- .../typespec/http/client/generator/mgmt/util/Utils.java | 4 ++++ .../http/client/generator/mgmt/util/FluentUtilsTests.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java index 17854956f3b..83d13bd7d56 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/util/Utils.java @@ -44,6 +44,10 @@ public static String getNameForUngroupedOperations(Client client, FluentJavaSett return nameForUngroupOperations; } + static { + Pluralize.addSingularRule("caches", "cache"); + } + public static String getSingular(String name) { if (name == null) { return null; diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java index cbca2c5741a..5ba2259a1cf 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java @@ -97,6 +97,9 @@ public void testGetSingular() { // irregular (children → child) Assertions.assertEquals("child", FluentUtils.getSingular("children")); + // irregular (children → child) + Assertions.assertEquals("Cache", FluentUtils.getSingular("Caches")); + // Azure resource style names Assertions.assertEquals("VirtualMachine", FluentUtils.getSingular("VirtualMachines")); Assertions.assertEquals("NetworkInterface", FluentUtils.getSingular("NetworkInterfaces")); From 9e14673dacfba9a7b7062cb06811453d05fb932e Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 10 Apr 2026 16:19:28 +0800 Subject: [PATCH 2/4] changelog --- ...lient-java_fix-singular-on-caches-2026-3-10-16-19-20.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md diff --git a/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md b/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md new file mode 100644 index 00000000000..f6cb4c81799 --- /dev/null +++ b/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix bug that Caches singular be Cach \ No newline at end of file From e92eb56aceb8b92f1d32165fff7513737b233aac Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 10 Apr 2026 16:21:51 +0800 Subject: [PATCH 3/4] Update http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md --- ...ttp-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md b/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md index f6cb4c81799..625d279bc3a 100644 --- a/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md +++ b/.chronus/changes/http-client-java_fix-singular-on-caches-2026-3-10-16-19-20.md @@ -4,4 +4,4 @@ packages: - "@typespec/http-client-java" --- -Fix bug that Caches singular be Cach \ No newline at end of file +Fix bug that singular form of "Caches" is incorrect From d55dc67019e3505d0896267e7eb869967228ee97 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 10 Apr 2026 16:33:21 +0800 Subject: [PATCH 4/4] Update FluentUtilsTests.java --- .../http/client/generator/mgmt/util/FluentUtilsTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java index 5ba2259a1cf..ebae84f7704 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/test/java/com/microsoft/typespec/http/client/generator/mgmt/util/FluentUtilsTests.java @@ -97,7 +97,7 @@ public void testGetSingular() { // irregular (children → child) Assertions.assertEquals("child", FluentUtils.getSingular("children")); - // irregular (children → child) + // require addSingularRule Assertions.assertEquals("Cache", FluentUtils.getSingular("Caches")); // Azure resource style names