From 7c89040d9c5c05794d5d79807ebc36dd2a66521a Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 18 Jun 2026 11:38:16 +0800 Subject: [PATCH 1/4] skip duplicated method in samples --- .../mgmt/template/FluentExampleTemplate.java | 11 ++++++++- .../2024-12-01/TopLevelArmResources_Get.json | 24 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/http-client-java/generator/http-client-generator-test/tsp/examples/2024-12-01/TopLevelArmResources_Get.json diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentExampleTemplate.java b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentExampleTemplate.java index a0ac698308c..927c7bdb464 100644 --- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentExampleTemplate.java +++ b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/template/FluentExampleTemplate.java @@ -19,6 +19,7 @@ import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.examplemodel.ParameterExample; import io.clientcore.core.utils.CoreUtils; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -47,7 +48,16 @@ public final void write(com.microsoft.typespec.http.client.generator.mgmt.model. javaFile.javadocComment(commentBlock -> commentBlock .description(String.format("Samples for %1$s %2$s", example.getGroupName(), example.getMethodName()))); javaFile.publicFinalClass(className, classBlock -> { + Set methodSignatureWritten = new HashSet<>(); for (ExampleMethod exampleMethod : exampleMethods) { + String methodSignature = exampleMethod.getMethodSignature(); + if (methodSignatureWritten.contains(methodSignature)) { + // skip this method, as it duplicate with method already written to the class + // this usually happen on "advanced-versioning: true", where we have overload on the SDK method + continue; + } + methodSignatureWritten.add(methodSignature); + if (!CoreUtils.isNullOrEmpty(exampleMethod.getExample().getOriginalFileName())) { classBlock.blockComment(getExampleTag(exampleMethod.getExample())); } @@ -57,7 +67,6 @@ public final void write(com.microsoft.typespec.http.client.generator.mgmt.model. commentBlock.param(exampleMethod.getExample().getEntryName(), exampleMethod.getExample().getEntryDescription()); }); - String methodSignature = exampleMethod.getMethodSignature(); if (exampleMethod.getHelperFeatures().contains(ExampleHelperFeature.ThrowsIOException)) { methodSignature += " throws IOException"; } diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/examples/2024-12-01/TopLevelArmResources_Get.json b/packages/http-client-java/generator/http-client-generator-test/tsp/examples/2024-12-01/TopLevelArmResources_Get.json new file mode 100644 index 00000000000..83eefd53ba1 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/examples/2024-12-01/TopLevelArmResources_Get.json @@ -0,0 +1,24 @@ +{ + "operationId": "TopLevelArmResources_Get", + "title": "TopLevelArmResources Get", + "parameters": { + "resourceGroupName": "resource-group-name", + "topLevelArmResourcePropertiesName": "resource-name", + "api-version": "2024-12-01", + "parameter": "parameter-value", + "newParameter": "new-parameter-value" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resource-group-name/providers/TspTest.ArmVersioned/topLevelArmResources/resource-name", + "name": "resource-name", + "type": "TspTest.ArmVersioned/topLevelArmResources", + "location": "eastus", + "properties": { + "provisioningState": "Succeeded" + } + } + } + } +} From 0392acc07d23e3d265db622158285eca0168ea81 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 18 Jun 2026 11:40:08 +0800 Subject: [PATCH 2/4] changelog --- ...ted-sample-on-advanced-versioning-2026-5-18-11-39-58.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-39-58.md diff --git a/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-39-58.md b/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-39-58.md new file mode 100644 index 00000000000..8e4186fa3f7 --- /dev/null +++ b/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-39-58.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix duplicate method in generated samples, when advanced-versioning=true \ No newline at end of file From 993abae8a74a1f05cf608f28e9a70d0848ed87c6 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 18 Jun 2026 11:44:58 +0800 Subject: [PATCH 3/4] chore(http-client-java): update Node.js dependencies Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ...-advanced-versioning-2026-5-18-11-44-18.md | 7 + .../package.json | 4 +- .../http-client-generator-test/package.json | 4 +- packages/http-client-java/package-lock.json | 245 +++++++++--------- packages/http-client-java/package.json | 20 +- 5 files changed, 138 insertions(+), 142 deletions(-) create mode 100644 .chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-44-18.md diff --git a/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-44-18.md b/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-44-18.md new file mode 100644 index 00000000000..12641612c40 --- /dev/null +++ b/.chronus/changes/http-client-java_fix-duplicate-generated-sample-on-advanced-versioning-2026-5-18-11-44-18.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update Node.js dependencies: @azure-tools/typespec-autorest 0.69.1, @azure-tools/typespec-azure-resource-manager 0.69.1, @azure-tools/typespec-azure-rulesets 0.69.1, @microsoft/api-extractor 7.58.9, @types/node 25.9.3, @vitest/coverage-v8 4.1.9, @vitest/ui 4.1.9, vitest 4.1.9 \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json index 782e18e5756..0b83c4735c0 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json @@ -31,8 +31,8 @@ "@typespec/streams": "0.83.0", "@azure-tools/typespec-azure-core": "0.69.0", "@azure-tools/typespec-client-generator-core": "0.69.0", - "@azure-tools/typespec-azure-resource-manager": "0.69.0", - "@azure-tools/typespec-autorest": "0.69.0" + "@azure-tools/typespec-azure-resource-manager": "0.69.1", + "@azure-tools/typespec-autorest": "0.69.1" }, "private": true } diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json index f92c6c8848c..15d4f75b156 100644 --- a/packages/http-client-java/generator/http-client-generator-test/package.json +++ b/packages/http-client-java/generator/http-client-generator-test/package.json @@ -31,8 +31,8 @@ "@typespec/streams": "0.83.0", "@azure-tools/typespec-azure-core": "0.69.0", "@azure-tools/typespec-client-generator-core": "0.69.0", - "@azure-tools/typespec-azure-resource-manager": "0.69.0", - "@azure-tools/typespec-autorest": "0.69.0" + "@azure-tools/typespec-azure-resource-manager": "0.69.1", + "@azure-tools/typespec-autorest": "0.69.1" }, "private": true } diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json index 58b51c2a3db..4df7739c0a5 100644 --- a/packages/http-client-java/package-lock.json +++ b/packages/http-client-java/package-lock.json @@ -14,16 +14,16 @@ "lodash": "~4.18.1" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.69.0", + "@azure-tools/typespec-autorest": "0.69.1", "@azure-tools/typespec-azure-core": "0.69.0", - "@azure-tools/typespec-azure-resource-manager": "0.69.0", - "@azure-tools/typespec-azure-rulesets": "0.69.0", + "@azure-tools/typespec-azure-resource-manager": "0.69.1", + "@azure-tools/typespec-azure-rulesets": "0.69.1", "@azure-tools/typespec-client-generator-core": "0.69.0", - "@microsoft/api-extractor": "^7.58.8", + "@microsoft/api-extractor": "^7.58.9", "@microsoft/api-extractor-model": "^7.33.8", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", - "@types/node": "~25.9.2", + "@types/node": "~25.9.3", "@typespec/compiler": "1.13.0", "@typespec/events": "0.83.0", "@typespec/http": "1.13.0", @@ -34,20 +34,20 @@ "@typespec/streams": "0.83.0", "@typespec/versioning": "0.83.0", "@typespec/xml": "0.83.0", - "@vitest/coverage-v8": "^4.1.8", - "@vitest/ui": "^4.1.8", + "@vitest/coverage-v8": "^4.1.9", + "@vitest/ui": "^4.1.9", "c8": "~11.0.0", "rimraf": "~6.1.3", "typescript": "~6.0.3", - "vitest": "^4.1.8" + "vitest": "^4.1.9" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.69.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.69.1 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.69.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.69.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.69.1 <1.0.0", "@azure-tools/typespec-client-generator-core": ">=0.69.0 <1.0.0", "@typespec/compiler": "^1.13.0", "@typespec/events": ">=0.83.0 <1.0.0", @@ -134,9 +134,9 @@ } }, "node_modules/@azure-tools/typespec-autorest": { - "version": "0.69.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.69.0.tgz", - "integrity": "sha512-6lOOe3NWfLI8M5NGLM1ZzIFRe34gVPj2GXzti9ag6o3fVpC6eMUfacv1sU4zmz9dkpKTdOUXNO5qm3DvqPRC8Q==", + "version": "0.69.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.69.1.tgz", + "integrity": "sha512-nbAsTagr4pyBO0ajlRnE5TW4tAXrYKFYSoWD+8bevXpe23bkVIJkDUJCZPSgWE7CBf3kxfw53lAb70a50oJmRA==", "dev": true, "license": "MIT", "engines": { @@ -144,7 +144,7 @@ }, "peerDependencies": { "@azure-tools/typespec-azure-core": "^0.69.0", - "@azure-tools/typespec-azure-resource-manager": "^0.69.0", + "@azure-tools/typespec-azure-resource-manager": "^0.69.1", "@azure-tools/typespec-client-generator-core": "^0.69.0", "@typespec/compiler": "^1.13.0", "@typespec/http": "^1.13.0", @@ -175,9 +175,9 @@ } }, "node_modules/@azure-tools/typespec-azure-resource-manager": { - "version": "0.69.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.69.0.tgz", - "integrity": "sha512-q/kdsGhVpvn2wb3OedxFHg7hp+al3FynUAPsz2gwqJx62z6UGOEJhtYCWP3osatVgxvKRhhh8uYl5mHRMDFi3g==", + "version": "0.69.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.69.1.tgz", + "integrity": "sha512-NF7fqmPwaQbywcxGhH+v9qPYtIrPRR5MncXmeml6Kf9WLeqQj0rJt76KZCsZ8zwj58ZVbTNFPKcjsTQ00yQupA==", "dev": true, "license": "MIT", "dependencies": { @@ -197,9 +197,9 @@ } }, "node_modules/@azure-tools/typespec-azure-rulesets": { - "version": "0.69.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.69.0.tgz", - "integrity": "sha512-+7KThtfHupWBDSwDR9rRHNmBb15gxACH8iPOOohRr1J28Gu25YWlz1G00r62X9VUBFLZTxYc4rQ2QCxPFT0uFw==", + "version": "0.69.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.69.1.tgz", + "integrity": "sha512-vRvO8MoO4dwHdOKCFUB0IZkwf5AFGW92PP+48GKDYSNVFA7mwKVlbAlRa0rU6yURsUppAT6BPEurtau3FR+N0Q==", "dev": true, "license": "MIT", "engines": { @@ -207,7 +207,7 @@ }, "peerDependencies": { "@azure-tools/typespec-azure-core": "^0.69.0", - "@azure-tools/typespec-azure-resource-manager": "^0.69.0", + "@azure-tools/typespec-azure-resource-manager": "^0.69.1", "@azure-tools/typespec-client-generator-core": "^0.69.0", "@typespec/compiler": "^1.13.0" } @@ -394,9 +394,9 @@ } }, "node_modules/@azure/identity": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.0.tgz", - "integrity": "sha512-uWC0fssc+hs1TGGVkkghiaFkkS7NkTxfnCH+Hdg+yTehTpMcehpok4PgUKKdyCH+9ldu6FhiHRv84Ntqj1vVcw==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.1.tgz", + "integrity": "sha512-5C/2WD5Vb1lHnZS16dNQRPMjN6oV/Upba+C9nBIs15PmOi6A3ZGs4Lr2u60zw4S04gi+u3cEXiqTVP7M4Pz3kw==", "dev": true, "license": "MIT", "dependencies": { @@ -407,8 +407,8 @@ "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.11.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^4.2.0", - "@azure/msal-node": "^3.5.0", + "@azure/msal-browser": "^5.5.0", + "@azure/msal-node": "^5.1.0", "open": "^10.1.0", "tslib": "^2.2.0" }, @@ -431,22 +431,22 @@ } }, "node_modules/@azure/msal-browser": { - "version": "4.29.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.29.0.tgz", - "integrity": "sha512-/f3eHkSNUTl6DLQHm+bKecjBKcRQxbd/XLx8lvSYp8Nl/HRyPuIPOijt9Dt0sH50/SxOwQ62RnFCmFlGK+bR/w==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-5.14.0.tgz", + "integrity": "sha512-Dfl7hPZe9/JJwRhFFXHq2z1oHYBuGubmff3kWXOsd1AGgyXlqjNYAWuN/1JL/ZrcZBs8TKMjGSil6Rcc7E8VPQ==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.15.0" + "@azure/msal-common": "16.9.0" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "15.15.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.15.0.tgz", - "integrity": "sha512-/n+bN0AKlVa+AOcETkJSKj38+bvFs78BaP4rNtv3MJCmPH0YrHiskMRe74OhyZ5DZjGISlFyxqvf9/4QVEi2tw==", + "version": "16.9.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-16.9.0.tgz", + "integrity": "sha512-1MWGjqgUCRAYgLmVFZKp7fs3Rg1TFvIMgywY8ze2olNVvLlJoRThuoziWSDJuwwyJI5L4rnLb9Tyt5D9GvSLPw==", "dev": true, "license": "MIT", "engines": { @@ -454,18 +454,17 @@ } }, "node_modules/@azure/msal-node": { - "version": "3.8.8", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.8.8.tgz", - "integrity": "sha512-+f1VrJH1iI517t4zgmuhqORja0bL6LDQXfBqkjuMmfTYXTQQnh1EvwwxO3UbKLT05N0obF72SRHFrC1RBDv5Gg==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-5.2.5.tgz", + "integrity": "sha512-RUuewWk9JvWJS5Yiy8/74Lm1rQAWlrU/qg/Bgtk1jIauVRtnb9XKwS5Xg0J+Whwjesq9EVrBIFgQEP8vHxgezA==", "dev": true, "license": "MIT", "dependencies": { - "@azure/msal-common": "15.15.0", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" + "@azure/msal-common": "16.9.0", + "jsonwebtoken": "^9.0.0" }, "engines": { - "node": ">=16" + "node": ">=20" } }, "node_modules/@azure/storage-blob": { @@ -1019,9 +1018,9 @@ } }, "node_modules/@microsoft/api-extractor": { - "version": "7.58.8", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.58.8.tgz", - "integrity": "sha512-Y45rdEvZodD1WBAK9w8Wvqj7k/6z21YOEP8aVNWv1vemEzanjThvCowc3Eyt/bmJJyqI4gj0BQr9nLC51fsDiQ==", + "version": "7.58.9", + "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.58.9.tgz", + "integrity": "sha512-S2UF4yza5GoxCmf7hJQNxJNZN9ltOVuOQv8Dy+Z21aol5ERoBNMdWcQHm4MJMPPItW4H/4rZD906iaf4mUojJA==", "dev": true, "license": "MIT", "dependencies": { @@ -1031,7 +1030,7 @@ "@rushstack/node-core-library": "5.23.1", "@rushstack/rig-package": "0.7.3", "@rushstack/terminal": "0.24.0", - "@rushstack/ts-command-line": "5.3.9", + "@rushstack/ts-command-line": "5.3.10", "diff": "~8.0.2", "minimatch": "10.2.3", "resolve": "~1.22.1", @@ -1090,14 +1089,14 @@ } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", - "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz", + "integrity": "sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.1" + "@tybys/wasm-util": "^0.10.2" }, "funding": { "type": "github", @@ -1530,9 +1529,9 @@ } }, "node_modules/@rushstack/ts-command-line": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.9.tgz", - "integrity": "sha512-GIHqU+sRGQ3LGWAZu1O+9Yh++qwtyNIIGuNbcWHJjBTm2qRez0cwINUHZ+pQLR8UuzZDcMajrDaNbUYoaL/XtQ==", + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.10.tgz", + "integrity": "sha512-fwI076HYknC0IrMXdY6UmjDv+PH7NHhNJX3/pY2UblSE5XrXgndXZPiOe/6ZtuFpn6DvVDVNhtkIzQ+Qu/MhVQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1635,9 +1634,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.2.tgz", - "integrity": "sha512-G05zqtJhcDLb8uslf5EjCxXg9G1KQxiV8OS0R26IC//Eoyitzqe8z37I7cqvnZlrlSfgocQRfSn/AHBZJJFyGw==", + "version": "25.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.3.tgz", + "integrity": "sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==", "dev": true, "license": "MIT", "dependencies": { @@ -2181,14 +2180,14 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.8.tgz", - "integrity": "sha512-lt3kovsyHwYe00wq4D1ti0Z974fWj4NLp6siqiyEufUpyFwK9Yhi7rBhac9JL5aA0zoMrJqc4vYPZRUnI7l7nw==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.9.tgz", + "integrity": "sha512-G9/lgqibheLVBDRuya45EbsEXTYcWoSG+TLg7i2axuzx0Eq62eXn+aWXyaVdV5vKvFSWd6ywcX8hA7la9Pvu8g==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.1.8", + "@vitest/utils": "4.1.9", "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", @@ -2202,8 +2201,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.1.8", - "vitest": "4.1.8" + "@vitest/browser": "4.1.9", + "vitest": "4.1.9" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2212,16 +2211,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.8.tgz", - "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.9.tgz", + "integrity": "sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/spy": "4.1.9", + "@vitest/utils": "4.1.9", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" }, @@ -2230,13 +2229,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.8.tgz", - "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.9.tgz", + "integrity": "sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.1.8", + "@vitest/spy": "4.1.9", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -2257,9 +2256,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.8.tgz", - "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.9.tgz", + "integrity": "sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==", "dev": true, "license": "MIT", "dependencies": { @@ -2270,13 +2269,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.8.tgz", - "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.9.tgz", + "integrity": "sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.8", + "@vitest/utils": "4.1.9", "pathe": "^2.0.3" }, "funding": { @@ -2284,14 +2283,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.8.tgz", - "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.9.tgz", + "integrity": "sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/pretty-format": "4.1.9", + "@vitest/utils": "4.1.9", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -2300,9 +2299,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.8.tgz", - "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.9.tgz", + "integrity": "sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==", "dev": true, "license": "MIT", "funding": { @@ -2310,13 +2309,13 @@ } }, "node_modules/@vitest/ui": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.8.tgz", - "integrity": "sha512-RUS2ZU2TsduVrI+9c12uTNaKrNUTsm6yFt3fueEUB9iKvyC2UP83F+sqIz00HQIah4UOL1TMoDAki8K0NjGvsA==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.9.tgz", + "integrity": "sha512-U/cRvtqfEPj27FI1n9cyUvi4vXXdcLhjJiI+InYKdk8hP4VrS6RXOjGL7rfFaeBc37iRKANsR6eEzIoC7lmgBQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.8", + "@vitest/utils": "4.1.9", "fflate": "^0.8.2", "flatted": "^3.4.2", "pathe": "^2.0.3", @@ -2328,17 +2327,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "4.1.8" + "vitest": "4.1.9" } }, "node_modules/@vitest/utils": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.8.tgz", - "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.9.tgz", + "integrity": "sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.8", + "@vitest/pretty-format": "4.1.9", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" }, @@ -5033,9 +5032,9 @@ "license": "MIT" }, "node_modules/multer": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz", - "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz", + "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5209,9 +5208,9 @@ } }, "node_modules/obug": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.2.tgz", - "integrity": "sha512-AWGB9WFcRXOQs48Z/udjI5ZcZMHXwX8XPByNpOydgcGsDLIzjGizhoMWJyKAWze7AVW/2W1i+/gPX4YtKe5cyg==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz", + "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -6251,9 +6250,9 @@ } }, "node_modules/tar": { - "version": "7.5.15", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.15.tgz", - "integrity": "sha512-dzGK0boVlC4W5QFuQN1EFSl3bIDYsk7Tj40U6eIBnK2k/8ml7TZ5agbI5j5+qnoVcAA+rNtBml8SEiLxZpNqRQ==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -6513,16 +6512,6 @@ "dev": true, "license": "MIT" }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/v8-to-istanbul": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz", @@ -6639,19 +6628,19 @@ } }, "node_modules/vitest": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.8.tgz", - "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.9.tgz", + "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.1.8", - "@vitest/mocker": "4.1.8", - "@vitest/pretty-format": "4.1.8", - "@vitest/runner": "4.1.8", - "@vitest/snapshot": "4.1.8", - "@vitest/spy": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/expect": "4.1.9", + "@vitest/mocker": "4.1.9", + "@vitest/pretty-format": "4.1.9", + "@vitest/runner": "4.1.9", + "@vitest/snapshot": "4.1.9", + "@vitest/spy": "4.1.9", + "@vitest/utils": "4.1.9", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", @@ -6679,12 +6668,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.8", - "@vitest/browser-preview": "4.1.8", - "@vitest/browser-webdriverio": "4.1.8", - "@vitest/coverage-istanbul": "4.1.8", - "@vitest/coverage-v8": "4.1.8", - "@vitest/ui": "4.1.8", + "@vitest/browser-playwright": "4.1.9", + "@vitest/browser-preview": "4.1.9", + "@vitest/browser-webdriverio": "4.1.9", + "@vitest/coverage-istanbul": "4.1.9", + "@vitest/coverage-v8": "4.1.9", + "@vitest/ui": "4.1.9", "happy-dom": "*", "jsdom": "*", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json index 01ea582a38c..1434b580041 100644 --- a/packages/http-client-java/package.json +++ b/packages/http-client-java/package.json @@ -49,9 +49,9 @@ "generator/http-client-generator/target/classes/PerfAutomation.jfc" ], "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.69.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.69.1 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.69.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.69.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.69.1 <1.0.0", "@azure-tools/typespec-client-generator-core": ">=0.69.0 <1.0.0", "@typespec/compiler": "^1.13.0", "@typespec/events": ">=0.83.0 <1.0.0", @@ -69,16 +69,16 @@ "lodash": "~4.18.1" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.69.0", + "@azure-tools/typespec-autorest": "0.69.1", "@azure-tools/typespec-azure-core": "0.69.0", - "@azure-tools/typespec-azure-resource-manager": "0.69.0", - "@azure-tools/typespec-azure-rulesets": "0.69.0", + "@azure-tools/typespec-azure-resource-manager": "0.69.1", + "@azure-tools/typespec-azure-rulesets": "0.69.1", "@azure-tools/typespec-client-generator-core": "0.69.0", - "@microsoft/api-extractor": "^7.58.8", + "@microsoft/api-extractor": "^7.58.9", "@microsoft/api-extractor-model": "^7.33.8", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", - "@types/node": "~25.9.2", + "@types/node": "~25.9.3", "@typespec/compiler": "1.13.0", "@typespec/events": "0.83.0", "@typespec/http": "1.13.0", @@ -89,11 +89,11 @@ "@typespec/streams": "0.83.0", "@typespec/versioning": "0.83.0", "@typespec/xml": "0.83.0", - "@vitest/coverage-v8": "^4.1.8", - "@vitest/ui": "^4.1.8", + "@vitest/coverage-v8": "^4.1.9", + "@vitest/ui": "^4.1.9", "c8": "~11.0.0", "rimraf": "~6.1.3", "typescript": "~6.0.3", - "vitest": "^4.1.8" + "vitest": "^4.1.9" } } From 49479ca4933737164d31dbd63906fcee09ec8cf2 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 18 Jun 2026 13:42:59 +0800 Subject: [PATCH 4/4] regen --- ...ArmResourcesGetByResourceGroupSamples.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/samples/java/tsptest/armversioned/generated/TopLevelArmResourcesGetByResourceGroupSamples.java diff --git a/packages/http-client-java/generator/http-client-generator-test/src/samples/java/tsptest/armversioned/generated/TopLevelArmResourcesGetByResourceGroupSamples.java b/packages/http-client-java/generator/http-client-generator-test/src/samples/java/tsptest/armversioned/generated/TopLevelArmResourcesGetByResourceGroupSamples.java new file mode 100644 index 00000000000..1214a7b4c49 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/samples/java/tsptest/armversioned/generated/TopLevelArmResourcesGetByResourceGroupSamples.java @@ -0,0 +1,24 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armversioned.generated; + +/** + * Samples for TopLevelArmResources GetByResourceGroup. + */ +public final class TopLevelArmResourcesGetByResourceGroupSamples { + /* + * x-ms-original-file: 2024-12-01/TopLevelArmResources_Get.json + */ + /** + * Sample code: TopLevelArmResources Get. + * + * @param manager Entry point to ArmVersionedManager. + */ + public static void topLevelArmResourcesGet(tsptest.armversioned.ArmVersionedManager manager) { + manager.topLevelArmResources() + .getByResourceGroupWithResponse("resource-group-name", "resource-name", "parameter-value", + "new-parameter-value", com.azure.core.util.Context.NONE); + } +}