From adc85a6e1a4d582f21af97cd06709cd3f948ed26 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Tue, 24 Mar 2026 16:20:13 +0800 Subject: [PATCH 01/11] remove older-version --- .../http-client-generator-test/Generate.ps1 | 1 - .../ArmMultiServiceOlderVersionsTests.java | 39 --------------- .../combined/generated/DiskInnerTests.java | 47 ------------------- .../generated/DiskPropertiesTests.java | 25 ---------- .../generated/VirtualMachineInnerTests.java | 47 ------------------- .../VirtualMachinePropertiesTests.java | 26 ---------- .../tsp/visibility.tsp | 6 +++ 7 files changed, 6 insertions(+), 185 deletions(-) delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java diff --git a/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 b/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 index 04565c86e76..24c692adc8a 100644 --- a/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 +++ b/packages/http-client-java/generator/http-client-generator-test/Generate.ps1 @@ -201,7 +201,6 @@ try { $specFiles = Get-ChildItem ./specs -Include "main.tsp","old.tsp" -File -Recurse # ensure multi-service client specs are processed even though they do not match the default filter $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service/client.tsp") - $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service-older-versions/client.tsp") $specFiles += Get-Item (Join-Path ./specs "azure/resource-manager/multi-service-shared-models/client.tsp") $job = $specFiles | ForEach-Object -Parallel $generateScript -ThrottleLimit $Parallelization -AsJob diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java deleted file mode 100644 index 1a704aa3a39..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/ArmMultiServiceOlderVersionsTests.java +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package azure.resourcemanager.multiserviceolderversions; - -import azure.resourcemanager.multiserviceolderversions.combined.CombinedManager; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.management.Region; -import org.junit.jupiter.api.Test; -import org.utils.ArmUtils; - -public final class ArmMultiServiceOlderVersionsTests { - - private final CombinedManager manager - = CombinedManager.authenticate(ArmUtils.createTestHttpPipeline(), ArmUtils.getAzureProfile()); - - private static final String RESOURCE_GROUP_NAME = "test-rg"; - private static final Region REGION = Region.US_EAST; - - @Test - public void testCombinedClient() { - manager.disks() - .define("disk-old1") - .withRegion(REGION) - .withExistingResourceGroup(RESOURCE_GROUP_NAME) - .withProperties(new DiskProperties().withDiskSizeGB(128)) - .create(); - manager.disks().getByResourceGroup(RESOURCE_GROUP_NAME, "disk-old1"); - - manager.virtualMachines() - .define("vm-old1") - .withRegion(REGION) - .withExistingResourceGroup(RESOURCE_GROUP_NAME) - .withProperties(new VirtualMachineProperties().withSize("Standard_D2s_v3")) - .create(); - manager.virtualMachines().getByResourceGroup(RESOURCE_GROUP_NAME, "vm-old1"); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java deleted file mode 100644 index 0d799efc91c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskInnerTests.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.util.BinaryData; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Assertions; - -public final class DiskInnerTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - DiskInner model = BinaryData.fromString( - "{\"properties\":{\"provisioningState\":\"Canceled\",\"diskSizeGB\":1911349374},\"location\":\"ufpo\",\"tags\":{\"qsoqijgkd\":\"izhwlrxy\"},\"id\":\"bpazlobcufpdzn\",\"name\":\"btcqq\",\"type\":\"nq\"}") - .toObject(DiskInner.class); - Assertions.assertEquals("ufpo", model.location()); - Assertions.assertEquals("izhwlrxy", model.tags().get("qsoqijgkd")); - Assertions.assertEquals(1911349374, model.properties().diskSizeGB()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - DiskInner model = new DiskInner().withLocation("ufpo") - .withTags(mapOf("qsoqijgkd", "izhwlrxy")) - .withProperties(new DiskProperties().withDiskSizeGB(1911349374)); - model = BinaryData.fromObject(model).toObject(DiskInner.class); - Assertions.assertEquals("ufpo", model.location()); - Assertions.assertEquals("izhwlrxy", model.tags().get("qsoqijgkd")); - Assertions.assertEquals(1911349374, model.properties().diskSizeGB()); - } - - // Use "Map.of" if available - @SuppressWarnings("unchecked") - private static Map mapOf(Object... inputs) { - Map map = new HashMap<>(); - for (int i = 0; i < inputs.length; i += 2) { - String key = (String) inputs[i]; - T value = (T) inputs[i + 1]; - map.put(key, value); - } - return map; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java deleted file mode 100644 index c09cf61fb93..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/DiskPropertiesTests.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.util.BinaryData; -import org.junit.jupiter.api.Assertions; - -public final class DiskPropertiesTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - DiskProperties model = BinaryData.fromString("{\"provisioningState\":\"Succeeded\",\"diskSizeGB\":2127527772}") - .toObject(DiskProperties.class); - Assertions.assertEquals(2127527772, model.diskSizeGB()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - DiskProperties model = new DiskProperties().withDiskSizeGB(2127527772); - model = BinaryData.fromObject(model).toObject(DiskProperties.class); - Assertions.assertEquals(2127527772, model.diskSizeGB()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java deleted file mode 100644 index 6a4592562ae..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachineInnerTests.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.util.BinaryData; -import java.util.HashMap; -import java.util.Map; -import org.junit.jupiter.api.Assertions; - -public final class VirtualMachineInnerTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - VirtualMachineInner model = BinaryData.fromString( - "{\"properties\":{\"provisioningState\":\"Succeeded\",\"size\":\"uv\"},\"location\":\"xpyb\",\"tags\":{\"sphrupidgs\":\"ehmtzop\"},\"id\":\"bb\",\"name\":\"jhphoyc\",\"type\":\"sx\"}") - .toObject(VirtualMachineInner.class); - Assertions.assertEquals("xpyb", model.location()); - Assertions.assertEquals("ehmtzop", model.tags().get("sphrupidgs")); - Assertions.assertEquals("uv", model.properties().size()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - VirtualMachineInner model = new VirtualMachineInner().withLocation("xpyb") - .withTags(mapOf("sphrupidgs", "ehmtzop")) - .withProperties(new VirtualMachineProperties().withSize("uv")); - model = BinaryData.fromObject(model).toObject(VirtualMachineInner.class); - Assertions.assertEquals("xpyb", model.location()); - Assertions.assertEquals("ehmtzop", model.tags().get("sphrupidgs")); - Assertions.assertEquals("uv", model.properties().size()); - } - - // Use "Map.of" if available - @SuppressWarnings("unchecked") - private static Map mapOf(Object... inputs) { - Map map = new HashMap<>(); - for (int i = 0; i < inputs.length; i += 2) { - String key = (String) inputs[i]; - T value = (T) inputs[i + 1]; - map.put(key, value); - } - return map; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java deleted file mode 100644 index 696397674e2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/azure/resourcemanager/multiserviceolderversions/combined/generated/VirtualMachinePropertiesTests.java +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.generated; - -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.util.BinaryData; -import org.junit.jupiter.api.Assertions; - -public final class VirtualMachinePropertiesTests { - @org.junit.jupiter.api.Test - public void testDeserialize() throws Exception { - VirtualMachineProperties model - = BinaryData.fromString("{\"provisioningState\":\"Canceled\",\"size\":\"dxbmtqioq\"}") - .toObject(VirtualMachineProperties.class); - Assertions.assertEquals("dxbmtqioq", model.size()); - } - - @org.junit.jupiter.api.Test - public void testSerialize() throws Exception { - VirtualMachineProperties model = new VirtualMachineProperties().withSize("dxbmtqioq"); - model = BinaryData.fromObject(model).toObject(VirtualMachineProperties.class); - Assertions.assertEquals("dxbmtqioq", model.size()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp index 99a0b7c326a..9ef4a4987eb 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp @@ -1,3 +1,4 @@ + import "@typespec/rest"; import "@azure-tools/typespec-client-generator-core"; @@ -5,6 +6,10 @@ using TypeSpec.Http; using Azure.ClientGenerator.Core; @service(#{ title: "Visibility" }) +@client({ + service: TspTest.Visibility, + name: "VisibilityClient", +}) namespace TspTest.Visibility; model Dog { @@ -51,6 +56,7 @@ interface VisibilityWrite { }; } +@operationGroup @route("/visibility") interface VisibilityOp extends VisibilityRead, VisibilityWrite { @post From e9716f1140d91590e24cb4b65aebee2166b56a17 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Tue, 24 Mar 2026 16:28:45 +0800 Subject: [PATCH 02/11] bump dependency --- .../package.json | 2 +- .../http-client-generator-test/package.json | 2 +- packages/http-client-java/package-lock.json | 626 +++++++++--------- packages/http-client-java/package.json | 8 +- 4 files changed, 308 insertions(+), 330 deletions(-) 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 031c3b231d9..ad2270cfb06 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 @@ -30,7 +30,7 @@ "@typespec/sse": "0.80.0", "@typespec/streams": "0.80.0", "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-autorest": "0.66.0" }, 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 f72838d38a9..0f19c33bd9c 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 @@ -30,7 +30,7 @@ "@typespec/sse": "0.80.0", "@typespec/streams": "0.80.0", "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-autorest": "0.66.0" }, diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json index 0b5b4b140eb..10319e7bcea 100644 --- a/packages/http-client-java/package-lock.json +++ b/packages/http-client-java/package-lock.json @@ -18,12 +18,12 @@ "@azure-tools/typespec-azure-core": "0.66.0", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@microsoft/api-extractor": "^7.57.7", "@microsoft/api-extractor-model": "^7.33.4", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", - "@types/node": "~25.4.0", + "@types/node": "~25.5.0", "@typespec/compiler": "1.10.0", "@typespec/events": "0.80.0", "@typespec/http": "1.10.0", @@ -38,7 +38,7 @@ "@vitest/ui": "^4.0.18", "c8": "~11.0.0", "rimraf": "~6.1.3", - "typescript": "~5.9.3", + "typescript": "~6.0.2", "vitest": "^4.0.18" }, "engines": { @@ -48,7 +48,7 @@ "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.2 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/events": ">=0.80.0 <1.0.0", "@typespec/http": "^1.10.0", @@ -141,6 +141,7 @@ "integrity": "sha512-OBKxRN7AucK3snh+GtLKSDdcZTz08IgcSZlIO3c4KSlmcR5twT1NMyqf1+V8SAhyOdZimndb+ikzrkkgab+GpA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -156,6 +157,7 @@ "integrity": "sha512-UbgYUaYTt7prsv+RYxd2kiOWjeEeoH56QOqgXnSOFhYzq/h9fyDaQAm6+CY7cklziED+MYy3uMQd1BG9mNwlfQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0" @@ -189,11 +191,12 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.66.2", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.2.tgz", - "integrity": "sha512-Qr5fstJ0yQiTYNvp/EuY3+mUBue2ri9qNZkT6aC+CsfBt5yjfdjo++3SuEsDQtELyS8pBoDOT3weLiB0N+/fSw==", + "version": "0.66.3", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.3.tgz", + "integrity": "sha512-sNetQ6igxAp/vL6X2kEIy715ToDTqoJeb+OL59GEUtOW/3KBSi5tsxvDdCwSfEoaNEmv/FYjh/gJDwAWCJdFJg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "change-case": "~5.4.4", "pluralize": "^8.0.0", @@ -249,6 +252,7 @@ "integrity": "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", @@ -314,6 +318,7 @@ "integrity": "sha512-Evs1INHo+jUjwHi1T6SG6Ua/LHOQBCLuKEEE6efIpt4ZOoNonaT1kP32GoOcdNDbfqsD2445CPri3MubBy5DEQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", @@ -527,13 +532,13 @@ } }, "node_modules/@babel/parser": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", - "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", + "version": "7.29.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", + "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.28.5" + "@babel/types": "^7.29.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -543,9 +548,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", - "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", "dev": true, "license": "MIT", "dependencies": { @@ -567,9 +572,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.4.tgz", + "integrity": "sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==", "cpu": [ "ppc64" ], @@ -584,9 +589,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.4.tgz", + "integrity": "sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==", "cpu": [ "arm" ], @@ -601,9 +606,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.4.tgz", + "integrity": "sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==", "cpu": [ "arm64" ], @@ -618,9 +623,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.4.tgz", + "integrity": "sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==", "cpu": [ "x64" ], @@ -635,9 +640,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.4.tgz", + "integrity": "sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==", "cpu": [ "arm64" ], @@ -652,9 +657,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.4.tgz", + "integrity": "sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==", "cpu": [ "x64" ], @@ -669,9 +674,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.4.tgz", + "integrity": "sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==", "cpu": [ "arm64" ], @@ -686,9 +691,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.4.tgz", + "integrity": "sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==", "cpu": [ "x64" ], @@ -703,9 +708,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.4.tgz", + "integrity": "sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==", "cpu": [ "arm" ], @@ -720,9 +725,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.4.tgz", + "integrity": "sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==", "cpu": [ "arm64" ], @@ -737,9 +742,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.4.tgz", + "integrity": "sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==", "cpu": [ "ia32" ], @@ -754,9 +759,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.4.tgz", + "integrity": "sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==", "cpu": [ "loong64" ], @@ -771,9 +776,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.4.tgz", + "integrity": "sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==", "cpu": [ "mips64el" ], @@ -788,9 +793,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.4.tgz", + "integrity": "sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==", "cpu": [ "ppc64" ], @@ -805,9 +810,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.4.tgz", + "integrity": "sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==", "cpu": [ "riscv64" ], @@ -822,9 +827,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.4.tgz", + "integrity": "sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==", "cpu": [ "s390x" ], @@ -839,9 +844,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.4.tgz", + "integrity": "sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==", "cpu": [ "x64" ], @@ -856,9 +861,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.4.tgz", + "integrity": "sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==", "cpu": [ "arm64" ], @@ -873,9 +878,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.4.tgz", + "integrity": "sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==", "cpu": [ "x64" ], @@ -890,9 +895,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.4.tgz", + "integrity": "sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==", "cpu": [ "arm64" ], @@ -907,9 +912,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.4.tgz", + "integrity": "sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==", "cpu": [ "x64" ], @@ -924,9 +929,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.4.tgz", + "integrity": "sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==", "cpu": [ "arm64" ], @@ -941,9 +946,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.4.tgz", + "integrity": "sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==", "cpu": [ "x64" ], @@ -958,9 +963,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.4.tgz", + "integrity": "sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==", "cpu": [ "arm64" ], @@ -975,9 +980,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.4.tgz", + "integrity": "sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==", "cpu": [ "ia32" ], @@ -992,9 +997,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.4.tgz", + "integrity": "sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==", "cpu": [ "x64" ], @@ -1632,9 +1637,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.56.0.tgz", - "integrity": "sha512-LNKIPA5k8PF1+jAFomGe3qN3bbIgJe/IlpDBwuVjrDKrJhVWywgnJvflMt/zkbVNLFtF1+94SljYQS6e99klnw==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.0.tgz", + "integrity": "sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==", "cpu": [ "arm" ], @@ -1646,9 +1651,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.56.0.tgz", - "integrity": "sha512-lfbVUbelYqXlYiU/HApNMJzT1E87UPGvzveGg2h0ktUNlOCxKlWuJ9jtfvs1sKHdwU4fzY7Pl8sAl49/XaEk6Q==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.0.tgz", + "integrity": "sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==", "cpu": [ "arm64" ], @@ -1660,9 +1665,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.56.0.tgz", - "integrity": "sha512-EgxD1ocWfhoD6xSOeEEwyE7tDvwTgZc8Bss7wCWe+uc7wO8G34HHCUH+Q6cHqJubxIAnQzAsyUsClt0yFLu06w==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.0.tgz", + "integrity": "sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==", "cpu": [ "arm64" ], @@ -1674,9 +1679,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.56.0.tgz", - "integrity": "sha512-1vXe1vcMOssb/hOF8iv52A7feWW2xnu+c8BV4t1F//m9QVLTfNVpEdja5ia762j/UEJe2Z1jAmEqZAK42tVW3g==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.0.tgz", + "integrity": "sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==", "cpu": [ "x64" ], @@ -1688,9 +1693,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.56.0.tgz", - "integrity": "sha512-bof7fbIlvqsyv/DtaXSck4VYQ9lPtoWNFCB/JY4snlFuJREXfZnm+Ej6yaCHfQvofJDXLDMTVxWscVSuQvVWUQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.0.tgz", + "integrity": "sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==", "cpu": [ "arm64" ], @@ -1702,9 +1707,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.56.0.tgz", - "integrity": "sha512-KNa6lYHloW+7lTEkYGa37fpvPq+NKG/EHKM8+G/g9WDU7ls4sMqbVRV78J6LdNuVaeeK5WB9/9VAFbKxcbXKYg==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.0.tgz", + "integrity": "sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==", "cpu": [ "x64" ], @@ -1716,9 +1721,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.56.0.tgz", - "integrity": "sha512-E8jKK87uOvLrrLN28jnAAAChNq5LeCd2mGgZF+fGF5D507WlG/Noct3lP/QzQ6MrqJ5BCKNwI9ipADB6jyiq2A==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.0.tgz", + "integrity": "sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==", "cpu": [ "arm" ], @@ -1730,9 +1735,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.56.0.tgz", - "integrity": "sha512-jQosa5FMYF5Z6prEpTCCmzCXz6eKr/tCBssSmQGEeozA9tkRUty/5Vx06ibaOP9RCrW1Pvb8yp3gvZhHwTDsJw==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.0.tgz", + "integrity": "sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==", "cpu": [ "arm" ], @@ -1744,9 +1749,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.56.0.tgz", - "integrity": "sha512-uQVoKkrC1KGEV6udrdVahASIsaF8h7iLG0U0W+Xn14ucFwi6uS539PsAr24IEF9/FoDtzMeeJXJIBo5RkbNWvQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.0.tgz", + "integrity": "sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==", "cpu": [ "arm64" ], @@ -1758,9 +1763,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.56.0.tgz", - "integrity": "sha512-vLZ1yJKLxhQLFKTs42RwTwa6zkGln+bnXc8ueFGMYmBTLfNu58sl5/eXyxRa2RarTkJbXl8TKPgfS6V5ijNqEA==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.0.tgz", + "integrity": "sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==", "cpu": [ "arm64" ], @@ -1772,9 +1777,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.56.0.tgz", - "integrity": "sha512-FWfHOCub564kSE3xJQLLIC/hbKqHSVxy8vY75/YHHzWvbJL7aYJkdgwD/xGfUlL5UV2SB7otapLrcCj2xnF1dg==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.0.tgz", + "integrity": "sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==", "cpu": [ "loong64" ], @@ -1786,9 +1791,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.56.0.tgz", - "integrity": "sha512-z1EkujxIh7nbrKL1lmIpqFTc/sr0u8Uk0zK/qIEFldbt6EDKWFk/pxFq3gYj4Bjn3aa9eEhYRlL3H8ZbPT1xvA==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.0.tgz", + "integrity": "sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==", "cpu": [ "loong64" ], @@ -1800,9 +1805,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.56.0.tgz", - "integrity": "sha512-iNFTluqgdoQC7AIE8Q34R3AuPrJGJirj5wMUErxj22deOcY7XwZRaqYmB6ZKFHoVGqRcRd0mqO+845jAibKCkw==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.0.tgz", + "integrity": "sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==", "cpu": [ "ppc64" ], @@ -1814,9 +1819,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.56.0.tgz", - "integrity": "sha512-MtMeFVlD2LIKjp2sE2xM2slq3Zxf9zwVuw0jemsxvh1QOpHSsSzfNOTH9uYW9i1MXFxUSMmLpeVeUzoNOKBaWg==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.0.tgz", + "integrity": "sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==", "cpu": [ "ppc64" ], @@ -1828,9 +1833,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.56.0.tgz", - "integrity": "sha512-in+v6wiHdzzVhYKXIk5U74dEZHdKN9KH0Q4ANHOTvyXPG41bajYRsy7a8TPKbYPl34hU7PP7hMVHRvv/5aCSew==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.0.tgz", + "integrity": "sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==", "cpu": [ "riscv64" ], @@ -1842,9 +1847,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.56.0.tgz", - "integrity": "sha512-yni2raKHB8m9NQpI9fPVwN754mn6dHQSbDTwxdr9SE0ks38DTjLMMBjrwvB5+mXrX+C0npX0CVeCUcvvvD8CNQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.0.tgz", + "integrity": "sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==", "cpu": [ "riscv64" ], @@ -1856,9 +1861,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.56.0.tgz", - "integrity": "sha512-zhLLJx9nQPu7wezbxt2ut+CI4YlXi68ndEve16tPc/iwoylWS9B3FxpLS2PkmfYgDQtosah07Mj9E0khc3Y+vQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.0.tgz", + "integrity": "sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==", "cpu": [ "s390x" ], @@ -1870,9 +1875,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.56.0.tgz", - "integrity": "sha512-MVC6UDp16ZSH7x4rtuJPAEoE1RwS8N4oK9DLHy3FTEdFoUTCFVzMfJl/BVJ330C+hx8FfprA5Wqx4FhZXkj2Kw==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.0.tgz", + "integrity": "sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==", "cpu": [ "x64" ], @@ -1884,9 +1889,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.56.0.tgz", - "integrity": "sha512-ZhGH1eA4Qv0lxaV00azCIS1ChedK0V32952Md3FtnxSqZTBTd6tgil4nZT5cU8B+SIw3PFYkvyR4FKo2oyZIHA==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.0.tgz", + "integrity": "sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==", "cpu": [ "x64" ], @@ -1898,9 +1903,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.56.0.tgz", - "integrity": "sha512-O16XcmyDeFI9879pEcmtWvD/2nyxR9mF7Gs44lf1vGGx8Vg2DRNx11aVXBEqOQhWb92WN4z7fW/q4+2NYzCbBA==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.0.tgz", + "integrity": "sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==", "cpu": [ "x64" ], @@ -1912,9 +1917,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.56.0.tgz", - "integrity": "sha512-LhN/Reh+7F3RCgQIRbgw8ZMwUwyqJM+8pXNT6IIJAqm2IdKkzpCh/V9EdgOMBKuebIrzswqy4ATlrDgiOwbRcQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.0.tgz", + "integrity": "sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==", "cpu": [ "arm64" ], @@ -1926,9 +1931,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.56.0.tgz", - "integrity": "sha512-kbFsOObXp3LBULg1d3JIUQMa9Kv4UitDmpS+k0tinPBz3watcUiV2/LUDMMucA6pZO3WGE27P7DsfaN54l9ing==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.0.tgz", + "integrity": "sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==", "cpu": [ "arm64" ], @@ -1940,9 +1945,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.56.0.tgz", - "integrity": "sha512-vSSgny54D6P4vf2izbtFm/TcWYedw7f8eBrOiGGecyHyQB9q4Kqentjaj8hToe+995nob/Wv48pDqL5a62EWtg==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.0.tgz", + "integrity": "sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==", "cpu": [ "ia32" ], @@ -1954,9 +1959,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.56.0.tgz", - "integrity": "sha512-FeCnkPCTHQJFbiGG49KjV5YGW/8b9rrXAM2Mz2kiIoktq2qsJxRD5giEMEOD2lPdgs72upzefaUvS+nc8E3UzQ==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.0.tgz", + "integrity": "sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==", "cpu": [ "x64" ], @@ -1968,9 +1973,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz", - "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz", + "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==", "cpu": [ "x64" ], @@ -2176,11 +2181,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.4.0.tgz", - "integrity": "sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz", + "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.18.0" } @@ -2198,6 +2204,7 @@ "integrity": "sha512-R6BATDkughntPpaxeESJF+wxma5PEjgmnnKvH0/ByqUH8VyhIckQWE9kkP0Uc/EJ0o0VYhe8qCwWQvV70k5lTw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "~7.29.0", "@inquirer/prompts": "^8.0.1", @@ -2359,6 +2366,7 @@ "integrity": "sha512-FrWEUwxhDNbE2YN4fyqV5Qrz9qFJbvPoiKrJM7dexkb7eyhepq3dbc5zZgAm/qFBQ+XxGQQVJ4swXxKT+338fw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2372,6 +2380,7 @@ "integrity": "sha512-/fj55fmUj4m/FmNdfH0V52menVrmS2r5Xj9d1H+pnjQbxvvaxS906RSRcoF8kbg3PvlibP/Py5u82TAk53AyqA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2391,6 +2400,7 @@ "integrity": "sha512-tukmyp+c9CFlA2FdF61XfT9eTe5WXWz6J8pOrJ9+IYg0BcBwhJkvDj6BYpDD6SjxbRr1wO5ZL2Whe6MequsyVw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2405,6 +2415,7 @@ "integrity": "sha512-xczXLoB2akSIDner41gQYTS9CG6TdCN0QHYvXBT6ZrYEnBh+pMvdymW//5CSOTamZLOGo9AOJVJaFfwbFA4vQQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2624,6 +2635,7 @@ "integrity": "sha512-/lxYgMaxgEcjBVhep9tf/VnFD2wnkZlkmjUHLeZL8Cuf+qip61Ren6Ml91YtNnnIFYsuuymDzRclrA073ZBR6Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2640,6 +2652,7 @@ "integrity": "sha512-lNvzrvX/ZRIxRpxIBZu90XNsT+uWsMbLtxHd9edspHAiID3c9WKZbl2fnLcPqdR/60odqKve4yGzB9gF58GUDQ==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2668,6 +2681,7 @@ "integrity": "sha512-WQCT0jN2lSRfwOy+Cd1KUYzenpKR5TdoX0uW6zQdvxQ9nQZIXoaSaReh9/ldhmSV4xv3p2dqF9oq1cdbVGfJTg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2681,6 +2695,7 @@ "integrity": "sha512-Qfy5eyCcOF3xYOU/dejhpmmeY75U1Q9C8XBE+GvSZ3lakRfKBIpT+X6Q07qmKSAbGYJZKYLWCIAy/dgCuu/OAA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=20.0.0" }, @@ -2822,6 +2837,7 @@ "integrity": "sha512-CGJ25bc8fRi8Lod/3GHSvXRKi7nBo3kxh0ApW4yCjmrWmRmlT53B5E08XRSZRliygG0aVNxLrBEqPYdz/KcCtQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/utils": "4.0.18", "fflate": "^0.8.2", @@ -3011,21 +3027,21 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "0.3.10", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.10.tgz", - "integrity": "sha512-p4K7vMz2ZSk3wN8l5o3y2bJAoZXT3VuJI5OLTATY/01CYWumWvwkUw0SqDBnNq6IiTO3qDa1eSQDibAV8g7XOQ==", + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.12.tgz", + "integrity": "sha512-BRRC8VRZY2R4Z4lFIL35MwNXmwVqBityvOIwETtsCSwvjl0IdgFsy9NhdaA6j74nUdtJJlIypeRhpDam19Wq3g==", "dev": true, "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.31", "estree-walker": "^3.0.3", - "js-tokens": "^9.0.1" + "js-tokens": "^10.0.0" } }, "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", - "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", + "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==", "dev": true, "license": "MIT" }, @@ -3541,9 +3557,9 @@ } }, "node_modules/diff": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz", - "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz", + "integrity": "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -3676,9 +3692,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.4.tgz", + "integrity": "sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3689,32 +3705,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.2", - "@esbuild/android-arm": "0.27.2", - "@esbuild/android-arm64": "0.27.2", - "@esbuild/android-x64": "0.27.2", - "@esbuild/darwin-arm64": "0.27.2", - "@esbuild/darwin-x64": "0.27.2", - "@esbuild/freebsd-arm64": "0.27.2", - "@esbuild/freebsd-x64": "0.27.2", - "@esbuild/linux-arm": "0.27.2", - "@esbuild/linux-arm64": "0.27.2", - "@esbuild/linux-ia32": "0.27.2", - "@esbuild/linux-loong64": "0.27.2", - "@esbuild/linux-mips64el": "0.27.2", - "@esbuild/linux-ppc64": "0.27.2", - "@esbuild/linux-riscv64": "0.27.2", - "@esbuild/linux-s390x": "0.27.2", - "@esbuild/linux-x64": "0.27.2", - "@esbuild/netbsd-arm64": "0.27.2", - "@esbuild/netbsd-x64": "0.27.2", - "@esbuild/openbsd-arm64": "0.27.2", - "@esbuild/openbsd-x64": "0.27.2", - "@esbuild/openharmony-arm64": "0.27.2", - "@esbuild/sunos-x64": "0.27.2", - "@esbuild/win32-arm64": "0.27.2", - "@esbuild/win32-ia32": "0.27.2", - "@esbuild/win32-x64": "0.27.2" + "@esbuild/aix-ppc64": "0.27.4", + "@esbuild/android-arm": "0.27.4", + "@esbuild/android-arm64": "0.27.4", + "@esbuild/android-x64": "0.27.4", + "@esbuild/darwin-arm64": "0.27.4", + "@esbuild/darwin-x64": "0.27.4", + "@esbuild/freebsd-arm64": "0.27.4", + "@esbuild/freebsd-x64": "0.27.4", + "@esbuild/linux-arm": "0.27.4", + "@esbuild/linux-arm64": "0.27.4", + "@esbuild/linux-ia32": "0.27.4", + "@esbuild/linux-loong64": "0.27.4", + "@esbuild/linux-mips64el": "0.27.4", + "@esbuild/linux-ppc64": "0.27.4", + "@esbuild/linux-riscv64": "0.27.4", + "@esbuild/linux-s390x": "0.27.4", + "@esbuild/linux-x64": "0.27.4", + "@esbuild/netbsd-arm64": "0.27.4", + "@esbuild/netbsd-x64": "0.27.4", + "@esbuild/openbsd-arm64": "0.27.4", + "@esbuild/openbsd-x64": "0.27.4", + "@esbuild/openharmony-arm64": "0.27.4", + "@esbuild/sunos-x64": "0.27.4", + "@esbuild/win32-arm64": "0.27.4", + "@esbuild/win32-ia32": "0.27.4", + "@esbuild/win32-x64": "0.27.4" } }, "node_modules/escalade": { @@ -3863,9 +3879,9 @@ } }, "node_modules/fast-xml-parser": { - "version": "5.5.6", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz", - "integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==", + "version": "5.5.9", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz", + "integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==", "dev": true, "funding": [ { @@ -3876,8 +3892,8 @@ "license": "MIT", "dependencies": { "fast-xml-builder": "^1.1.4", - "path-expression-matcher": "^1.1.3", - "strnum": "^2.1.2" + "path-expression-matcher": "^1.2.0", + "strnum": "^2.2.2" }, "bin": { "fxparser": "src/cli/cli.js" @@ -5033,14 +5049,14 @@ } }, "node_modules/magicast": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.1.tgz", - "integrity": "sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz", + "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.5", - "@babel/types": "^7.28.5", + "@babel/parser": "^7.29.0", + "@babel/types": "^7.29.0", "source-map-js": "^1.2.1" } }, @@ -5159,16 +5175,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -5192,19 +5198,6 @@ "node": ">= 18" } }, - "node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "license": "MIT", - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, "node_modules/morgan": { "version": "1.10.1", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", @@ -5270,22 +5263,23 @@ "license": "MIT" }, "node_modules/multer": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz", - "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/multer/-/multer-2.1.1.tgz", + "integrity": "sha512-mo+QTzKlx8R7E5ylSXxWzGoXoZbOsRMpyitcht8By2KHvMbf3tjwosZ/Mu/XYU6UuJ3VZnODIrak5ZrPiPyB6A==", "dev": true, "license": "MIT", "dependencies": { "append-field": "^1.0.0", "busboy": "^1.6.0", "concat-stream": "^2.0.0", - "mkdirp": "^0.5.6", - "object-assign": "^4.1.1", - "type-is": "^1.6.18", - "xtend": "^4.0.2" + "type-is": "^1.6.18" }, "engines": { "node": ">= 10.16.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/multer/node_modules/media-typer": { @@ -5383,16 +5377,6 @@ "node": ">= 0.6" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -5574,9 +5558,9 @@ } }, "node_modules/path-expression-matcher": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.1.3.tgz", - "integrity": "sha512-qdVgY8KXmVdJZRSS1JdEPOKPdTiEK/pi0RkcT2sw1RhXxohdujUlJFPuS1TSkevZ9vzd3ZlL7ULl1MHGTApKzQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.0.tgz", + "integrity": "sha512-DwmPWeFn+tq7TiyJ2CxezCAirXjFxvaiD03npak3cRjlP9+OjTmSy1EpIrEbh+l6JgUundniloMLDQ/6VTdhLQ==", "dev": true, "funding": [ { @@ -5681,9 +5665,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz", + "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==", "dev": true, "funding": [ { @@ -5931,9 +5915,9 @@ } }, "node_modules/rollup": { - "version": "4.56.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.56.0.tgz", - "integrity": "sha512-9FwVqlgUHzbXtDg9RCMgodF3Ua4Na6Gau+Sdt9vyCN4RhHfVKX2DCHy3BjMLTDd47ITDhYAnTwGulWTblJSDLg==", + "version": "4.60.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.0.tgz", + "integrity": "sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5947,31 +5931,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.56.0", - "@rollup/rollup-android-arm64": "4.56.0", - "@rollup/rollup-darwin-arm64": "4.56.0", - "@rollup/rollup-darwin-x64": "4.56.0", - "@rollup/rollup-freebsd-arm64": "4.56.0", - "@rollup/rollup-freebsd-x64": "4.56.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.56.0", - "@rollup/rollup-linux-arm-musleabihf": "4.56.0", - "@rollup/rollup-linux-arm64-gnu": "4.56.0", - "@rollup/rollup-linux-arm64-musl": "4.56.0", - "@rollup/rollup-linux-loong64-gnu": "4.56.0", - "@rollup/rollup-linux-loong64-musl": "4.56.0", - "@rollup/rollup-linux-ppc64-gnu": "4.56.0", - "@rollup/rollup-linux-ppc64-musl": "4.56.0", - "@rollup/rollup-linux-riscv64-gnu": "4.56.0", - "@rollup/rollup-linux-riscv64-musl": "4.56.0", - "@rollup/rollup-linux-s390x-gnu": "4.56.0", - "@rollup/rollup-linux-x64-gnu": "4.56.0", - "@rollup/rollup-linux-x64-musl": "4.56.0", - "@rollup/rollup-openbsd-x64": "4.56.0", - "@rollup/rollup-openharmony-arm64": "4.56.0", - "@rollup/rollup-win32-arm64-msvc": "4.56.0", - "@rollup/rollup-win32-ia32-msvc": "4.56.0", - "@rollup/rollup-win32-x64-gnu": "4.56.0", - "@rollup/rollup-win32-x64-msvc": "4.56.0", + "@rollup/rollup-android-arm-eabi": "4.60.0", + "@rollup/rollup-android-arm64": "4.60.0", + "@rollup/rollup-darwin-arm64": "4.60.0", + "@rollup/rollup-darwin-x64": "4.60.0", + "@rollup/rollup-freebsd-arm64": "4.60.0", + "@rollup/rollup-freebsd-x64": "4.60.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.60.0", + "@rollup/rollup-linux-arm-musleabihf": "4.60.0", + "@rollup/rollup-linux-arm64-gnu": "4.60.0", + "@rollup/rollup-linux-arm64-musl": "4.60.0", + "@rollup/rollup-linux-loong64-gnu": "4.60.0", + "@rollup/rollup-linux-loong64-musl": "4.60.0", + "@rollup/rollup-linux-ppc64-gnu": "4.60.0", + "@rollup/rollup-linux-ppc64-musl": "4.60.0", + "@rollup/rollup-linux-riscv64-gnu": "4.60.0", + "@rollup/rollup-linux-riscv64-musl": "4.60.0", + "@rollup/rollup-linux-s390x-gnu": "4.60.0", + "@rollup/rollup-linux-x64-gnu": "4.60.0", + "@rollup/rollup-linux-x64-musl": "4.60.0", + "@rollup/rollup-openbsd-x64": "4.60.0", + "@rollup/rollup-openharmony-arm64": "4.60.0", + "@rollup/rollup-win32-arm64-msvc": "4.60.0", + "@rollup/rollup-win32-ia32-msvc": "4.60.0", + "@rollup/rollup-win32-x64-gnu": "4.60.0", + "@rollup/rollup-win32-x64-msvc": "4.60.0", "fsevents": "~2.3.2" } }, @@ -6475,9 +6459,9 @@ } }, "node_modules/strnum": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.0.tgz", - "integrity": "sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.2.tgz", + "integrity": "sha512-DnR90I+jtXNSTXWdwrEy9FakW7UX+qUZg28gj5fk2vxxl7uS/3bpI4fjFYVmdK9etptYBPNkpahuQnEwhwECqA==", "dev": true, "funding": [ { @@ -6599,9 +6583,9 @@ "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", - "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.4.tgz", + "integrity": "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==", "dev": true, "license": "MIT", "engines": { @@ -6644,11 +6628,12 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -6657,9 +6642,9 @@ } }, "node_modules/tinyrainbow": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.0.3.tgz", - "integrity": "sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz", + "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==", "dev": true, "license": "MIT", "engines": { @@ -6729,9 +6714,9 @@ "license": "MIT" }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz", + "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -6829,6 +6814,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -6917,11 +6903,12 @@ } }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -6935,6 +6922,7 @@ "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@vitest/expect": "4.0.18", "@vitest/mocker": "4.0.18", @@ -7008,9 +6996,9 @@ } }, "node_modules/vitest/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", "engines": { @@ -7221,16 +7209,6 @@ "node": ">=4.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json index 4d683166d2a..866a12934ff 100644 --- a/packages/http-client-java/package.json +++ b/packages/http-client-java/package.json @@ -52,7 +52,7 @@ "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.2 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/events": ">=0.80.0 <1.0.0", "@typespec/http": "^1.10.0", @@ -73,12 +73,12 @@ "@azure-tools/typespec-azure-core": "0.66.0", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.2", + "@azure-tools/typespec-client-generator-core": "0.66.3", "@microsoft/api-extractor": "^7.57.7", "@microsoft/api-extractor-model": "^7.33.4", "@types/js-yaml": "~4.0.9", "@types/lodash": "~4.17.24", - "@types/node": "~25.4.0", + "@types/node": "~25.5.0", "@typespec/compiler": "1.10.0", "@typespec/events": "0.80.0", "@typespec/http": "1.10.0", @@ -93,7 +93,7 @@ "@vitest/ui": "^4.0.18", "c8": "~11.0.0", "rimraf": "~6.1.3", - "typescript": "~5.9.3", + "typescript": "~6.0.2", "vitest": "^4.0.18" } } From 798ddc87339c69e3a3fcc74bf736cf0af7c3e72a Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Tue, 24 Mar 2026 16:39:42 +0800 Subject: [PATCH 03/11] regen --- .../combined/CombinedManager.java | 298 ------------ .../combined/fluent/Combined.java | 55 --- .../combined/fluent/DisksClient.java | 105 ----- .../fluent/VirtualMachinesClient.java | 111 ----- .../combined/fluent/models/DiskInner.java | 181 -------- .../fluent/models/VirtualMachineInner.java | 181 -------- .../combined/fluent/models/package-info.java | 9 - .../combined/fluent/package-info.java | 9 - .../implementation/CombinedBuilder.java | 138 ------ .../combined/implementation/CombinedImpl.java | 309 ------------- .../combined/implementation/DiskImpl.java | 164 ------- .../implementation/DisksClientImpl.java | 345 -------------- .../combined/implementation/DisksImpl.java | 84 ---- .../implementation/ResourceManagerUtils.java | 195 -------- .../implementation/VirtualMachineImpl.java | 165 ------- .../VirtualMachinesClientImpl.java | 361 --------------- .../implementation/VirtualMachinesImpl.java | 85 ---- .../combined/implementation/package-info.java | 9 - .../combined/models/Disk.java | 265 ----------- .../combined/models/DiskProperties.java | 102 ---- .../combined/models/Disks.java | 69 --- .../models/ResourceProvisioningState.java | 56 --- .../combined/models/VirtualMachine.java | 265 ----------- .../models/VirtualMachineProperties.java | 102 ---- .../combined/models/VirtualMachines.java | 69 --- .../combined/models/package-info.java | 9 - .../combined/package-info.java | 9 - .../visibility/VisibilityClientBuilder.java | 34 +- ...ient.java => VisibilityOpAsyncClient.java} | 10 +- ...ityClient.java => VisibilityOpClient.java} | 10 +- .../implementation/VisibilityClientImpl.java | 423 +---------------- .../implementation/VisibilityOpsImpl.java | 435 ++++++++++++++++++ ...ned-generated_metadata_older-versions.json | 1 - .../proxy-config.json | 1 - .../reflect-config.json | 1 - .../META-INF/tsptest-visibility_metadata.json | 2 +- .../generated/VisibilityClientTestBase.java | 24 +- 37 files changed, 490 insertions(+), 4201 deletions(-) delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java rename packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/{VisibilityAsyncClient.java => VisibilityOpAsyncClient.java} (97%) rename packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/{VisibilityClient.java => VisibilityOpClient.java} (97%) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java deleted file mode 100644 index d24968bd14f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java +++ /dev/null @@ -1,298 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.CombinedBuilder; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.DisksImpl; -import azure.resourcemanager.multiserviceolderversions.combined.implementation.VirtualMachinesImpl; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disks; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachines; -import com.azure.core.credential.TokenCredential; -import com.azure.core.http.HttpClient; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.HttpPipelinePosition; -import com.azure.core.http.policy.AddDatePolicy; -import com.azure.core.http.policy.AddHeadersFromContextPolicy; -import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; -import com.azure.core.http.policy.HttpLogOptions; -import com.azure.core.http.policy.HttpLoggingPolicy; -import com.azure.core.http.policy.HttpPipelinePolicy; -import com.azure.core.http.policy.HttpPolicyProviders; -import com.azure.core.http.policy.RequestIdPolicy; -import com.azure.core.http.policy.RetryOptions; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.profile.AzureProfile; -import com.azure.core.util.Configuration; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.logging.ClientLogger; -import java.time.Duration; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * Entry point to CombinedManager. - * Compute Client. - */ -public final class CombinedManager { - private VirtualMachines virtualMachines; - - private Disks disks; - - private final Combined clientObject; - - private CombinedManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) { - Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - this.clientObject = new CombinedBuilder().pipeline(httpPipeline) - .endpoint(profile.getEnvironment().getResourceManagerEndpoint()) - .subscriptionId(profile.getSubscriptionId()) - .defaultPollInterval(defaultPollInterval) - .buildClient(); - } - - /** - * Creates an instance of combined service API entry point. - * - * @param credential the credential to use. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public static CombinedManager authenticate(TokenCredential credential, AzureProfile profile) { - Objects.requireNonNull(credential, "'credential' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - return configure().authenticate(credential, profile); - } - - /** - * Creates an instance of combined service API entry point. - * - * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public static CombinedManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) { - Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - return new CombinedManager(httpPipeline, profile, null); - } - - /** - * Gets a Configurable instance that can be used to create CombinedManager with optional configuration. - * - * @return the Configurable instance allowing configurations. - */ - public static Configurable configure() { - return new CombinedManager.Configurable(); - } - - /** - * The Configurable allowing configurations to be set. - */ - public static final class Configurable { - private static final ClientLogger LOGGER = new ClientLogger(Configurable.class); - private static final String SDK_VERSION = "version"; - private static final Map PROPERTIES - = CoreUtils.getProperties("azure-resourcemanager-combined-generated.properties"); - - private HttpClient httpClient; - private HttpLogOptions httpLogOptions; - private final List policies = new ArrayList<>(); - private final List scopes = new ArrayList<>(); - private RetryPolicy retryPolicy; - private RetryOptions retryOptions; - private Duration defaultPollInterval; - - private Configurable() { - } - - /** - * Sets the http client. - * - * @param httpClient the HTTP client. - * @return the configurable object itself. - */ - public Configurable withHttpClient(HttpClient httpClient) { - this.httpClient = Objects.requireNonNull(httpClient, "'httpClient' cannot be null."); - return this; - } - - /** - * Sets the logging options to the HTTP pipeline. - * - * @param httpLogOptions the HTTP log options. - * @return the configurable object itself. - */ - public Configurable withLogOptions(HttpLogOptions httpLogOptions) { - this.httpLogOptions = Objects.requireNonNull(httpLogOptions, "'httpLogOptions' cannot be null."); - return this; - } - - /** - * Adds the pipeline policy to the HTTP pipeline. - * - * @param policy the HTTP pipeline policy. - * @return the configurable object itself. - */ - public Configurable withPolicy(HttpPipelinePolicy policy) { - this.policies.add(Objects.requireNonNull(policy, "'policy' cannot be null.")); - return this; - } - - /** - * Adds the scope to permission sets. - * - * @param scope the scope. - * @return the configurable object itself. - */ - public Configurable withScope(String scope) { - this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null.")); - return this; - } - - /** - * Sets the retry policy to the HTTP pipeline. - * - * @param retryPolicy the HTTP pipeline retry policy. - * @return the configurable object itself. - */ - public Configurable withRetryPolicy(RetryPolicy retryPolicy) { - this.retryPolicy = Objects.requireNonNull(retryPolicy, "'retryPolicy' cannot be null."); - return this; - } - - /** - * Sets the retry options for the HTTP pipeline retry policy. - *

- * This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}. - * - * @param retryOptions the retry options for the HTTP pipeline retry policy. - * @return the configurable object itself. - */ - public Configurable withRetryOptions(RetryOptions retryOptions) { - this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null."); - return this; - } - - /** - * Sets the default poll interval, used when service does not provide "Retry-After" header. - * - * @param defaultPollInterval the default poll interval. - * @return the configurable object itself. - */ - public Configurable withDefaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval - = Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null."); - if (this.defaultPollInterval.isNegative()) { - throw LOGGER - .logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative")); - } - return this; - } - - /** - * Creates an instance of combined service API entry point. - * - * @param credential the credential to use. - * @param profile the Azure profile for client. - * @return the combined service API instance. - */ - public CombinedManager authenticate(TokenCredential credential, AzureProfile profile) { - Objects.requireNonNull(credential, "'credential' cannot be null."); - Objects.requireNonNull(profile, "'profile' cannot be null."); - - String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion"); - - StringBuilder userAgentBuilder = new StringBuilder(); - userAgentBuilder.append("azsdk-java") - .append("-") - .append("azure.resourcemanager.multiserviceolderversions.combined") - .append("/") - .append(clientVersion); - if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) { - userAgentBuilder.append(" (") - .append(Configuration.getGlobalConfiguration().get("java.version")) - .append("; ") - .append(Configuration.getGlobalConfiguration().get("os.name")) - .append("; ") - .append(Configuration.getGlobalConfiguration().get("os.version")) - .append("; auto-generated)"); - } else { - userAgentBuilder.append(" (auto-generated)"); - } - - if (scopes.isEmpty()) { - scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default"); - } - if (retryPolicy == null) { - if (retryOptions != null) { - retryPolicy = new RetryPolicy(retryOptions); - } else { - retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS); - } - } - List policies = new ArrayList<>(); - policies.add(new UserAgentPolicy(userAgentBuilder.toString())); - policies.add(new AddHeadersFromContextPolicy()); - policies.add(new RequestIdPolicy()); - policies.addAll(this.policies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL) - .collect(Collectors.toList())); - HttpPolicyProviders.addBeforeRetryPolicies(policies); - policies.add(retryPolicy); - policies.add(new AddDatePolicy()); - policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0]))); - policies.addAll(this.policies.stream() - .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY) - .collect(Collectors.toList())); - HttpPolicyProviders.addAfterRetryPolicies(policies); - policies.add(new HttpLoggingPolicy(httpLogOptions)); - HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(httpClient) - .policies(policies.toArray(new HttpPipelinePolicy[0])) - .build(); - return new CombinedManager(httpPipeline, profile, defaultPollInterval); - } - } - - /** - * Gets the resource collection API of VirtualMachines. It manages VirtualMachine. - * - * @return Resource collection API of VirtualMachines. - */ - public VirtualMachines virtualMachines() { - if (this.virtualMachines == null) { - this.virtualMachines = new VirtualMachinesImpl(clientObject.getVirtualMachines(), this); - } - return virtualMachines; - } - - /** - * Gets the resource collection API of Disks. It manages Disk. - * - * @return Resource collection API of Disks. - */ - public Disks disks() { - if (this.disks == null) { - this.disks = new DisksImpl(clientObject.getDisks(), this); - } - return disks; - } - - /** - * Gets wrapped service client Combined providing direct access to the underlying auto-generated API implementation, - * based on Azure REST API. - * - * @return Wrapped service client Combined. - */ - public Combined serviceClient() { - return this.clientObject; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java deleted file mode 100644 index c14cf89263c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import com.azure.core.http.HttpPipeline; -import java.time.Duration; - -/** - * The interface for Combined class. - */ -public interface Combined { - /** - * Gets Service host. - * - * @return the endpoint value. - */ - String getEndpoint(); - - /** - * Gets The ID of the target subscription. The value must be an UUID. - * - * @return the subscriptionId value. - */ - String getSubscriptionId(); - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - HttpPipeline getHttpPipeline(); - - /** - * Gets The default poll interval for long-running operation. - * - * @return the defaultPollInterval value. - */ - Duration getDefaultPollInterval(); - - /** - * Gets the VirtualMachinesClient object to access its operations. - * - * @return the VirtualMachinesClient object. - */ - VirtualMachinesClient getVirtualMachines(); - - /** - * Gets the DisksClient object to access its operations. - * - * @return the DisksClient object. - */ - DisksClient getDisks(); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java deleted file mode 100644 index 53d3f79daf9..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.http.rest.Response; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.Context; -import com.azure.core.util.polling.SyncPoller; - -/** - * An instance of this class provides access to all the operations defined in DisksClient. - */ -public interface DisksClient { - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context); - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner getByResourceGroup(String resourceGroupName, String diskName); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource, Context context); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource); - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource, Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java deleted file mode 100644 index ae8ed67197d..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.http.rest.Response; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.Context; -import com.azure.core.util.polling.SyncPoller; - -/** - * An instance of this class provides access to all the operations defined in VirtualMachinesClient. - */ -public interface VirtualMachinesClient { - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner getByResourceGroup(String resourceGroupName, String vmName); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, VirtualMachineInner> beginCreateOrUpdate(String resourceGroupName, - String vmName, VirtualMachineInner resource); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - SyncPoller, VirtualMachineInner> beginCreateOrUpdate(String resourceGroupName, - String vmName, VirtualMachineInner resource, Context context); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource); - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, - Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java deleted file mode 100644 index 920c05c5c28..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; - -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.annotation.Fluent; -import com.azure.core.management.Resource; -import com.azure.core.management.SystemData; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.Map; - -/** - * Disk resource. - */ -@Fluent -public final class DiskInner extends Resource { - /* - * The resource-specific properties for this resource. - */ - private DiskProperties properties; - - /* - * Azure Resource Manager metadata containing createdBy and modifiedBy information. - */ - private SystemData systemData; - - /* - * The type of the resource. - */ - private String type; - - /* - * The name of the resource. - */ - private String name; - - /* - * Fully qualified resource Id for the resource. - */ - private String id; - - /** - * Creates an instance of DiskInner class. - */ - public DiskInner() { - } - - /** - * Get the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - public DiskProperties properties() { - return this.properties; - } - - /** - * Set the properties property: The resource-specific properties for this resource. - * - * @param properties the properties value to set. - * @return the DiskInner object itself. - */ - public DiskInner withProperties(DiskProperties properties) { - this.properties = properties; - return this; - } - - /** - * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - public SystemData systemData() { - return this.systemData; - } - - /** - * Get the type property: The type of the resource. - * - * @return the type value. - */ - @Override - public String type() { - return this.type; - } - - /** - * Get the name property: The name of the resource. - * - * @return the name value. - */ - @Override - public String name() { - return this.name; - } - - /** - * Get the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - @Override - public String id() { - return this.id; - } - - /** - * {@inheritDoc} - */ - @Override - public DiskInner withLocation(String location) { - super.withLocation(location); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public DiskInner withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("location", location()); - jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("properties", this.properties); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of DiskInner from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of DiskInner if the JsonReader was pointing to an instance of it, or null if it was pointing - * to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the DiskInner. - */ - public static DiskInner fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - DiskInner deserializedDiskInner = new DiskInner(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("id".equals(fieldName)) { - deserializedDiskInner.id = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedDiskInner.name = reader.getString(); - } else if ("type".equals(fieldName)) { - deserializedDiskInner.type = reader.getString(); - } else if ("location".equals(fieldName)) { - deserializedDiskInner.withLocation(reader.getString()); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedDiskInner.withTags(tags); - } else if ("properties".equals(fieldName)) { - deserializedDiskInner.properties = DiskProperties.fromJson(reader); - } else if ("systemData".equals(fieldName)) { - deserializedDiskInner.systemData = SystemData.fromJson(reader); - } else { - reader.skipChildren(); - } - } - - return deserializedDiskInner; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java deleted file mode 100644 index fbf8b1af82e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; - -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.annotation.Fluent; -import com.azure.core.management.Resource; -import com.azure.core.management.SystemData; -import com.azure.json.JsonReader; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.Map; - -/** - * Describes a Virtual Machine. - */ -@Fluent -public final class VirtualMachineInner extends Resource { - /* - * The resource-specific properties for this resource. - */ - private VirtualMachineProperties properties; - - /* - * Azure Resource Manager metadata containing createdBy and modifiedBy information. - */ - private SystemData systemData; - - /* - * The type of the resource. - */ - private String type; - - /* - * The name of the resource. - */ - private String name; - - /* - * Fully qualified resource Id for the resource. - */ - private String id; - - /** - * Creates an instance of VirtualMachineInner class. - */ - public VirtualMachineInner() { - } - - /** - * Get the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - public VirtualMachineProperties properties() { - return this.properties; - } - - /** - * Set the properties property: The resource-specific properties for this resource. - * - * @param properties the properties value to set. - * @return the VirtualMachineInner object itself. - */ - public VirtualMachineInner withProperties(VirtualMachineProperties properties) { - this.properties = properties; - return this; - } - - /** - * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - public SystemData systemData() { - return this.systemData; - } - - /** - * Get the type property: The type of the resource. - * - * @return the type value. - */ - @Override - public String type() { - return this.type; - } - - /** - * Get the name property: The name of the resource. - * - * @return the name value. - */ - @Override - public String name() { - return this.name; - } - - /** - * Get the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - @Override - public String id() { - return this.id; - } - - /** - * {@inheritDoc} - */ - @Override - public VirtualMachineInner withLocation(String location) { - super.withLocation(location); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public VirtualMachineInner withTags(Map tags) { - super.withTags(tags); - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("location", location()); - jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element)); - jsonWriter.writeJsonField("properties", this.properties); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of VirtualMachineInner from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of VirtualMachineInner if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the VirtualMachineInner. - */ - public static VirtualMachineInner fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - VirtualMachineInner deserializedVirtualMachineInner = new VirtualMachineInner(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("id".equals(fieldName)) { - deserializedVirtualMachineInner.id = reader.getString(); - } else if ("name".equals(fieldName)) { - deserializedVirtualMachineInner.name = reader.getString(); - } else if ("type".equals(fieldName)) { - deserializedVirtualMachineInner.type = reader.getString(); - } else if ("location".equals(fieldName)) { - deserializedVirtualMachineInner.withLocation(reader.getString()); - } else if ("tags".equals(fieldName)) { - Map tags = reader.readMap(reader1 -> reader1.getString()); - deserializedVirtualMachineInner.withTags(tags); - } else if ("properties".equals(fieldName)) { - deserializedVirtualMachineInner.properties = VirtualMachineProperties.fromJson(reader); - } else if ("systemData".equals(fieldName)) { - deserializedVirtualMachineInner.systemData = SystemData.fromJson(reader); - } else { - reader.skipChildren(); - } - } - - return deserializedVirtualMachineInner; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java deleted file mode 100644 index b6f7366cf9f..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the inner data models for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.fluent.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java deleted file mode 100644 index f26ba069655..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the service clients for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.fluent; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java deleted file mode 100644 index 3178471ba12..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import com.azure.core.annotation.ServiceClientBuilder; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpPipelineBuilder; -import com.azure.core.http.policy.RetryPolicy; -import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.management.AzureEnvironment; -import com.azure.core.management.serializer.SerializerFactory; -import com.azure.core.util.serializer.SerializerAdapter; -import java.time.Duration; - -/** - * A builder for creating a new instance of the CombinedImpl type. - */ -@ServiceClientBuilder(serviceClients = { CombinedImpl.class }) -public final class CombinedBuilder { - /* - * Service host - */ - private String endpoint; - - /** - * Sets Service host. - * - * @param endpoint the endpoint value. - * @return the CombinedBuilder. - */ - public CombinedBuilder endpoint(String endpoint) { - this.endpoint = endpoint; - return this; - } - - /* - * The ID of the target subscription. The value must be an UUID. - */ - private String subscriptionId; - - /** - * Sets The ID of the target subscription. The value must be an UUID. - * - * @param subscriptionId the subscriptionId value. - * @return the CombinedBuilder. - */ - public CombinedBuilder subscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - return this; - } - - /* - * The environment to connect to - */ - private AzureEnvironment environment; - - /** - * Sets The environment to connect to. - * - * @param environment the environment value. - * @return the CombinedBuilder. - */ - public CombinedBuilder environment(AzureEnvironment environment) { - this.environment = environment; - return this; - } - - /* - * The HTTP pipeline to send requests through - */ - private HttpPipeline pipeline; - - /** - * Sets The HTTP pipeline to send requests through. - * - * @param pipeline the pipeline value. - * @return the CombinedBuilder. - */ - public CombinedBuilder pipeline(HttpPipeline pipeline) { - this.pipeline = pipeline; - return this; - } - - /* - * The default poll interval for long-running operation - */ - private Duration defaultPollInterval; - - /** - * Sets The default poll interval for long-running operation. - * - * @param defaultPollInterval the defaultPollInterval value. - * @return the CombinedBuilder. - */ - public CombinedBuilder defaultPollInterval(Duration defaultPollInterval) { - this.defaultPollInterval = defaultPollInterval; - return this; - } - - /* - * The serializer to serialize an object into a string - */ - private SerializerAdapter serializerAdapter; - - /** - * Sets The serializer to serialize an object into a string. - * - * @param serializerAdapter the serializerAdapter value. - * @return the CombinedBuilder. - */ - public CombinedBuilder serializerAdapter(SerializerAdapter serializerAdapter) { - this.serializerAdapter = serializerAdapter; - return this; - } - - /** - * Builds an instance of CombinedImpl with the provided parameters. - * - * @return an instance of CombinedImpl. - */ - public CombinedImpl buildClient() { - String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com"; - AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE; - HttpPipeline localPipeline = (pipeline != null) - ? pipeline - : new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(); - Duration localDefaultPollInterval - = (defaultPollInterval != null) ? defaultPollInterval : Duration.ofSeconds(30); - SerializerAdapter localSerializerAdapter = (serializerAdapter != null) - ? serializerAdapter - : SerializerFactory.createDefaultManagementSerializerAdapter(); - CombinedImpl client = new CombinedImpl(localPipeline, localSerializerAdapter, localDefaultPollInterval, - localEnvironment, localEndpoint, this.subscriptionId); - return client; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java deleted file mode 100644 index 75986505a23..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java +++ /dev/null @@ -1,309 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import com.azure.core.annotation.ServiceClient; -import com.azure.core.http.HttpHeaderName; -import com.azure.core.http.HttpHeaders; -import com.azure.core.http.HttpPipeline; -import com.azure.core.http.HttpResponse; -import com.azure.core.http.rest.Response; -import com.azure.core.management.AzureEnvironment; -import com.azure.core.management.exception.ManagementError; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.management.polling.PollerFactory; -import com.azure.core.management.polling.SyncPollerFactory; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.CoreUtils; -import com.azure.core.util.logging.ClientLogger; -import com.azure.core.util.polling.AsyncPollResponse; -import com.azure.core.util.polling.LongRunningOperationStatus; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import com.azure.core.util.serializer.SerializerAdapter; -import com.azure.core.util.serializer.SerializerEncoding; -import java.io.IOException; -import java.lang.reflect.Type; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * Initializes a new instance of the CombinedImpl type. - */ -@ServiceClient(builder = CombinedBuilder.class) -public final class CombinedImpl implements Combined { - /** - * Service host. - */ - private final String endpoint; - - /** - * Gets Service host. - * - * @return the endpoint value. - */ - public String getEndpoint() { - return this.endpoint; - } - - /** - * The ID of the target subscription. The value must be an UUID. - */ - private final String subscriptionId; - - /** - * Gets The ID of the target subscription. The value must be an UUID. - * - * @return the subscriptionId value. - */ - public String getSubscriptionId() { - return this.subscriptionId; - } - - /** - * The HTTP pipeline to send requests through. - */ - private final HttpPipeline httpPipeline; - - /** - * Gets The HTTP pipeline to send requests through. - * - * @return the httpPipeline value. - */ - public HttpPipeline getHttpPipeline() { - return this.httpPipeline; - } - - /** - * The serializer to serialize an object into a string. - */ - private final SerializerAdapter serializerAdapter; - - /** - * Gets The serializer to serialize an object into a string. - * - * @return the serializerAdapter value. - */ - SerializerAdapter getSerializerAdapter() { - return this.serializerAdapter; - } - - /** - * The default poll interval for long-running operation. - */ - private final Duration defaultPollInterval; - - /** - * Gets The default poll interval for long-running operation. - * - * @return the defaultPollInterval value. - */ - public Duration getDefaultPollInterval() { - return this.defaultPollInterval; - } - - /** - * The VirtualMachinesClient object to access its operations. - */ - private final VirtualMachinesClient virtualMachines; - - /** - * Gets the VirtualMachinesClient object to access its operations. - * - * @return the VirtualMachinesClient object. - */ - public VirtualMachinesClient getVirtualMachines() { - return this.virtualMachines; - } - - /** - * The DisksClient object to access its operations. - */ - private final DisksClient disks; - - /** - * Gets the DisksClient object to access its operations. - * - * @return the DisksClient object. - */ - public DisksClient getDisks() { - return this.disks; - } - - /** - * Initializes an instance of Combined client. - * - * @param httpPipeline The HTTP pipeline to send requests through. - * @param serializerAdapter The serializer to serialize an object into a string. - * @param defaultPollInterval The default poll interval for long-running operation. - * @param environment The Azure environment. - * @param endpoint Service host. - * @param subscriptionId The ID of the target subscription. The value must be an UUID. - */ - CombinedImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, Duration defaultPollInterval, - AzureEnvironment environment, String endpoint, String subscriptionId) { - this.httpPipeline = httpPipeline; - this.serializerAdapter = serializerAdapter; - this.defaultPollInterval = defaultPollInterval; - this.endpoint = endpoint; - this.subscriptionId = subscriptionId; - this.virtualMachines = new VirtualMachinesClientImpl(this); - this.disks = new DisksClientImpl(this); - } - - /** - * Gets default client context. - * - * @return the default client context. - */ - public Context getContext() { - return Context.NONE; - } - - /** - * Merges default client context with provided context. - * - * @param context the context to be merged with default client context. - * @return the merged context. - */ - public Context mergeContext(Context context) { - return CoreUtils.mergeContexts(this.getContext(), context); - } - - /** - * Gets long running operation result. - * - * @param activationResponse the response of activation operation. - * @param httpPipeline the http pipeline. - * @param pollResultType type of poll result. - * @param finalResultType type of final result. - * @param context the context shared by all requests. - * @param type of poll result. - * @param type of final result. - * @return poller flux for poll result and final result. - */ - public PollerFlux, U> getLroResult(Mono>> activationResponse, - HttpPipeline httpPipeline, Type pollResultType, Type finalResultType, Context context) { - return PollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType, - defaultPollInterval, activationResponse, context); - } - - /** - * Gets long running operation result. - * - * @param activationResponse the response of activation operation. - * @param pollResultType type of poll result. - * @param finalResultType type of final result. - * @param context the context shared by all requests. - * @param type of poll result. - * @param type of final result. - * @return SyncPoller for poll result and final result. - */ - public SyncPoller, U> getLroResult(Response activationResponse, - Type pollResultType, Type finalResultType, Context context) { - return SyncPollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType, - defaultPollInterval, () -> activationResponse, context); - } - - /** - * Gets the final result, or an error, based on last async poll response. - * - * @param response the last async poll response. - * @param type of poll result. - * @param type of final result. - * @return the final result, or an error. - */ - public Mono getLroFinalResultOrError(AsyncPollResponse, U> response) { - if (response.getStatus() != LongRunningOperationStatus.SUCCESSFULLY_COMPLETED) { - String errorMessage; - ManagementError managementError = null; - HttpResponse errorResponse = null; - PollResult.Error lroError = response.getValue().getError(); - if (lroError != null) { - errorResponse = new HttpResponseImpl(lroError.getResponseStatusCode(), lroError.getResponseHeaders(), - lroError.getResponseBody()); - - errorMessage = response.getValue().getError().getMessage(); - String errorBody = response.getValue().getError().getResponseBody(); - if (errorBody != null) { - // try to deserialize error body to ManagementError - try { - managementError = this.getSerializerAdapter() - .deserialize(errorBody, ManagementError.class, SerializerEncoding.JSON); - if (managementError.getCode() == null || managementError.getMessage() == null) { - managementError = null; - } - } catch (IOException | RuntimeException ioe) { - LOGGER.logThrowableAsWarning(ioe); - } - } - } else { - // fallback to default error message - errorMessage = "Long running operation failed."; - } - if (managementError == null) { - // fallback to default ManagementError - managementError = new ManagementError(response.getStatus().toString(), errorMessage); - } - return Mono.error(new ManagementException(errorMessage, errorResponse, managementError)); - } else { - return response.getFinalResult(); - } - } - - private static final class HttpResponseImpl extends HttpResponse { - private final int statusCode; - - private final byte[] responseBody; - - private final HttpHeaders httpHeaders; - - HttpResponseImpl(int statusCode, HttpHeaders httpHeaders, String responseBody) { - super(null); - this.statusCode = statusCode; - this.httpHeaders = httpHeaders; - this.responseBody = responseBody == null ? null : responseBody.getBytes(StandardCharsets.UTF_8); - } - - public int getStatusCode() { - return statusCode; - } - - public String getHeaderValue(String s) { - return httpHeaders.getValue(HttpHeaderName.fromString(s)); - } - - public HttpHeaders getHeaders() { - return httpHeaders; - } - - public Flux getBody() { - return Flux.just(ByteBuffer.wrap(responseBody)); - } - - public Mono getBodyAsByteArray() { - return Mono.just(responseBody); - } - - public Mono getBodyAsString() { - return Mono.just(new String(responseBody, StandardCharsets.UTF_8)); - } - - public Mono getBodyAsString(Charset charset) { - return Mono.just(new String(responseBody, charset)); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(CombinedImpl.class); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java deleted file mode 100644 index 4c8b72cd4c2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disk; -import azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Collections; -import java.util.Map; - -public final class DiskImpl implements Disk, Disk.Definition, Disk.Update { - private DiskInner innerObject; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public String id() { - return this.innerModel().id(); - } - - public String name() { - return this.innerModel().name(); - } - - public String type() { - return this.innerModel().type(); - } - - public String location() { - return this.innerModel().location(); - } - - public Map tags() { - Map inner = this.innerModel().tags(); - if (inner != null) { - return Collections.unmodifiableMap(inner); - } else { - return Collections.emptyMap(); - } - } - - public DiskProperties properties() { - return this.innerModel().properties(); - } - - public SystemData systemData() { - return this.innerModel().systemData(); - } - - public Region region() { - return Region.fromName(this.regionName()); - } - - public String regionName() { - return this.location(); - } - - public String resourceGroupName() { - return resourceGroupName; - } - - public DiskInner innerModel() { - return this.innerObject; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - private String resourceGroupName; - - private String diskName; - - public DiskImpl withExistingResourceGroup(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - return this; - } - - public Disk create() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), Context.NONE); - return this; - } - - public Disk create(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), context); - return this; - } - - DiskImpl(String name, azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = new DiskInner(); - this.serviceManager = serviceManager; - this.diskName = name; - } - - public DiskImpl update() { - return this; - } - - public Disk apply() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), Context.NONE); - return this; - } - - public Disk apply(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .createOrUpdate(resourceGroupName, diskName, this.innerModel(), context); - return this; - } - - DiskImpl(DiskInner innerObject, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = innerObject; - this.serviceManager = serviceManager; - this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups"); - this.diskName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "disksOld"); - } - - public Disk refresh() { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE) - .getValue(); - return this; - } - - public Disk refresh(Context context) { - this.innerObject = serviceManager.serviceClient() - .getDisks() - .getByResourceGroupWithResponse(resourceGroupName, diskName, context) - .getValue(); - return this; - } - - public DiskImpl withRegion(Region location) { - this.innerModel().withLocation(location.toString()); - return this; - } - - public DiskImpl withRegion(String location) { - this.innerModel().withLocation(location); - return this; - } - - public DiskImpl withTags(Map tags) { - this.innerModel().withTags(tags); - return this; - } - - public DiskImpl withProperties(DiskProperties properties) { - this.innerModel().withProperties(properties); - return this; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java deleted file mode 100644 index c81a1b18357..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java +++ /dev/null @@ -1,345 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Headers; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.PathParam; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.QueryParam; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import java.nio.ByteBuffer; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * An instance of this class provides access to all the operations defined in DisksClient. - */ -public final class DisksClientImpl implements DisksClient { - /** - * The proxy service used to perform REST calls. - */ - private final DisksService service; - - /** - * The service client containing this operation class. - */ - private final CombinedImpl client; - - /** - * Initializes an instance of DisksClientImpl. - * - * @param client the instance of the service client containing this operation class. - */ - DisksClientImpl(CombinedImpl client) { - this.service = RestProxy.create(DisksService.class, client.getHttpPipeline(), client.getSerializerAdapter()); - this.client = client; - } - - /** - * The interface defining all the services for CombinedDisks to be used by the proxy service to perform REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "CombinedDisks") - public interface DisksService { - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getByResourceGroup(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response getByResourceGroupSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Accept") String accept, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> createOrUpdate(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") DiskInner resource, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/disksOld/{diskName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response createOrUpdateSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("diskName") String diskName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") DiskInner resource, Context context); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getByResourceGroupWithResponseAsync(String resourceGroupName, String diskName) { - final String apiVersion = "2024-03-02"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, diskName, accept, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getByResourceGroupAsync(String resourceGroupName, String diskName) { - return getByResourceGroupWithResponseAsync(resourceGroupName, diskName) - .flatMap(res -> Mono.justOrEmpty(res.getValue())); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, - Context context) { - final String apiVersion = "2024-03-02"; - final String accept = "application/json"; - return service.getByResourceGroupSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, accept, context); - } - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner getByResourceGroup(String resourceGroupName, String diskName) { - return getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE).getValue(); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono>> createOrUpdateWithResponseAsync(String resourceGroupName, String diskName, - DiskInner resource) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, diskName, contentType, accept, resource, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String diskName, - DiskInner resource) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, contentType, accept, resource, Context.NONE); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String diskName, - DiskInner resource, Context context) { - final String apiVersion = "2024-03-02"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, diskName, contentType, accept, resource, context); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link PollerFlux} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, DiskInner> beginCreateOrUpdateAsync(String resourceGroupName, - String diskName, DiskInner resource) { - Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, diskName, resource); - return this.client.getLroResult(mono, this.client.getHttpPipeline(), DiskInner.class, - DiskInner.class, this.client.getContext()); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource) { - Response response = createOrUpdateWithResponse(resourceGroupName, diskName, resource); - return this.client.getLroResult(response, DiskInner.class, DiskInner.class, Context.NONE); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of disk resource. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, DiskInner> beginCreateOrUpdate(String resourceGroupName, String diskName, - DiskInner resource, Context context) { - Response response = createOrUpdateWithResponse(resourceGroupName, diskName, resource, context); - return this.client.getLroResult(response, DiskInner.class, DiskInner.class, context); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync(String resourceGroupName, String diskName, DiskInner resource) { - return beginCreateOrUpdateAsync(resourceGroupName, diskName, resource).last() - .flatMap(this.client::getLroFinalResultOrError); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource) { - return beginCreateOrUpdate(resourceGroupName, diskName, resource).getFinalResult(); - } - - /** - * Creates or updates a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return disk resource. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public DiskInner createOrUpdate(String resourceGroupName, String diskName, DiskInner resource, Context context) { - return beginCreateOrUpdate(resourceGroupName, diskName, resource, context).getFinalResult(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java deleted file mode 100644 index aa536e533b0..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disk; -import azure.resourcemanager.multiserviceolderversions.combined.models.Disks; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.SimpleResponse; -import com.azure.core.util.Context; -import com.azure.core.util.logging.ClientLogger; - -public final class DisksImpl implements Disks { - private static final ClientLogger LOGGER = new ClientLogger(DisksImpl.class); - - private final DisksClient innerClient; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public DisksImpl(DisksClient innerClient, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerClient = innerClient; - this.serviceManager = serviceManager; - } - - public Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context) { - Response inner - = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, diskName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new DiskImpl(inner.getValue(), this.manager())); - } - - public Disk getByResourceGroup(String resourceGroupName, String diskName) { - DiskInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, diskName); - if (inner != null) { - return new DiskImpl(inner, this.manager()); - } else { - return null; - } - } - - public Disk getById(String id) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String diskName = ResourceManagerUtils.getValueFromIdByName(id, "disksOld"); - if (diskName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'disksOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, diskName, Context.NONE).getValue(); - } - - public Response getByIdWithResponse(String id, Context context) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String diskName = ResourceManagerUtils.getValueFromIdByName(id, "disksOld"); - if (diskName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'disksOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, diskName, context); - } - - private DisksClient serviceClient() { - return this.innerClient; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - public DiskImpl define(String name) { - return new DiskImpl(name, this.manager()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java deleted file mode 100644 index e2a37af0be2..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java +++ /dev/null @@ -1,195 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import com.azure.core.http.rest.PagedFlux; -import com.azure.core.http.rest.PagedIterable; -import com.azure.core.http.rest.PagedResponse; -import com.azure.core.http.rest.PagedResponseBase; -import com.azure.core.util.CoreUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import reactor.core.publisher.Flux; - -final class ResourceManagerUtils { - private ResourceManagerUtils() { - } - - static String getValueFromIdByName(String id, String name) { - if (id == null) { - return null; - } - Iterator itr = Arrays.stream(id.split("/")).iterator(); - while (itr.hasNext()) { - String part = itr.next(); - if (part != null && !part.trim().isEmpty()) { - if (part.equalsIgnoreCase(name)) { - if (itr.hasNext()) { - return itr.next(); - } else { - return null; - } - } - } - } - return null; - } - - static String getValueFromIdByParameterName(String id, String pathTemplate, String parameterName) { - if (id == null || pathTemplate == null) { - return null; - } - String parameterNameParentheses = "{" + parameterName + "}"; - List idSegmentsReverted = Arrays.asList(id.split("/")); - List pathSegments = Arrays.asList(pathTemplate.split("/")); - Collections.reverse(idSegmentsReverted); - Iterator idItrReverted = idSegmentsReverted.iterator(); - int pathIndex = pathSegments.size(); - while (idItrReverted.hasNext() && pathIndex > 0) { - String idSegment = idItrReverted.next(); - String pathSegment = pathSegments.get(--pathIndex); - if (!CoreUtils.isNullOrEmpty(idSegment) && !CoreUtils.isNullOrEmpty(pathSegment)) { - if (pathSegment.equalsIgnoreCase(parameterNameParentheses)) { - if (pathIndex == 0 || (pathIndex == 1 && pathSegments.get(0).isEmpty())) { - List segments = new ArrayList<>(); - segments.add(idSegment); - idItrReverted.forEachRemaining(segments::add); - Collections.reverse(segments); - if (!segments.isEmpty() && segments.get(0).isEmpty()) { - segments.remove(0); - } - return String.join("/", segments); - } else { - return idSegment; - } - } - } - } - return null; - } - - static PagedIterable mapPage(PagedIterable pageIterable, Function mapper) { - return new PagedIterableImpl<>(pageIterable, mapper); - } - - private static final class PagedIterableImpl extends PagedIterable { - - private final PagedIterable pagedIterable; - private final Function mapper; - private final Function, PagedResponse> pageMapper; - - private PagedIterableImpl(PagedIterable pagedIterable, Function mapper) { - super(PagedFlux.create(() -> (continuationToken, pageSize) -> Flux - .fromStream(pagedIterable.streamByPage().map(getPageMapper(mapper))))); - this.pagedIterable = pagedIterable; - this.mapper = mapper; - this.pageMapper = getPageMapper(mapper); - } - - private static Function, PagedResponse> getPageMapper(Function mapper) { - return page -> new PagedResponseBase(page.getRequest(), page.getStatusCode(), page.getHeaders(), - page.getElements().stream().map(mapper).collect(Collectors.toList()), page.getContinuationToken(), - null); - } - - @Override - public Stream stream() { - return pagedIterable.stream().map(mapper); - } - - @Override - public Stream> streamByPage() { - return pagedIterable.streamByPage().map(pageMapper); - } - - @Override - public Stream> streamByPage(String continuationToken) { - return pagedIterable.streamByPage(continuationToken).map(pageMapper); - } - - @Override - public Stream> streamByPage(int preferredPageSize) { - return pagedIterable.streamByPage(preferredPageSize).map(pageMapper); - } - - @Override - public Stream> streamByPage(String continuationToken, int preferredPageSize) { - return pagedIterable.streamByPage(continuationToken, preferredPageSize).map(pageMapper); - } - - @Override - public Iterator iterator() { - return new IteratorImpl<>(pagedIterable.iterator(), mapper); - } - - @Override - public Iterable> iterableByPage() { - return new IterableImpl<>(pagedIterable.iterableByPage(), pageMapper); - } - - @Override - public Iterable> iterableByPage(String continuationToken) { - return new IterableImpl<>(pagedIterable.iterableByPage(continuationToken), pageMapper); - } - - @Override - public Iterable> iterableByPage(int preferredPageSize) { - return new IterableImpl<>(pagedIterable.iterableByPage(preferredPageSize), pageMapper); - } - - @Override - public Iterable> iterableByPage(String continuationToken, int preferredPageSize) { - return new IterableImpl<>(pagedIterable.iterableByPage(continuationToken, preferredPageSize), pageMapper); - } - } - - private static final class IteratorImpl implements Iterator { - - private final Iterator iterator; - private final Function mapper; - - private IteratorImpl(Iterator iterator, Function mapper) { - this.iterator = iterator; - this.mapper = mapper; - } - - @Override - public boolean hasNext() { - return iterator.hasNext(); - } - - @Override - public S next() { - return mapper.apply(iterator.next()); - } - - @Override - public void remove() { - iterator.remove(); - } - } - - private static final class IterableImpl implements Iterable { - - private final Iterable iterable; - private final Function mapper; - - private IterableImpl(Iterable iterable, Function mapper) { - this.iterable = iterable; - this.mapper = mapper; - } - - @Override - public Iterator iterator() { - return new IteratorImpl<>(iterable.iterator(), mapper); - } - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java deleted file mode 100644 index 5b3de7436c8..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java +++ /dev/null @@ -1,165 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachine; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Collections; -import java.util.Map; - -public final class VirtualMachineImpl implements VirtualMachine, VirtualMachine.Definition, VirtualMachine.Update { - private VirtualMachineInner innerObject; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public String id() { - return this.innerModel().id(); - } - - public String name() { - return this.innerModel().name(); - } - - public String type() { - return this.innerModel().type(); - } - - public String location() { - return this.innerModel().location(); - } - - public Map tags() { - Map inner = this.innerModel().tags(); - if (inner != null) { - return Collections.unmodifiableMap(inner); - } else { - return Collections.emptyMap(); - } - } - - public VirtualMachineProperties properties() { - return this.innerModel().properties(); - } - - public SystemData systemData() { - return this.innerModel().systemData(); - } - - public Region region() { - return Region.fromName(this.regionName()); - } - - public String regionName() { - return this.location(); - } - - public String resourceGroupName() { - return resourceGroupName; - } - - public VirtualMachineInner innerModel() { - return this.innerObject; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - private String resourceGroupName; - - private String vmName; - - public VirtualMachineImpl withExistingResourceGroup(String resourceGroupName) { - this.resourceGroupName = resourceGroupName; - return this; - } - - public VirtualMachine create() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), Context.NONE); - return this; - } - - public VirtualMachine create(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), context); - return this; - } - - VirtualMachineImpl(String name, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = new VirtualMachineInner(); - this.serviceManager = serviceManager; - this.vmName = name; - } - - public VirtualMachineImpl update() { - return this; - } - - public VirtualMachine apply() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), Context.NONE); - return this; - } - - public VirtualMachine apply(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .createOrUpdate(resourceGroupName, vmName, this.innerModel(), context); - return this; - } - - VirtualMachineImpl(VirtualMachineInner innerObject, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerObject = innerObject; - this.serviceManager = serviceManager; - this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups"); - this.vmName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "virtualMachinesOld"); - } - - public VirtualMachine refresh() { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE) - .getValue(); - return this; - } - - public VirtualMachine refresh(Context context) { - this.innerObject = serviceManager.serviceClient() - .getVirtualMachines() - .getByResourceGroupWithResponse(resourceGroupName, vmName, context) - .getValue(); - return this; - } - - public VirtualMachineImpl withRegion(Region location) { - this.innerModel().withLocation(location.toString()); - return this; - } - - public VirtualMachineImpl withRegion(String location) { - this.innerModel().withLocation(location); - return this; - } - - public VirtualMachineImpl withTags(Map tags) { - this.innerModel().withTags(tags); - return this; - } - - public VirtualMachineImpl withProperties(VirtualMachineProperties properties) { - this.innerModel().withProperties(properties); - return this; - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java deleted file mode 100644 index eafb898b300..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java +++ /dev/null @@ -1,361 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Headers; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.PathParam; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.QueryParam; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.management.exception.ManagementException; -import com.azure.core.management.polling.PollResult; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; -import com.azure.core.util.polling.PollerFlux; -import com.azure.core.util.polling.SyncPoller; -import java.nio.ByteBuffer; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * An instance of this class provides access to all the operations defined in VirtualMachinesClient. - */ -public final class VirtualMachinesClientImpl implements VirtualMachinesClient { - /** - * The proxy service used to perform REST calls. - */ - private final VirtualMachinesService service; - - /** - * The service client containing this operation class. - */ - private final CombinedImpl client; - - /** - * Initializes an instance of VirtualMachinesClientImpl. - * - * @param client the instance of the service client containing this operation class. - */ - VirtualMachinesClientImpl(CombinedImpl client) { - this.service - = RestProxy.create(VirtualMachinesService.class, client.getHttpPipeline(), client.getSerializerAdapter()); - this.client = client; - } - - /** - * The interface defining all the services for CombinedVirtualMachines to be used by the proxy service to perform - * REST calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "CombinedVirtualMachines") - public interface VirtualMachinesService { - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono> getByResourceGroup(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Accept") String accept, Context context); - - @Headers({ "Content-Type: application/json" }) - @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response getByResourceGroupSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Accept") String accept, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Mono>> createOrUpdate(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") VirtualMachineInner resource, Context context); - - @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachinesOld/{vmName}") - @ExpectedResponses({ 200, 201 }) - @UnexpectedResponseExceptionType(ManagementException.class) - Response createOrUpdateSync(@HostParam("endpoint") String endpoint, - @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, - @PathParam("resourceGroupName") String resourceGroupName, @PathParam("vmName") String vmName, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") VirtualMachineInner resource, Context context); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono> getByResourceGroupWithResponseAsync(String resourceGroupName, - String vmName) { - final String apiVersion = "2024-11-01"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, vmName, accept, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono getByResourceGroupAsync(String resourceGroupName, String vmName) { - return getByResourceGroupWithResponseAsync(resourceGroupName, vmName) - .flatMap(res -> Mono.justOrEmpty(res.getValue())); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context) { - final String apiVersion = "2024-11-01"; - final String accept = "application/json"; - return service.getByResourceGroupSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, accept, context); - } - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner getByResourceGroup(String resourceGroupName, String vmName) { - return getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE).getValue(); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono>> createOrUpdateWithResponseAsync(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil - .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion, - this.client.getSubscriptionId(), resourceGroupName, vmName, contentType, accept, resource, context)) - .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, contentType, accept, resource, Context.NONE); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Response createOrUpdateWithResponse(String resourceGroupName, String vmName, - VirtualMachineInner resource, Context context) { - final String apiVersion = "2024-11-01"; - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createOrUpdateSync(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), - resourceGroupName, vmName, contentType, accept, resource, context); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link PollerFlux} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - private PollerFlux, VirtualMachineInner> - beginCreateOrUpdateAsync(String resourceGroupName, String vmName, VirtualMachineInner resource) { - Mono>> mono = createOrUpdateWithResponseAsync(resourceGroupName, vmName, resource); - return this.client.getLroResult(mono, this.client.getHttpPipeline(), - VirtualMachineInner.class, VirtualMachineInner.class, this.client.getContext()); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, VirtualMachineInner> - beginCreateOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource) { - Response response = createOrUpdateWithResponse(resourceGroupName, vmName, resource); - return this.client.getLroResult(response, VirtualMachineInner.class, - VirtualMachineInner.class, Context.NONE); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the {@link SyncPoller} for polling of describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION) - public SyncPoller, VirtualMachineInner> - beginCreateOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, Context context) { - Response response = createOrUpdateWithResponse(resourceGroupName, vmName, resource, context); - return this.client.getLroResult(response, VirtualMachineInner.class, - VirtualMachineInner.class, context); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - private Mono createOrUpdateAsync(String resourceGroupName, String vmName, - VirtualMachineInner resource) { - return beginCreateOrUpdateAsync(resourceGroupName, vmName, resource).last() - .flatMap(this.client::getLroFinalResultOrError); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource) { - return beginCreateOrUpdate(resourceGroupName, vmName, resource).getFinalResult(); - } - - /** - * The operation to create or update a virtual machine. Please note some properties can be set only during virtual - * machine creation. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param resource Resource create parameters. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public VirtualMachineInner createOrUpdate(String resourceGroupName, String vmName, VirtualMachineInner resource, - Context context) { - return beginCreateOrUpdate(resourceGroupName, vmName, resource, context).getFinalResult(); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java deleted file mode 100644 index c9e67bd5e94..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.implementation; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient; -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachine; -import azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachines; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.SimpleResponse; -import com.azure.core.util.Context; -import com.azure.core.util.logging.ClientLogger; - -public final class VirtualMachinesImpl implements VirtualMachines { - private static final ClientLogger LOGGER = new ClientLogger(VirtualMachinesImpl.class); - - private final VirtualMachinesClient innerClient; - - private final azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager; - - public VirtualMachinesImpl(VirtualMachinesClient innerClient, - azure.resourcemanager.multiserviceolderversions.combined.CombinedManager serviceManager) { - this.innerClient = innerClient; - this.serviceManager = serviceManager; - } - - public Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, - Context context) { - Response inner - = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, vmName, context); - return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), - new VirtualMachineImpl(inner.getValue(), this.manager())); - } - - public VirtualMachine getByResourceGroup(String resourceGroupName, String vmName) { - VirtualMachineInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, vmName); - if (inner != null) { - return new VirtualMachineImpl(inner, this.manager()); - } else { - return null; - } - } - - public VirtualMachine getById(String id) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String vmName = ResourceManagerUtils.getValueFromIdByName(id, "virtualMachinesOld"); - if (vmName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'virtualMachinesOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, vmName, Context.NONE).getValue(); - } - - public Response getByIdWithResponse(String id, Context context) { - String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups"); - if (resourceGroupName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id))); - } - String vmName = ResourceManagerUtils.getValueFromIdByName(id, "virtualMachinesOld"); - if (vmName == null) { - throw LOGGER.logExceptionAsError(new IllegalArgumentException( - String.format("The resource ID '%s' is not valid. Missing path segment 'virtualMachinesOld'.", id))); - } - return this.getByResourceGroupWithResponse(resourceGroupName, vmName, context); - } - - private VirtualMachinesClient serviceClient() { - return this.innerClient; - } - - private azure.resourcemanager.multiserviceolderversions.combined.CombinedManager manager() { - return this.serviceManager; - } - - public VirtualMachineImpl define(String name) { - return new VirtualMachineImpl(name, this.manager()); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java deleted file mode 100644 index 0fe238e297b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the implementations for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java deleted file mode 100644 index 29add8d7ce7..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Map; - -/** - * An immutable client-side representation of Disk. - */ -public interface Disk { - /** - * Gets the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - String id(); - - /** - * Gets the name property: The name of the resource. - * - * @return the name value. - */ - String name(); - - /** - * Gets the type property: The type of the resource. - * - * @return the type value. - */ - String type(); - - /** - * Gets the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - String location(); - - /** - * Gets the tags property: Resource tags. - * - * @return the tags value. - */ - Map tags(); - - /** - * Gets the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - DiskProperties properties(); - - /** - * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - SystemData systemData(); - - /** - * Gets the region of the resource. - * - * @return the region of the resource. - */ - Region region(); - - /** - * Gets the name of the resource region. - * - * @return the name of the resource region. - */ - String regionName(); - - /** - * Gets the name of the resource group. - * - * @return the name of the resource group. - */ - String resourceGroupName(); - - /** - * Gets the inner azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner object. - * - * @return the inner object. - */ - DiskInner innerModel(); - - /** - * The entirety of the Disk definition. - */ - interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, - DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate { - } - - /** - * The Disk definition stages. - */ - interface DefinitionStages { - /** - * The first stage of the Disk definition. - */ - interface Blank extends WithLocation { - } - - /** - * The stage of the Disk definition allowing to specify location. - */ - interface WithLocation { - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(Region location); - - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(String location); - } - - /** - * The stage of the Disk definition allowing to specify parent resource. - */ - interface WithResourceGroup { - /** - * Specifies resourceGroupName. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @return the next definition stage. - */ - WithCreate withExistingResourceGroup(String resourceGroupName); - } - - /** - * The stage of the Disk definition which contains all the minimum required properties for the resource to be - * created, but also allows for any other optional properties to be specified. - */ - interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithProperties { - /** - * Executes the create request. - * - * @return the created resource. - */ - Disk create(); - - /** - * Executes the create request. - * - * @param context The context to associate with this operation. - * @return the created resource. - */ - Disk create(Context context); - } - - /** - * The stage of the Disk definition allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - WithCreate withTags(Map tags); - } - - /** - * The stage of the Disk definition allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - WithCreate withProperties(DiskProperties properties); - } - } - - /** - * Begins update for the Disk resource. - * - * @return the stage of resource update. - */ - Disk.Update update(); - - /** - * The template for Disk update. - */ - interface Update extends UpdateStages.WithTags, UpdateStages.WithProperties { - /** - * Executes the update request. - * - * @return the updated resource. - */ - Disk apply(); - - /** - * Executes the update request. - * - * @param context The context to associate with this operation. - * @return the updated resource. - */ - Disk apply(Context context); - } - - /** - * The Disk update stages. - */ - interface UpdateStages { - /** - * The stage of the Disk update allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - Update withTags(Map tags); - } - - /** - * The stage of the Disk update allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - Update withProperties(DiskProperties properties); - } - } - - /** - * Refreshes the resource to sync with Azure. - * - * @return the refreshed resource. - */ - Disk refresh(); - - /** - * Refreshes the resource to sync with Azure. - * - * @param context The context to associate with this operation. - * @return the refreshed resource. - */ - Disk refresh(Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java deleted file mode 100644 index f3fa7ddcc02..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.annotation.Fluent; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * Disk resource properties. - */ -@Fluent -public final class DiskProperties implements JsonSerializable { - /* - * The provisioningState property. - */ - private ResourceProvisioningState provisioningState; - - /* - * Size of the disk in GB. Only available in version 2024-03-02. - */ - private Integer diskSizeGB; - - /** - * Creates an instance of DiskProperties class. - */ - public DiskProperties() { - } - - /** - * Get the provisioningState property: The provisioningState property. - * - * @return the provisioningState value. - */ - public ResourceProvisioningState provisioningState() { - return this.provisioningState; - } - - /** - * Get the diskSizeGB property: Size of the disk in GB. Only available in version 2024-03-02. - * - * @return the diskSizeGB value. - */ - public Integer diskSizeGB() { - return this.diskSizeGB; - } - - /** - * Set the diskSizeGB property: Size of the disk in GB. Only available in version 2024-03-02. - * - * @param diskSizeGB the diskSizeGB value to set. - * @return the DiskProperties object itself. - */ - public DiskProperties withDiskSizeGB(Integer diskSizeGB) { - this.diskSizeGB = diskSizeGB; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeNumberField("diskSizeGB", this.diskSizeGB); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of DiskProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of DiskProperties if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IOException If an error occurs while reading the DiskProperties. - */ - public static DiskProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - DiskProperties deserializedDiskProperties = new DiskProperties(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("provisioningState".equals(fieldName)) { - deserializedDiskProperties.provisioningState - = ResourceProvisioningState.fromString(reader.getString()); - } else if ("diskSizeGB".equals(fieldName)) { - deserializedDiskProperties.diskSizeGB = reader.getNullable(JsonReader::getInt); - } else { - reader.skipChildren(); - } - } - - return deserializedDiskProperties; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java deleted file mode 100644 index 8f025c9db86..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; - -/** - * Resource collection API of Disks. - */ -public interface Disks { - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Response getByResourceGroupWithResponse(String resourceGroupName, String diskName, Context context); - - /** - * Gets information about a disk. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param diskName The name of the Disk. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk. - */ - Disk getByResourceGroup(String resourceGroupName, String diskName); - - /** - * Gets information about a disk. - * - * @param id the resource ID. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Disk getById(String id); - - /** - * Gets information about a disk. - * - * @param id the resource ID. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return information about a disk along with {@link Response}. - */ - Response getByIdWithResponse(String id, Context context); - - /** - * Begins definition for a new Disk resource. - * - * @param name resource name. - * @return the first stage of the new Disk definition. - */ - Disk.DefinitionStages.Blank define(String name); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java deleted file mode 100644 index cbd8e8c6912..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.util.ExpandableStringEnum; -import java.util.Collection; - -/** - * The provisioning state of a resource type. - */ -public final class ResourceProvisioningState extends ExpandableStringEnum { - /** - * Resource has been created. - */ - public static final ResourceProvisioningState SUCCEEDED = fromString("Succeeded"); - - /** - * Resource creation failed. - */ - public static final ResourceProvisioningState FAILED = fromString("Failed"); - - /** - * Resource creation was canceled. - */ - public static final ResourceProvisioningState CANCELED = fromString("Canceled"); - - /** - * Creates a new instance of ResourceProvisioningState value. - * - * @deprecated Use the {@link #fromString(String)} factory method. - */ - @Deprecated - public ResourceProvisioningState() { - } - - /** - * Creates or finds a ResourceProvisioningState from its string representation. - * - * @param name a name to look for. - * @return the corresponding ResourceProvisioningState. - */ - public static ResourceProvisioningState fromString(String name) { - return fromString(name, ResourceProvisioningState.class); - } - - /** - * Gets known ResourceProvisioningState values. - * - * @return known ResourceProvisioningState values. - */ - public static Collection values() { - return values(ResourceProvisioningState.class); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java deleted file mode 100644 index e082f9f5600..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java +++ /dev/null @@ -1,265 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner; -import com.azure.core.management.Region; -import com.azure.core.management.SystemData; -import com.azure.core.util.Context; -import java.util.Map; - -/** - * An immutable client-side representation of VirtualMachine. - */ -public interface VirtualMachine { - /** - * Gets the id property: Fully qualified resource Id for the resource. - * - * @return the id value. - */ - String id(); - - /** - * Gets the name property: The name of the resource. - * - * @return the name value. - */ - String name(); - - /** - * Gets the type property: The type of the resource. - * - * @return the type value. - */ - String type(); - - /** - * Gets the location property: The geo-location where the resource lives. - * - * @return the location value. - */ - String location(); - - /** - * Gets the tags property: Resource tags. - * - * @return the tags value. - */ - Map tags(); - - /** - * Gets the properties property: The resource-specific properties for this resource. - * - * @return the properties value. - */ - VirtualMachineProperties properties(); - - /** - * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information. - * - * @return the systemData value. - */ - SystemData systemData(); - - /** - * Gets the region of the resource. - * - * @return the region of the resource. - */ - Region region(); - - /** - * Gets the name of the resource region. - * - * @return the name of the resource region. - */ - String regionName(); - - /** - * Gets the name of the resource group. - * - * @return the name of the resource group. - */ - String resourceGroupName(); - - /** - * Gets the inner azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner object. - * - * @return the inner object. - */ - VirtualMachineInner innerModel(); - - /** - * The entirety of the VirtualMachine definition. - */ - interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation, - DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate { - } - - /** - * The VirtualMachine definition stages. - */ - interface DefinitionStages { - /** - * The first stage of the VirtualMachine definition. - */ - interface Blank extends WithLocation { - } - - /** - * The stage of the VirtualMachine definition allowing to specify location. - */ - interface WithLocation { - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(Region location); - - /** - * Specifies the region for the resource. - * - * @param location The geo-location where the resource lives. - * @return the next definition stage. - */ - WithResourceGroup withRegion(String location); - } - - /** - * The stage of the VirtualMachine definition allowing to specify parent resource. - */ - interface WithResourceGroup { - /** - * Specifies resourceGroupName. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @return the next definition stage. - */ - WithCreate withExistingResourceGroup(String resourceGroupName); - } - - /** - * The stage of the VirtualMachine definition which contains all the minimum required properties for the - * resource to be created, but also allows for any other optional properties to be specified. - */ - interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithProperties { - /** - * Executes the create request. - * - * @return the created resource. - */ - VirtualMachine create(); - - /** - * Executes the create request. - * - * @param context The context to associate with this operation. - * @return the created resource. - */ - VirtualMachine create(Context context); - } - - /** - * The stage of the VirtualMachine definition allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - WithCreate withTags(Map tags); - } - - /** - * The stage of the VirtualMachine definition allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - WithCreate withProperties(VirtualMachineProperties properties); - } - } - - /** - * Begins update for the VirtualMachine resource. - * - * @return the stage of resource update. - */ - VirtualMachine.Update update(); - - /** - * The template for VirtualMachine update. - */ - interface Update extends UpdateStages.WithTags, UpdateStages.WithProperties { - /** - * Executes the update request. - * - * @return the updated resource. - */ - VirtualMachine apply(); - - /** - * Executes the update request. - * - * @param context The context to associate with this operation. - * @return the updated resource. - */ - VirtualMachine apply(Context context); - } - - /** - * The VirtualMachine update stages. - */ - interface UpdateStages { - /** - * The stage of the VirtualMachine update allowing to specify tags. - */ - interface WithTags { - /** - * Specifies the tags property: Resource tags.. - * - * @param tags Resource tags. - * @return the next definition stage. - */ - Update withTags(Map tags); - } - - /** - * The stage of the VirtualMachine update allowing to specify properties. - */ - interface WithProperties { - /** - * Specifies the properties property: The resource-specific properties for this resource.. - * - * @param properties The resource-specific properties for this resource. - * @return the next definition stage. - */ - Update withProperties(VirtualMachineProperties properties); - } - } - - /** - * Refreshes the resource to sync with Azure. - * - * @return the refreshed resource. - */ - VirtualMachine refresh(); - - /** - * Refreshes the resource to sync with Azure. - * - * @param context The context to associate with this operation. - * @return the refreshed resource. - */ - VirtualMachine refresh(Context context); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java deleted file mode 100644 index 0a5e9296e9e..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.annotation.Fluent; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; - -/** - * The VirtualMachineProperties model. - */ -@Fluent -public final class VirtualMachineProperties implements JsonSerializable { - /* - * The provisioningState property. - */ - private ResourceProvisioningState provisioningState; - - /* - * Size of the virtual machine. Only available in version 2024-11-01. - */ - private String size; - - /** - * Creates an instance of VirtualMachineProperties class. - */ - public VirtualMachineProperties() { - } - - /** - * Get the provisioningState property: The provisioningState property. - * - * @return the provisioningState value. - */ - public ResourceProvisioningState provisioningState() { - return this.provisioningState; - } - - /** - * Get the size property: Size of the virtual machine. Only available in version 2024-11-01. - * - * @return the size value. - */ - public String size() { - return this.size; - } - - /** - * Set the size property: Size of the virtual machine. Only available in version 2024-11-01. - * - * @param size the size value to set. - * @return the VirtualMachineProperties object itself. - */ - public VirtualMachineProperties withSize(String size) { - this.size = size; - return this; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeStringField("size", this.size); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of VirtualMachineProperties from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of VirtualMachineProperties if the JsonReader was pointing to an instance of it, or null if - * it was pointing to JSON null. - * @throws IOException If an error occurs while reading the VirtualMachineProperties. - */ - public static VirtualMachineProperties fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - VirtualMachineProperties deserializedVirtualMachineProperties = new VirtualMachineProperties(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("provisioningState".equals(fieldName)) { - deserializedVirtualMachineProperties.provisioningState - = ResourceProvisioningState.fromString(reader.getString()); - } else if ("size".equals(fieldName)) { - deserializedVirtualMachineProperties.size = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedVirtualMachineProperties; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java deleted file mode 100644 index 085e55909fd..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.multiserviceolderversions.combined.models; - -import com.azure.core.http.rest.Response; -import com.azure.core.util.Context; - -/** - * Resource collection API of VirtualMachines. - */ -public interface VirtualMachines { - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - Response getByResourceGroupWithResponse(String resourceGroupName, String vmName, Context context); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param resourceGroupName The name of the resource group. The name is case insensitive. - * @param vmName The name of the VirtualMachine. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine. - */ - VirtualMachine getByResourceGroup(String resourceGroupName, String vmName); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param id the resource ID. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - VirtualMachine getById(String id); - - /** - * Retrieves information about the model view or the instance view of a virtual machine. - * - * @param id the resource ID. - * @param context The context to associate with this operation. - * @throws IllegalArgumentException thrown if parameters fail the validation. - * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return describes a Virtual Machine along with {@link Response}. - */ - Response getByIdWithResponse(String id, Context context); - - /** - * Begins definition for a new VirtualMachine resource. - * - * @param name resource name. - * @return the first stage of the new VirtualMachine definition. - */ - VirtualMachine.DefinitionStages.Blank define(String name); -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java deleted file mode 100644 index 221f269dbfb..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the data models for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined.models; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java deleted file mode 100644 index af6d0a09834..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -/** - * Package containing the classes for Compute. - * Compute Client. - */ -package azure.resourcemanager.multiserviceolderversions.combined; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java index d1edc5a5fca..c6d3af3d3a5 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClientBuilder.java @@ -42,12 +42,12 @@ */ @ServiceClientBuilder( serviceClients = { - VisibilityClient.class, VisibilityReadClient.class, VisibilityWriteClient.class, - VisibilityAsyncClient.class, + VisibilityOpClient.class, VisibilityReadAsyncClient.class, - VisibilityWriteAsyncClient.class }) + VisibilityWriteAsyncClient.class, + VisibilityOpAsyncClient.class }) public final class VisibilityClientBuilder implements HttpTrait, ConfigurationTrait, EndpointTrait { @Generated @@ -270,16 +270,6 @@ private HttpPipeline createHttpPipeline() { return httpPipeline; } - /** - * Builds an instance of VisibilityAsyncClient class. - * - * @return an instance of VisibilityAsyncClient. - */ - @Generated - public VisibilityAsyncClient buildAsyncClient() { - return new VisibilityAsyncClient(buildInnerClient()); - } - /** * Builds an instance of VisibilityReadAsyncClient class. * @@ -301,13 +291,13 @@ public VisibilityWriteAsyncClient buildVisibilityWriteAsyncClient() { } /** - * Builds an instance of VisibilityClient class. + * Builds an instance of VisibilityOpAsyncClient class. * - * @return an instance of VisibilityClient. + * @return an instance of VisibilityOpAsyncClient. */ @Generated - public VisibilityClient buildClient() { - return new VisibilityClient(buildInnerClient()); + public VisibilityOpAsyncClient buildVisibilityOpAsyncClient() { + return new VisibilityOpAsyncClient(buildInnerClient().getVisibilityOps()); } /** @@ -330,5 +320,15 @@ public VisibilityWriteClient buildVisibilityWriteClient() { return new VisibilityWriteClient(buildInnerClient().getVisibilityWrites()); } + /** + * Builds an instance of VisibilityOpClient class. + * + * @return an instance of VisibilityOpClient. + */ + @Generated + public VisibilityOpClient buildVisibilityOpClient() { + return new VisibilityOpClient(buildInnerClient().getVisibilityOps()); + } + private static final ClientLogger LOGGER = new ClientLogger(VisibilityClientBuilder.class); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java index 807f5320a48..017e122759d 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityAsyncClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java @@ -17,7 +17,7 @@ import com.azure.core.util.BinaryData; import com.azure.core.util.FluxUtil; import reactor.core.publisher.Mono; -import tsptest.visibility.implementation.VisibilityClientImpl; +import tsptest.visibility.implementation.VisibilityOpsImpl; import tsptest.visibility.models.Dog; import tsptest.visibility.models.ReadDog; import tsptest.visibility.models.RoundTripModel; @@ -27,17 +27,17 @@ * Initializes a new instance of the asynchronous VisibilityClient type. */ @ServiceClient(builder = VisibilityClientBuilder.class, isAsync = true) -public final class VisibilityAsyncClient { +public final class VisibilityOpAsyncClient { @Generated - private final VisibilityClientImpl serviceClient; + private final VisibilityOpsImpl serviceClient; /** - * Initializes an instance of VisibilityAsyncClient class. + * Initializes an instance of VisibilityOpAsyncClient class. * * @param serviceClient the service client implementation. */ @Generated - VisibilityAsyncClient(VisibilityClientImpl serviceClient) { + VisibilityOpAsyncClient(VisibilityOpsImpl serviceClient) { this.serviceClient = serviceClient; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java similarity index 97% rename from packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java rename to packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java index a79ed9bd963..71e79e643aa 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/VisibilityOpClient.java @@ -15,7 +15,7 @@ import com.azure.core.http.rest.RequestOptions; import com.azure.core.http.rest.Response; import com.azure.core.util.BinaryData; -import tsptest.visibility.implementation.VisibilityClientImpl; +import tsptest.visibility.implementation.VisibilityOpsImpl; import tsptest.visibility.models.Dog; import tsptest.visibility.models.ReadDog; import tsptest.visibility.models.RoundTripModel; @@ -25,17 +25,17 @@ * Initializes a new instance of the synchronous VisibilityClient type. */ @ServiceClient(builder = VisibilityClientBuilder.class) -public final class VisibilityClient { +public final class VisibilityOpClient { @Generated - private final VisibilityClientImpl serviceClient; + private final VisibilityOpsImpl serviceClient; /** - * Initializes an instance of VisibilityClient class. + * Initializes an instance of VisibilityOpClient class. * * @param serviceClient the service client implementation. */ @Generated - VisibilityClient(VisibilityClientImpl serviceClient) { + VisibilityOpClient(VisibilityOpsImpl serviceClient) { this.serviceClient = serviceClient; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java index 02c3456cc5b..693a05c11d0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java @@ -4,45 +4,17 @@ package tsptest.visibility.implementation; -import com.azure.core.annotation.BodyParam; -import com.azure.core.annotation.ExpectedResponses; -import com.azure.core.annotation.Get; -import com.azure.core.annotation.HeaderParam; -import com.azure.core.annotation.Host; -import com.azure.core.annotation.HostParam; -import com.azure.core.annotation.Post; -import com.azure.core.annotation.Put; -import com.azure.core.annotation.ReturnType; -import com.azure.core.annotation.ServiceInterface; -import com.azure.core.annotation.ServiceMethod; -import com.azure.core.annotation.UnexpectedResponseExceptionType; -import com.azure.core.exception.ClientAuthenticationException; -import com.azure.core.exception.HttpResponseException; -import com.azure.core.exception.ResourceModifiedException; -import com.azure.core.exception.ResourceNotFoundException; import com.azure.core.http.HttpPipeline; import com.azure.core.http.HttpPipelineBuilder; import com.azure.core.http.policy.RetryPolicy; import com.azure.core.http.policy.UserAgentPolicy; -import com.azure.core.http.rest.RequestOptions; -import com.azure.core.http.rest.Response; -import com.azure.core.http.rest.RestProxy; -import com.azure.core.util.BinaryData; -import com.azure.core.util.Context; -import com.azure.core.util.FluxUtil; import com.azure.core.util.serializer.JacksonAdapter; import com.azure.core.util.serializer.SerializerAdapter; -import reactor.core.publisher.Mono; /** * Initializes a new instance of the VisibilityClient type. */ public final class VisibilityClientImpl { - /** - * The proxy service used to perform REST calls. - */ - private final VisibilityClientService service; - /** * Service host. */ @@ -113,6 +85,20 @@ public VisibilityWritesImpl getVisibilityWrites() { return this.visibilityWrites; } + /** + * The VisibilityOpsImpl object to access its operations. + */ + private final VisibilityOpsImpl visibilityOps; + + /** + * Gets the VisibilityOpsImpl object to access its operations. + * + * @return the VisibilityOpsImpl object. + */ + public VisibilityOpsImpl getVisibilityOps() { + return this.visibilityOps; + } + /** * Initializes an instance of VisibilityClient client. * @@ -146,385 +132,6 @@ public VisibilityClientImpl(HttpPipeline httpPipeline, SerializerAdapter seriali this.endpoint = endpoint; this.visibilityReads = new VisibilityReadsImpl(this); this.visibilityWrites = new VisibilityWritesImpl(this); - this.service = RestProxy.create(VisibilityClientService.class, this.httpPipeline, this.getSerializerAdapter()); - } - - /** - * The interface defining all the services for VisibilityClient to be used by the proxy service to perform REST - * calls. - */ - @Host("{endpoint}") - @ServiceInterface(name = "VisibilityClient") - public interface VisibilityClientService { - @Get("/visibility/read") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - RequestOptions requestOptions, Context context); - - @Get("/visibility/read") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response getSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, - RequestOptions requestOptions, Context context); - - @Put("/visibility/write") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> create(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Put("/visibility/write") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response createSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Post("/visibility/query") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> query(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Post("/visibility/query") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response querySync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); - - @Put("/visibility/roundtrip") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Mono> roundtrip(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - - @Put("/visibility/roundtrip") - @ExpectedResponses({ 200 }) - @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) - @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) - @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) - @UnexpectedResponseExceptionType(HttpResponseException.class) - Response roundtripSync(@HostParam("endpoint") String endpoint, - @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, - @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> getWithResponseAsync(RequestOptions requestOptions) { - final String accept = "application/json"; - return FluxUtil.withContext(context -> service.get(this.getEndpoint(), accept, requestOptions, context)); - } - - /** - * The get operation. - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response getWithResponse(RequestOptions requestOptions) { - final String accept = "application/json"; - return service.getSync(this.getEndpoint(), accept, requestOptions, Context.NONE); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> createWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.create(this.getEndpoint(), contentType, accept, dog, requestOptions, context)); - } - - /** - * The create operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.createSync(this.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> queryWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.query(this.getEndpoint(), contentType, accept, dog, requestOptions, context)); - } - - /** - * The query operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     secretName: String (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     id: int (Required)
-     *     name: String (Required)
-     * }
-     * }
-     *
- * - * @param dog The dog parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.querySync(this.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response} on successful completion of {@link Mono}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> roundtripWithResponseAsync(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return FluxUtil.withContext( - context -> service.roundtrip(this.getEndpoint(), contentType, accept, body, requestOptions, context)); - } - - /** - * The roundtrip operation. - *

Request Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - *

Response Body Schema

- * - * 
-     * {@code
-     * {
-     *     name: String (Required)
-     *     secretName: String (Required)
-     * }
-     * }
-     *
- * - * @param body The body parameter. - * @param requestOptions The options to configure the HTTP request before HTTP client sends it. - * @throws HttpResponseException thrown if the request is rejected by server. - * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. - * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. - * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the response body along with {@link Response}. - */ - @ServiceMethod(returns = ReturnType.SINGLE) - public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { - final String contentType = "application/json"; - final String accept = "application/json"; - return service.roundtripSync(this.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE); + this.visibilityOps = new VisibilityOpsImpl(this); } } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java new file mode 100644 index 00000000000..f7bc0de85ed --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java @@ -0,0 +1,435 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.visibility.implementation; + +import com.azure.core.annotation.BodyParam; +import com.azure.core.annotation.ExpectedResponses; +import com.azure.core.annotation.Get; +import com.azure.core.annotation.HeaderParam; +import com.azure.core.annotation.Host; +import com.azure.core.annotation.HostParam; +import com.azure.core.annotation.Post; +import com.azure.core.annotation.Put; +import com.azure.core.annotation.ReturnType; +import com.azure.core.annotation.ServiceInterface; +import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.ClientAuthenticationException; +import com.azure.core.exception.HttpResponseException; +import com.azure.core.exception.ResourceModifiedException; +import com.azure.core.exception.ResourceNotFoundException; +import com.azure.core.http.rest.RequestOptions; +import com.azure.core.http.rest.Response; +import com.azure.core.http.rest.RestProxy; +import com.azure.core.util.BinaryData; +import com.azure.core.util.Context; +import com.azure.core.util.FluxUtil; +import reactor.core.publisher.Mono; + +/** + * An instance of this class provides access to all the operations defined in VisibilityOps. + */ +public final class VisibilityOpsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final VisibilityOpsService service; + + /** + * The service client containing this operation class. + */ + private final VisibilityClientImpl client; + + /** + * Initializes an instance of VisibilityOpsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + VisibilityOpsImpl(VisibilityClientImpl client) { + this.service + = RestProxy.create(VisibilityOpsService.class, client.getHttpPipeline(), client.getSerializerAdapter()); + this.client = client; + } + + /** + * The interface defining all the services for VisibilityClientVisibilityOps to be used by the proxy service to + * perform REST calls. + */ + @Host("{endpoint}") + @ServiceInterface(name = "VisibilityClientVisibilityOps") + public interface VisibilityOpsService { + @Get("/visibility/read") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Get("/visibility/read") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestOptions requestOptions, Context context); + + @Put("/visibility/write") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> create(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Put("/visibility/write") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Post("/visibility/query") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> query(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Post("/visibility/query") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response querySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData dog, RequestOptions requestOptions, Context context); + + @Put("/visibility/roundtrip") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> roundtrip(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + + @Put("/visibility/roundtrip") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 }) + @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 }) + @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 }) + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response roundtripSync(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getWithResponseAsync(RequestOptions requestOptions) { + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.get(this.client.getEndpoint(), accept, requestOptions, context)); + } + + /** + * The get operation. + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestOptions requestOptions) { + final String accept = "application/json"; + return service.getSync(this.client.getEndpoint(), accept, requestOptions, Context.NONE); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> createWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.create(this.client.getEndpoint(), contentType, accept, dog, requestOptions, context)); + } + + /** + * The create operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createWithResponse(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.createSync(this.client.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> queryWithResponseAsync(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext( + context -> service.query(this.client.getEndpoint(), contentType, accept, dog, requestOptions, context)); + } + + /** + * The query operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     secretName: String (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     id: int (Required)
+     *     name: String (Required)
+     * }
+     * }
+     *
+ * + * @param dog The dog parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response queryWithResponse(BinaryData dog, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.querySync(this.client.getEndpoint(), contentType, accept, dog, requestOptions, Context.NONE); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> roundtripWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.roundtrip(this.client.getEndpoint(), contentType, accept, body, + requestOptions, context)); + } + + /** + * The roundtrip operation. + *

Request Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + *

Response Body Schema

+ * + * 
+     * {@code
+     * {
+     *     name: String (Required)
+     *     secretName: String (Required)
+     * }
+     * }
+     *
+ * + * @param body The body parameter. + * @param requestOptions The options to configure the HTTP request before HTTP client sends it. + * @throws HttpResponseException thrown if the request is rejected by server. + * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. + * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. + * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. + * @return the response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response roundtripWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; + final String accept = "application/json"; + return service.roundtripSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, + Context.NONE); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json deleted file mode 100644 index 3b1a9806756..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-combined-generated_metadata_older-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.MultiServiceOlderVersions.Compute":"2024-11-01","Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk":"2024-03-02"},"crossLanguageDefinitions":{"azure.resourcemanager.multiserviceolderversions.combined.fluent.Combined":"Azure.ResourceManager.MultiServiceOlderVersions.Combined","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.createOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.DisksClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disks.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.beginCreateOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.createOrUpdate":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.createOrUpdate","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroup":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.VirtualMachinesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachines.get","azure.resourcemanager.multiserviceolderversions.combined.fluent.models.DiskInner":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.Disk","azure.resourcemanager.multiserviceolderversions.combined.fluent.models.VirtualMachineInner":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachine","azure.resourcemanager.multiserviceolderversions.combined.implementation.CombinedBuilder":"Azure.ResourceManager.MultiServiceOlderVersions.Combined","azure.resourcemanager.multiserviceolderversions.combined.models.DiskProperties":"Azure.ResourceManager.MultiServiceOlderVersions.ComputeDisk.DiskProperties","azure.resourcemanager.multiserviceolderversions.combined.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","azure.resourcemanager.multiserviceolderversions.combined.models.VirtualMachineProperties":"Azure.ResourceManager.MultiServiceOlderVersions.Compute.VirtualMachineProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/multiserviceolderversions/combined/CombinedManager.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/Combined.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/DisksClient.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/VirtualMachinesClient.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/DiskInner.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/VirtualMachineInner.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/models/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/fluent/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedBuilder.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/CombinedImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DiskImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksClientImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/DisksImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachineImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesClientImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/VirtualMachinesImpl.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/implementation/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disk.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/DiskProperties.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/Disks.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/ResourceProvisioningState.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachine.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachineProperties.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/VirtualMachines.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/models/package-info.java","src/main/java/azure/resourcemanager/multiserviceolderversions/combined/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json deleted file mode 100644 index 05dc52000a6..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/proxy-config.json +++ /dev/null @@ -1 +0,0 @@ -[["azure.resourcemanager.multiserviceolderversions.combined.implementation.DisksClientImpl$DisksService"],["azure.resourcemanager.multiserviceolderversions.combined.implementation.VirtualMachinesClientImpl$VirtualMachinesService"]] \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json deleted file mode 100644 index 0637a088a01..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-combined-generated_older-versions/reflect-config.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json index 995c2952f8d..71b987df743 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/tsptest-visibility_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.visibility.VisibilityAsyncClient":"TspTest.Visibility","tsptest.visibility.VisibilityAsyncClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityAsyncClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityAsyncClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityAsyncClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityAsyncClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityAsyncClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClient":"TspTest.Visibility","tsptest.visibility.VisibilityClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityClientBuilder":"TspTest.Visibility","tsptest.visibility.VisibilityReadAsyncClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadAsyncClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityWriteAsyncClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteAsyncClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.models.Dog":"TspTest.Visibility.Dog","tsptest.visibility.models.ReadDog":"TspTest.Visibility.ReadDog","tsptest.visibility.models.RoundTripModel":"TspTest.Visibility.RoundTripModel","tsptest.visibility.models.WriteDog":"TspTest.Visibility.WriteDog"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/visibility/VisibilityAsyncClient.java","src/main/java/tsptest/visibility/VisibilityClient.java","src/main/java/tsptest/visibility/VisibilityClientBuilder.java","src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java","src/main/java/tsptest/visibility/VisibilityReadClient.java","src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java","src/main/java/tsptest/visibility/VisibilityWriteClient.java","src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java","src/main/java/tsptest/visibility/implementation/package-info.java","src/main/java/tsptest/visibility/models/Dog.java","src/main/java/tsptest/visibility/models/ReadDog.java","src/main/java/tsptest/visibility/models/RoundTripModel.java","src/main/java/tsptest/visibility/models/WriteDog.java","src/main/java/tsptest/visibility/models/package-info.java","src/main/java/tsptest/visibility/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{},"crossLanguageDefinitions":{"tsptest.visibility.VisibilityClientBuilder":"TspTest.Visibility","tsptest.visibility.VisibilityOpAsyncClient":"TspTest.Visibility.VisibilityOp","tsptest.visibility.VisibilityOpAsyncClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpAsyncClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpAsyncClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpAsyncClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpAsyncClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpAsyncClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpClient":"TspTest.Visibility.VisibilityOp","tsptest.visibility.VisibilityOpClient.create":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpClient.createWithResponse":"TspTest.Visibility.VisibilityOp.create","tsptest.visibility.VisibilityOpClient.get":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpClient.getWithResponse":"TspTest.Visibility.VisibilityOp.get","tsptest.visibility.VisibilityOpClient.query":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpClient.queryWithResponse":"TspTest.Visibility.VisibilityOp.query","tsptest.visibility.VisibilityOpClient.roundtrip":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityOpClient.roundtripWithResponse":"TspTest.Visibility.VisibilityOp.roundtrip","tsptest.visibility.VisibilityReadAsyncClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadAsyncClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadAsyncClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient":"TspTest.Visibility.VisibilityRead","tsptest.visibility.VisibilityReadClient.get":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityReadClient.getWithResponse":"TspTest.Visibility.VisibilityRead.get","tsptest.visibility.VisibilityWriteAsyncClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteAsyncClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteAsyncClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient":"TspTest.Visibility.VisibilityWrite","tsptest.visibility.VisibilityWriteClient.create":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.VisibilityWriteClient.createWithResponse":"TspTest.Visibility.VisibilityWrite.create","tsptest.visibility.models.Dog":"TspTest.Visibility.Dog","tsptest.visibility.models.ReadDog":"TspTest.Visibility.ReadDog","tsptest.visibility.models.RoundTripModel":"TspTest.Visibility.RoundTripModel","tsptest.visibility.models.WriteDog":"TspTest.Visibility.WriteDog"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/visibility/VisibilityClientBuilder.java","src/main/java/tsptest/visibility/VisibilityOpAsyncClient.java","src/main/java/tsptest/visibility/VisibilityOpClient.java","src/main/java/tsptest/visibility/VisibilityReadAsyncClient.java","src/main/java/tsptest/visibility/VisibilityReadClient.java","src/main/java/tsptest/visibility/VisibilityWriteAsyncClient.java","src/main/java/tsptest/visibility/VisibilityWriteClient.java","src/main/java/tsptest/visibility/implementation/VisibilityClientImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityOpsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityReadsImpl.java","src/main/java/tsptest/visibility/implementation/VisibilityWritesImpl.java","src/main/java/tsptest/visibility/implementation/package-info.java","src/main/java/tsptest/visibility/models/Dog.java","src/main/java/tsptest/visibility/models/ReadDog.java","src/main/java/tsptest/visibility/models/RoundTripModel.java","src/main/java/tsptest/visibility/models/WriteDog.java","src/main/java/tsptest/visibility/models/package-info.java","src/main/java/tsptest/visibility/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java index 1a2f22b26c4..06914a26ee1 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/visibility/generated/VisibilityClientTestBase.java @@ -13,29 +13,20 @@ import com.azure.core.test.TestMode; import com.azure.core.test.TestProxyTestBase; import com.azure.core.util.Configuration; -import tsptest.visibility.VisibilityClient; import tsptest.visibility.VisibilityClientBuilder; +import tsptest.visibility.VisibilityOpClient; import tsptest.visibility.VisibilityReadClient; import tsptest.visibility.VisibilityWriteClient; class VisibilityClientTestBase extends TestProxyTestBase { - protected VisibilityClient visibilityClient; - protected VisibilityReadClient visibilityReadClient; protected VisibilityWriteClient visibilityWriteClient; + protected VisibilityOpClient visibilityOpClient; + @Override protected void beforeTest() { - VisibilityClientBuilder visibilityClientbuilder - = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) - .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) - .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); - if (getTestMode() == TestMode.RECORD) { - visibilityClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); - } - visibilityClient = visibilityClientbuilder.buildClient(); - VisibilityClientBuilder visibilityReadClientbuilder = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) @@ -54,5 +45,14 @@ protected void beforeTest() { } visibilityWriteClient = visibilityWriteClientbuilder.buildVisibilityWriteClient(); + VisibilityClientBuilder visibilityOpClientbuilder + = new VisibilityClientBuilder().endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint")) + .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) + .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); + if (getTestMode() == TestMode.RECORD) { + visibilityOpClientbuilder.addPolicy(interceptorManager.getRecordPolicy()); + } + visibilityOpClient = visibilityOpClientbuilder.buildVisibilityOpClient(); + } } From 8851122b36d1f82594ca2868e94d2d0733f6a3c1 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 14:59:14 +0800 Subject: [PATCH 04/11] handle Paged similar to Spread --- .../emitter/src/code-model-builder.ts | 72 ++++++++++++------- .../emitter/src/common/schemas/usage.ts | 2 +- .../generator/core/mapper/ObjectMapper.java | 18 +---- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts index 6f66921e0fa..293c22b24cd 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -618,6 +618,16 @@ export class CodeModelBuilder { } } } + if (schemaUsage?.includes(SchemaContext.PublicPaged)) { + // Public would override PublicSpread + if (schemaUsage?.includes(SchemaContext.Public)) { + // remove PublicPaged, as it been overridden by Public + schemaUsage.splice(schemaUsage.indexOf(SchemaContext.PublicPaged), 1); + } else { + // add Public + schemaUsage.push(SchemaContext.Public); + } + } } } @@ -1043,6 +1053,7 @@ export class CodeModelBuilder { lroMetadata = this.processLroMetadata(codeModelOperation, sdkMethod); } + const isPagedResponse = sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging"; // responses for (const response of sdkMethod.operation.responses) { this.processResponse( @@ -1050,7 +1061,7 @@ export class CodeModelBuilder { response.statusCodes, response, lroMetadata.longRunning, - false, + isPagedResponse, ); } @@ -1061,6 +1072,7 @@ export class CodeModelBuilder { response.statusCodes, response, lroMetadata.longRunning, + false, true, ); } @@ -1092,12 +1104,6 @@ export class CodeModelBuilder { return; } - op.responses?.forEach((r) => { - if (r instanceof SchemaResponse) { - this.trackSchemaUsage(r.schema, { usage: [SchemaContext.Paged] }); - } - }); - // pageItems const pageItemsResponseProperty = findResponsePropertySegments( op, @@ -2226,7 +2232,8 @@ export class CodeModelBuilder { statusCode: number | HttpStatusCodeRange | "*", sdkResponse: SdkHttpResponse | SdkHttpErrorResponse, longRunning: boolean, - isErrorResponse: boolean, + isPagedResponse: boolean = false, + isErrorResponse: boolean = false, ) { // TODO: what to do if more than 1 response? // It happens when the response type is Union, on one status code. @@ -2401,8 +2408,16 @@ export class CodeModelBuilder { this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Output] }); if (trackConvenienceApi) { + const schemaIsPublicBeforeProcess = + response.schema instanceof ObjectSchema && + (response.schema as SchemaUsage).usage?.includes(SchemaContext.Public); + const publicSchemaContext = + isPagedResponse && !schemaIsPublicBeforeProcess + ? SchemaContext.PublicPaged + : SchemaContext.Public; + this.trackSchemaUsage(response.schema, { - usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public], + usage: [op.internalApi ? SchemaContext.Internal : publicSchemaContext], }); } } @@ -3579,28 +3594,35 @@ export class CodeModelBuilder { } }; - // Exclude context that not to be propagated - const updatedSchemaUsage = (schema as SchemaUsage).usage?.filter( - (it) => it !== SchemaContext.Paged && it !== SchemaContext.PublicSpread, + const schemaUsageDetails = schema as SchemaUsage; + const originalUsage = schemaUsageDetails.usage; + // Exclude "PublicPaged" and "PublicSpread" that are not to be propagated + const updatedSchemaUsage = originalUsage?.filter( + (it) => it !== SchemaContext.PublicPaged && it !== SchemaContext.PublicSpread, ); - const indexSpread = (schema as SchemaUsage).usage?.indexOf(SchemaContext.PublicSpread); - if ( - updatedSchemaUsage && - indexSpread && - indexSpread >= 0 && - !(schema as SchemaUsage).usage?.includes(SchemaContext.Public) - ) { - // Propagate Public, if schema is PublicSpread - updatedSchemaUsage.push(SchemaContext.Public); - } - const schemaUsage = { + // Propagate "Public" usage to schema if it has "PublicPaged" or "PublicSpread" usage + const hasPublicUsage = originalUsage?.includes(SchemaContext.Public); + const addPublicIfUsageIncludes = (context: SchemaContext) => { + if ( + updatedSchemaUsage && + originalUsage?.includes(context) && + !hasPublicUsage && + !updatedSchemaUsage.includes(SchemaContext.Public) + ) { + updatedSchemaUsage.push(SchemaContext.Public); + } + }; + addPublicIfUsageIncludes(SchemaContext.PublicSpread); + addPublicIfUsageIncludes(SchemaContext.PublicPaged); + + const schemaUsageToPropagate = { usage: updatedSchemaUsage, - serializationFormats: (schema as SchemaUsage).serializationFormats?.filter( + serializationFormats: schemaUsageDetails.serializationFormats?.filter( (it) => it !== KnownMediaType.Multipart, ), }; // Propagate the usage of the initial schema itself - innerPropagateSchemaUsage(schema, schemaUsage); + innerPropagateSchemaUsage(schema, schemaUsageToPropagate); } private trackSchemaUsage(schema: Schema, schemaUsage: SchemaUsage): void { diff --git a/packages/http-client-java/emitter/src/common/schemas/usage.ts b/packages/http-client-java/emitter/src/common/schemas/usage.ts index fa16911048f..d91722d6d3d 100644 --- a/packages/http-client-java/emitter/src/common/schemas/usage.ts +++ b/packages/http-client-java/emitter/src/common/schemas/usage.ts @@ -20,7 +20,7 @@ export enum SchemaContext { External = "external", /** Schema is used from the pageable operation. This usage does not propagate. */ - Paged = "paged", + PublicPaged = "paged", /** Schema as spread/flatten model. "Public", if present in usage, will have precedence over "PublicSpread". This usage does not propagate. Instead, it propagate "Public". */ PublicSpread = "spread", diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java index 3fc971fdaa6..efc9e974018 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java @@ -60,7 +60,7 @@ private ClassType createClassType(ObjectSchema compositeType) { && isInternalModel(compositeType)) { // internal type is not exposed to user packageSuffixes = new String[] { settings.getImplementationSubpackage(), settings.getModelsSubpackage() }; - } else if (isPagedModel(compositeType) && isChildrenAllInternal(compositeType)) { + } else if (isPagedModel(compositeType)) { // put class of Page<> type to implementation package // for DPG from TypeSpec, these are not generated to class @@ -141,22 +141,6 @@ private static boolean isPagedModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.PAGED); } - private static boolean isChildrenAllInternal(ObjectSchema compositeType) { - // If we move model to implementation package, we need to make sure it does not have child that need to be - // public - boolean ret = true; - if (compositeType.getChildren() != null && !CoreUtils.isNullOrEmpty(compositeType.getChildren().getAll())) { - ret = compositeType.getChildren() - .getAll() - .stream() - .noneMatch(s -> (s instanceof ObjectSchema) - && !isPagedModel(((ObjectSchema) s)) - && (((ObjectSchema) s).getUsage() != null - && ((ObjectSchema) s).getUsage().contains(SchemaContext.PUBLIC))); - } - return ret; - } - private static boolean isInternalModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.INTERNAL); } From e3b1e57c14fb229d630f8b8358f80bf85330bcd6 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 15:05:02 +0800 Subject: [PATCH 05/11] add test --- .../tsp/arm-stream-style-serialization.tsp | 17 +++++++++++++++++ .../tsp/visibility.tsp | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp index a240bd8ee1a..94097de9f0e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp @@ -278,6 +278,14 @@ interface Items { @get @route("summary2") summary2(): ListResultSummary2; + + @get + @list + @route("list3") + list3(): ListResult3; + + @post + post(@body body: ListResult3): void; } // model does not contain `@pageItems` property, but inherit them from parent @@ -302,6 +310,15 @@ model ListResult2 { nextLink?: string; } +// This paged model need to be public (instead of in "implementation" package), as it is referenced in public API or public model +model ListResult3 { + @pageItems + items: Result[]; + + @nextLink + nextLink?: string; +} + model ListResultSummary2 extends ListResult2 { summary?: string; } diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp index 9ef4a4987eb..db783adb259 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/visibility.tsp @@ -1,4 +1,3 @@ - import "@typespec/rest"; import "@azure-tools/typespec-client-generator-core"; From dc6304054a1f315e17168934eecc55ff9050f510 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 15:19:42 +0800 Subject: [PATCH 06/11] revert logic --- .../emitter/src/code-model-builder.ts | 72 ++--- .../emitter/src/common/schemas/usage.ts | 2 +- .../generator/core/mapper/ObjectMapper.java | 18 +- .../implementation/LroPagingsClientImpl.java | 2 +- .../models/ProductListResult.java | 95 ------ .../fluent/ItemsClient.java | 47 +++ .../implementation/ItemsClientImpl.java | 304 +++++++++++++++++- .../implementation/ItemsImpl.java | 17 + .../implementation/models/ListResult.java | 134 -------- .../models/ListResultSummary.java | 1 + .../models/Items.java | 42 +++ .../models/Result.java | 17 +- ...styleserialization-generated_metadata.json | 2 +- ...operationtemplates-generated_metadata.json | 2 +- 14 files changed, 470 insertions(+), 285 deletions(-) delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java delete mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts index 293c22b24cd..6f66921e0fa 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -618,16 +618,6 @@ export class CodeModelBuilder { } } } - if (schemaUsage?.includes(SchemaContext.PublicPaged)) { - // Public would override PublicSpread - if (schemaUsage?.includes(SchemaContext.Public)) { - // remove PublicPaged, as it been overridden by Public - schemaUsage.splice(schemaUsage.indexOf(SchemaContext.PublicPaged), 1); - } else { - // add Public - schemaUsage.push(SchemaContext.Public); - } - } } } @@ -1053,7 +1043,6 @@ export class CodeModelBuilder { lroMetadata = this.processLroMetadata(codeModelOperation, sdkMethod); } - const isPagedResponse = sdkMethod.kind === "paging" || sdkMethod.kind === "lropaging"; // responses for (const response of sdkMethod.operation.responses) { this.processResponse( @@ -1061,7 +1050,7 @@ export class CodeModelBuilder { response.statusCodes, response, lroMetadata.longRunning, - isPagedResponse, + false, ); } @@ -1072,7 +1061,6 @@ export class CodeModelBuilder { response.statusCodes, response, lroMetadata.longRunning, - false, true, ); } @@ -1104,6 +1092,12 @@ export class CodeModelBuilder { return; } + op.responses?.forEach((r) => { + if (r instanceof SchemaResponse) { + this.trackSchemaUsage(r.schema, { usage: [SchemaContext.Paged] }); + } + }); + // pageItems const pageItemsResponseProperty = findResponsePropertySegments( op, @@ -2232,8 +2226,7 @@ export class CodeModelBuilder { statusCode: number | HttpStatusCodeRange | "*", sdkResponse: SdkHttpResponse | SdkHttpErrorResponse, longRunning: boolean, - isPagedResponse: boolean = false, - isErrorResponse: boolean = false, + isErrorResponse: boolean, ) { // TODO: what to do if more than 1 response? // It happens when the response type is Union, on one status code. @@ -2408,16 +2401,8 @@ export class CodeModelBuilder { this.trackSchemaUsage(response.schema, { usage: [SchemaContext.Output] }); if (trackConvenienceApi) { - const schemaIsPublicBeforeProcess = - response.schema instanceof ObjectSchema && - (response.schema as SchemaUsage).usage?.includes(SchemaContext.Public); - const publicSchemaContext = - isPagedResponse && !schemaIsPublicBeforeProcess - ? SchemaContext.PublicPaged - : SchemaContext.Public; - this.trackSchemaUsage(response.schema, { - usage: [op.internalApi ? SchemaContext.Internal : publicSchemaContext], + usage: [op.internalApi ? SchemaContext.Internal : SchemaContext.Public], }); } } @@ -3594,35 +3579,28 @@ export class CodeModelBuilder { } }; - const schemaUsageDetails = schema as SchemaUsage; - const originalUsage = schemaUsageDetails.usage; - // Exclude "PublicPaged" and "PublicSpread" that are not to be propagated - const updatedSchemaUsage = originalUsage?.filter( - (it) => it !== SchemaContext.PublicPaged && it !== SchemaContext.PublicSpread, + // Exclude context that not to be propagated + const updatedSchemaUsage = (schema as SchemaUsage).usage?.filter( + (it) => it !== SchemaContext.Paged && it !== SchemaContext.PublicSpread, ); - // Propagate "Public" usage to schema if it has "PublicPaged" or "PublicSpread" usage - const hasPublicUsage = originalUsage?.includes(SchemaContext.Public); - const addPublicIfUsageIncludes = (context: SchemaContext) => { - if ( - updatedSchemaUsage && - originalUsage?.includes(context) && - !hasPublicUsage && - !updatedSchemaUsage.includes(SchemaContext.Public) - ) { - updatedSchemaUsage.push(SchemaContext.Public); - } - }; - addPublicIfUsageIncludes(SchemaContext.PublicSpread); - addPublicIfUsageIncludes(SchemaContext.PublicPaged); - - const schemaUsageToPropagate = { + const indexSpread = (schema as SchemaUsage).usage?.indexOf(SchemaContext.PublicSpread); + if ( + updatedSchemaUsage && + indexSpread && + indexSpread >= 0 && + !(schema as SchemaUsage).usage?.includes(SchemaContext.Public) + ) { + // Propagate Public, if schema is PublicSpread + updatedSchemaUsage.push(SchemaContext.Public); + } + const schemaUsage = { usage: updatedSchemaUsage, - serializationFormats: schemaUsageDetails.serializationFormats?.filter( + serializationFormats: (schema as SchemaUsage).serializationFormats?.filter( (it) => it !== KnownMediaType.Multipart, ), }; // Propagate the usage of the initial schema itself - innerPropagateSchemaUsage(schema, schemaUsageToPropagate); + innerPropagateSchemaUsage(schema, schemaUsage); } private trackSchemaUsage(schema: Schema, schemaUsage: SchemaUsage): void { diff --git a/packages/http-client-java/emitter/src/common/schemas/usage.ts b/packages/http-client-java/emitter/src/common/schemas/usage.ts index d91722d6d3d..fa16911048f 100644 --- a/packages/http-client-java/emitter/src/common/schemas/usage.ts +++ b/packages/http-client-java/emitter/src/common/schemas/usage.ts @@ -20,7 +20,7 @@ export enum SchemaContext { External = "external", /** Schema is used from the pageable operation. This usage does not propagate. */ - PublicPaged = "paged", + Paged = "paged", /** Schema as spread/flatten model. "Public", if present in usage, will have precedence over "PublicSpread". This usage does not propagate. Instead, it propagate "Public". */ PublicSpread = "spread", diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java index efc9e974018..3fc971fdaa6 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/ObjectMapper.java @@ -60,7 +60,7 @@ private ClassType createClassType(ObjectSchema compositeType) { && isInternalModel(compositeType)) { // internal type is not exposed to user packageSuffixes = new String[] { settings.getImplementationSubpackage(), settings.getModelsSubpackage() }; - } else if (isPagedModel(compositeType)) { + } else if (isPagedModel(compositeType) && isChildrenAllInternal(compositeType)) { // put class of Page<> type to implementation package // for DPG from TypeSpec, these are not generated to class @@ -141,6 +141,22 @@ private static boolean isPagedModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.PAGED); } + private static boolean isChildrenAllInternal(ObjectSchema compositeType) { + // If we move model to implementation package, we need to make sure it does not have child that need to be + // public + boolean ret = true; + if (compositeType.getChildren() != null && !CoreUtils.isNullOrEmpty(compositeType.getChildren().getAll())) { + ret = compositeType.getChildren() + .getAll() + .stream() + .noneMatch(s -> (s instanceof ObjectSchema) + && !isPagedModel(((ObjectSchema) s)) + && (((ObjectSchema) s).getUsage() != null + && ((ObjectSchema) s).getUsage().contains(SchemaContext.PUBLIC))); + } + return ret; + } + private static boolean isInternalModel(ObjectSchema compositeType) { return compositeType.getUsage() != null && compositeType.getUsage().contains(SchemaContext.INTERNAL); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java index 9590bc3a598..846884eefe3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java @@ -6,7 +6,7 @@ import azure.resourcemanager.operationtemplates.fluent.LroPagingsClient; import azure.resourcemanager.operationtemplates.fluent.models.ProductInner; -import azure.resourcemanager.operationtemplates.implementation.models.ProductListResult; +import azure.resourcemanager.operationtemplates.models.ProductListResult; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java deleted file mode 100644 index 5ee57ded96b..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package azure.resourcemanager.operationtemplates.implementation.models; - -import azure.resourcemanager.operationtemplates.fluent.models.ProductInner; -import com.azure.core.annotation.Immutable; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; - -/** - * Paged collection of Product items. - */ -@Immutable -public final class ProductListResult implements JsonSerializable { - /* - * The Product items on this page - */ - private List value; - - /* - * The link to the next page of items - */ - private String nextLink; - - /** - * Creates an instance of ProductListResult class. - */ - private ProductListResult() { - } - - /** - * Get the value property: The Product items on this page. - * - * @return the value value. - */ - public List value() { - return this.value; - } - - /** - * Get the nextLink property: The link to the next page of items. - * - * @return the nextLink value. - */ - public String nextLink() { - return this.nextLink; - } - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("nextLink", this.nextLink); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of ProductListResult from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of ProductListResult if the JsonReader was pointing to an instance of it, or null if it was - * pointing to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the ProductListResult. - */ - public static ProductListResult fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - ProductListResult deserializedProductListResult = new ProductListResult(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("value".equals(fieldName)) { - List value = reader.readArray(reader1 -> ProductInner.fromJson(reader1)); - deserializedProductListResult.value = value; - } else if ("nextLink".equals(fieldName)) { - deserializedProductListResult.nextLink = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedProductListResult; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java index 7241457923f..39dcb7ec1be 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java @@ -10,6 +10,7 @@ import com.azure.core.http.rest.Response; import com.azure.core.util.Context; import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.Result; /** @@ -103,4 +104,50 @@ public interface ItemsClient { */ @ServiceMethod(returns = ReturnType.SINGLE) ListResultSummary2Inner summary2(); + + /** + * The list3 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list3(); + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + PagedIterable list3(Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response postWithResponse(ListResult3 body, Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + void post(ListResult3 body); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java index 1422e8b2dc5..bee38f6321e 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java @@ -4,6 +4,7 @@ package tsptest.armstreamstyleserialization.implementation; +import com.azure.core.annotation.BodyParam; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; @@ -11,6 +12,7 @@ import com.azure.core.annotation.Host; import com.azure.core.annotation.HostParam; import com.azure.core.annotation.PathParam; +import com.azure.core.annotation.Post; import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; @@ -31,9 +33,10 @@ import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.ItemsClient; import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; -import tsptest.armstreamstyleserialization.implementation.models.ListResult; import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult; import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.Result; /** @@ -123,6 +126,35 @@ Mono> summary2(@HostParam("endpoint") String e Response summary2Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) + @Get("/items/list3") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list3(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list3") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list3Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Accept: application/json;q=0.9" }) + @Post("/items") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> post(@HostParam("endpoint") String endpoint, + @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") ListResult3 body, + Context context); + + @Headers({ "Accept: application/json;q=0.9" }) + @Post("/items") + @ExpectedResponses({ 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response postSync(@HostParam("endpoint") String endpoint, @HeaderParam("Content-Type") String contentType, + @BodyParam("application/json") ListResult3 body, Context context); + @Headers({ "Content-Type: application/json" }) @Get("{nextLink}") @ExpectedResponses({ 200 }) @@ -164,6 +196,20 @@ Mono> list2Next(@PathParam(value = "nextLink", encoded = t @UnexpectedResponseExceptionType(ManagementException.class) Response list2NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list3Next(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("{nextLink}") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list3NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); } /** @@ -544,6 +590,184 @@ public ListResultSummary2Inner summary2() { return summary2WithResponse(Context.NONE).getValue(); } + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list3SinglePageAsync() { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list3(this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedFlux}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + private PagedFlux list3Async() { + return new PagedFlux<>(() -> list3SinglePageAsync(), nextLink -> list3NextSinglePageAsync(nextLink)); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3SinglePage() { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3Sync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3SinglePage(Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3Sync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list3 operation. + * + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list3() { + return new PagedIterable<>(() -> list3SinglePage(), nextLink -> list3NextSinglePage(nextLink)); + } + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable list3(Context context) { + return new PagedIterable<>(() -> list3SinglePage(context), nextLink -> list3NextSinglePage(nextLink, context)); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> postWithResponseAsync(ListResult3 body) { + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (body == null) { + return Mono.error(new IllegalArgumentException("Parameter body is required and cannot be null.")); + } else { + body.validate(); + } + final String contentType = "application/json"; + return FluxUtil.withContext(context -> service.post(this.client.getEndpoint(), contentType, body, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return A {@link Mono} that completes when a successful response is received. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono postAsync(ListResult3 body) { + return postWithResponseAsync(body).flatMap(ignored -> Mono.empty()); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response postWithResponse(ListResult3 body, Context context) { + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + if (body == null) { + throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null.")); + } else { + body.validate(); + } + final String contentType = "application/json"; + return service.postSync(this.client.getEndpoint(), contentType, body, context); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public void post(ListResult3 body) { + postWithResponse(body, Context.NONE); + } + /** * Get the next page of items. * @@ -780,5 +1004,83 @@ private PagedResponse list2NextSinglePage(String nextLink, Context conte res.getValue().nextLink(), null); } + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> list3NextSinglePageAsync(String nextLink) { + if (nextLink == null) { + return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + return Mono.error( + new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + return FluxUtil.withContext(context -> service.list3Next(nextLink, this.client.getEndpoint(), accept, context)) + .>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), + res.getHeaders(), res.getValue().items(), res.getValue().nextLink(), null)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3NextSinglePage(String nextLink) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3NextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private PagedResponse list3NextSinglePage(String nextLink, Context context) { + if (nextLink == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null.")); + } + if (this.client.getEndpoint() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException( + "Parameter this.client.getEndpoint() is required and cannot be null.")); + } + final String accept = "application/json"; + Response res = service.list3NextSync(nextLink, this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + private static final ClientLogger LOGGER = new ClientLogger(ItemsClientImpl.class); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java index cf6522d43c1..2602f80f5ff 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java @@ -12,6 +12,7 @@ import tsptest.armstreamstyleserialization.fluent.ItemsClient; import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Items; +import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.ListResultSummary2; import tsptest.armstreamstyleserialization.models.Result; @@ -67,6 +68,22 @@ public ListResultSummary2 summary2() { } } + public PagedIterable list3() { + return this.serviceClient().list3(); + } + + public PagedIterable list3(Context context) { + return this.serviceClient().list3(context); + } + + public Response postWithResponse(ListResult3 body, Context context) { + return this.serviceClient().postWithResponse(body, context); + } + + public void post(ListResult3 body) { + this.serviceClient().post(body); + } + private ItemsClient serviceClient() { return this.innerClient; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java deleted file mode 100644 index 0d612e3c14c..00000000000 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. -// Code generated by Microsoft (R) TypeSpec Code Generator. - -package tsptest.armstreamstyleserialization.implementation.models; - -import com.azure.core.annotation.Immutable; -import com.azure.core.util.logging.ClientLogger; -import com.azure.json.JsonReader; -import com.azure.json.JsonSerializable; -import com.azure.json.JsonToken; -import com.azure.json.JsonWriter; -import java.io.IOException; -import java.util.List; -import tsptest.armstreamstyleserialization.models.Result; - -/** - * The ListResult model. - */ -@Immutable -public class ListResult implements JsonSerializable { - /* - * The items property. - */ - private List items; - - /* - * The nextLink property. - */ - private String nextLink; - - /** - * Creates an instance of ListResult class. - */ - protected ListResult() { - } - - /** - * Get the items property: The items property. - * - * @return the items value. - */ - public List items() { - return this.items; - } - - /** - * Set the items property: The items property. - * - * @param items the items value to set. - * @return the ListResult object itself. - */ - ListResult withItems(List items) { - this.items = items; - return this; - } - - /** - * Get the nextLink property: The nextLink property. - * - * @return the nextLink value. - */ - public String nextLink() { - return this.nextLink; - } - - /** - * Set the nextLink property: The nextLink property. - * - * @param nextLink the nextLink value to set. - * @return the ListResult object itself. - */ - ListResult withNextLink(String nextLink) { - this.nextLink = nextLink; - return this; - } - - /** - * Validates the instance. - * - * @throws IllegalArgumentException thrown if the instance is not valid. - */ - public void validate() { - if (items() == null) { - throw LOGGER.atError() - .log(new IllegalArgumentException("Missing required property items in model ListResult")); - } else { - items().forEach(e -> e.validate()); - } - } - - private static final ClientLogger LOGGER = new ClientLogger(ListResult.class); - - /** - * {@inheritDoc} - */ - @Override - public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { - jsonWriter.writeStartObject(); - jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); - jsonWriter.writeStringField("nextLink", this.nextLink); - return jsonWriter.writeEndObject(); - } - - /** - * Reads an instance of ListResult from the JsonReader. - * - * @param jsonReader The JsonReader being read. - * @return An instance of ListResult if the JsonReader was pointing to an instance of it, or null if it was pointing - * to JSON null. - * @throws IllegalStateException If the deserialized JSON object was missing any required properties. - * @throws IOException If an error occurs while reading the ListResult. - */ - public static ListResult fromJson(JsonReader jsonReader) throws IOException { - return jsonReader.readObject(reader -> { - ListResult deserializedListResult = new ListResult(); - while (reader.nextToken() != JsonToken.END_OBJECT) { - String fieldName = reader.getFieldName(); - reader.nextToken(); - - if ("items".equals(fieldName)) { - List items = reader.readArray(reader1 -> Result.fromJson(reader1)); - deserializedListResult.items = items; - } else if ("nextLink".equals(fieldName)) { - deserializedListResult.nextLink = reader.getString(); - } else { - reader.skipChildren(); - } - } - - return deserializedListResult; - }); - } -} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java index 04710cf983f..3865ca70dd0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java @@ -11,6 +11,7 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.util.List; +import tsptest.armstreamstyleserialization.models.ListResult; import tsptest.armstreamstyleserialization.models.Result; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java index e6a0925190c..7cd5fc475dc 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Items.java @@ -91,4 +91,46 @@ public interface Items { * @return the response. */ ListResultSummary2 summary2(); + + /** + * The list3 operation. + * + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list3(); + + /** + * The list3 operation. + * + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + PagedIterable list3(Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @param context The context to associate with this operation. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + Response postWithResponse(ListResult3 body, Context context); + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + void post(ListResult3 body); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java index 2b17d99ebc6..e9ce2cc43fe 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/Result.java @@ -4,7 +4,7 @@ package tsptest.armstreamstyleserialization.models; -import com.azure.core.annotation.Immutable; +import com.azure.core.annotation.Fluent; import com.azure.core.util.logging.ClientLogger; import com.azure.json.JsonReader; import com.azure.json.JsonSerializable; @@ -16,7 +16,7 @@ /** * The Result model. */ -@Immutable +@Fluent public final class Result implements JsonSerializable { /* * The name property. @@ -31,7 +31,7 @@ public final class Result implements JsonSerializable { /** * Creates an instance of Result class. */ - private Result() { + public Result() { } /** @@ -43,6 +43,17 @@ public String name() { return this.name; } + /** + * Set the name property: The name property. + * + * @param name the name value to set. + * @return the Result object itself. + */ + public Result withName(String name) { + this.name = name; + return this; + } + /** * Get the innerData property: The data property. * diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json index 54b44af1b89..43ed45eb2c8 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersions":{"TspTest.ArmStreamStyleSerialization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.ItemsClient.list2":"TspTest.ArmStreamStyleSerialization.Items.list2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary":"TspTest.ArmStreamStyleSerialization.Items.summary","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2WithResponse":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner":"TspTest.ArmStreamStyleSerialization.ListResultSummary2","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.implementation.models.ListResultSummary":"TspTest.ArmStreamStyleSerialization.ListResultSummary","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.ErrorMax":"TspTest.ArmStreamStyleSerialization.ErrorResponseMax","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.ListResult2":"TspTest.ArmStreamStyleSerialization.ListResult2","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmStreamStyleSerialization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.ItemsClient.list2":"TspTest.ArmStreamStyleSerialization.Items.list2","tsptest.armstreamstyleserialization.fluent.ItemsClient.list3":"TspTest.ArmStreamStyleSerialization.Items.list3","tsptest.armstreamstyleserialization.fluent.ItemsClient.post":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.postWithResponse":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary":"TspTest.ArmStreamStyleSerialization.Items.summary","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2WithResponse":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner":"TspTest.ArmStreamStyleSerialization.ListResultSummary2","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResultSummary":"TspTest.ArmStreamStyleSerialization.ListResultSummary","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.ErrorMax":"TspTest.ArmStreamStyleSerialization.ErrorResponseMax","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.models.ListResult2":"TspTest.ArmStreamStyleSerialization.ListResult2","tsptest.armstreamstyleserialization.models.ListResult3":"TspTest.ArmStreamStyleSerialization.ListResult3","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json index 736ac7b86c0..6782e47b660 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.OperationTemplates":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.exportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.implementation.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.OperationTemplates":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.exportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file From c15b6c459682645d9bf6c568d8162d49aadd26af Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 16:11:22 +0800 Subject: [PATCH 07/11] let access=public override paged --- .../http-client-java/emitter/src/code-model-builder.ts | 8 ++++++++ .../tsp/arm-stream-style-serialization.tsp | 1 + 2 files changed, 9 insertions(+) diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts index 6f66921e0fa..d7fe98b6fc8 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -506,6 +506,14 @@ export class CodeModelBuilder { this.trackSchemaUsage(schema, { usage: [SchemaContext.Public], }); + if (schema instanceof ObjectSchema && schema.usage) { + const schemaUsage: SchemaContext[] | undefined = schema.usage; + // And, remove the Paged, as we assume customer explicitly asks Public + const index = schemaUsage.indexOf(SchemaContext.Paged); + if (index >= 0) { + schemaUsage.splice(index, 1); + } + } } else if (access === "internal") { const schema = this.processSchema(model, model.name); diff --git a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp index 94097de9f0e..0187de15f86 100644 --- a/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp +++ b/packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp @@ -311,6 +311,7 @@ model ListResult2 { } // This paged model need to be public (instead of in "implementation" package), as it is referenced in public API or public model +@access(Access.public) model ListResult3 { @pageItems items: Result[]; From 2042b8d66f4522a6314dc0f53e32ea3bc3258c3c Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 16:11:35 +0800 Subject: [PATCH 08/11] regen --- .../implementation/LroPagingsClientImpl.java | 2 +- .../models/ProductListResult.java | 95 +++++++++++++ .../implementation/ItemsClientImpl.java | 2 +- .../implementation/models/ListResult.java | 134 ++++++++++++++++++ .../models/ListResultSummary.java | 1 - .../models/ListResult3.java | 133 +++++++++++++++++ ...styleserialization-generated_metadata.json | 2 +- ...operationtemplates-generated_metadata.json | 2 +- 8 files changed, 366 insertions(+), 5 deletions(-) create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java index 846884eefe3..9590bc3a598 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java @@ -6,7 +6,7 @@ import azure.resourcemanager.operationtemplates.fluent.LroPagingsClient; import azure.resourcemanager.operationtemplates.fluent.models.ProductInner; -import azure.resourcemanager.operationtemplates.models.ProductListResult; +import azure.resourcemanager.operationtemplates.implementation.models.ProductListResult; import com.azure.core.annotation.ExpectedResponses; import com.azure.core.annotation.Get; import com.azure.core.annotation.HeaderParam; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java new file mode 100644 index 00000000000..5ee57ded96b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java @@ -0,0 +1,95 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package azure.resourcemanager.operationtemplates.implementation.models; + +import azure.resourcemanager.operationtemplates.fluent.models.ProductInner; +import com.azure.core.annotation.Immutable; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * Paged collection of Product items. + */ +@Immutable +public final class ProductListResult implements JsonSerializable { + /* + * The Product items on this page + */ + private List value; + + /* + * The link to the next page of items + */ + private String nextLink; + + /** + * Creates an instance of ProductListResult class. + */ + private ProductListResult() { + } + + /** + * Get the value property: The Product items on this page. + * + * @return the value value. + */ + public List value() { + return this.value; + } + + /** + * Get the nextLink property: The link to the next page of items. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ProductListResult from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ProductListResult if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ProductListResult. + */ + public static ProductListResult fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ProductListResult deserializedProductListResult = new ProductListResult(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("value".equals(fieldName)) { + List value = reader.readArray(reader1 -> ProductInner.fromJson(reader1)); + deserializedProductListResult.value = value; + } else if ("nextLink".equals(fieldName)) { + deserializedProductListResult.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedProductListResult; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java index bee38f6321e..c835c1e1715 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java @@ -33,8 +33,8 @@ import reactor.core.publisher.Mono; import tsptest.armstreamstyleserialization.fluent.ItemsClient; import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.implementation.models.ListResult; import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; -import tsptest.armstreamstyleserialization.models.ListResult; import tsptest.armstreamstyleserialization.models.ListResult2; import tsptest.armstreamstyleserialization.models.ListResult3; import tsptest.armstreamstyleserialization.models.Result; diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java new file mode 100644 index 00000000000..0d612e3c14c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java @@ -0,0 +1,134 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResult model. + */ +@Immutable +public class ListResult implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult class. + */ + protected ListResult() { + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + public List items() { + return this.items; + } + + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult object itself. + */ + ListResult withItems(List items) { + this.items = items; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult object itself. + */ + ListResult withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResult")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResult from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult if the JsonReader was pointing to an instance of it, or null if it was pointing + * to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResult. + */ + public static ListResult fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult deserializedListResult = new ListResult(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java index 3865ca70dd0..04710cf983f 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java @@ -11,7 +11,6 @@ import com.azure.json.JsonWriter; import java.io.IOException; import java.util.List; -import tsptest.armstreamstyleserialization.models.ListResult; import tsptest.armstreamstyleserialization.models.Result; /** diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java new file mode 100644 index 00000000000..c24d0e9c9a9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java @@ -0,0 +1,133 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.models; + +import com.azure.core.annotation.Fluent; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonSerializable; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; + +/** + * The ListResult3 model. + */ +@Fluent +public final class ListResult3 implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult3 class. + */ + public ListResult3() { + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + public List items() { + return this.items; + } + + /** + * Set the items property: The items property. + * + * @param items the items value to set. + * @return the ListResult3 object itself. + */ + public ListResult3 withItems(List items) { + this.items = items; + return this; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + public String nextLink() { + return this.nextLink; + } + + /** + * Set the nextLink property: The nextLink property. + * + * @param nextLink the nextLink value to set. + * @return the ListResult3 object itself. + */ + public ListResult3 withNextLink(String nextLink) { + this.nextLink = nextLink; + return this; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResult3")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult3.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", this.items, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", this.nextLink); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResult3 from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult3 if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the ListResult3. + */ + public static ListResult3 fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult3 deserializedListResult3 = new ListResult3(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult3.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult3.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult3; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json index 43ed45eb2c8..90d204298a3 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-armstreamstyleserialization-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersions":{"TspTest.ArmStreamStyleSerialization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.ItemsClient.list2":"TspTest.ArmStreamStyleSerialization.Items.list2","tsptest.armstreamstyleserialization.fluent.ItemsClient.list3":"TspTest.ArmStreamStyleSerialization.Items.list3","tsptest.armstreamstyleserialization.fluent.ItemsClient.post":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.postWithResponse":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary":"TspTest.ArmStreamStyleSerialization.Items.summary","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2WithResponse":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner":"TspTest.ArmStreamStyleSerialization.ListResultSummary2","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResultSummary":"TspTest.ArmStreamStyleSerialization.ListResultSummary","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.ErrorMax":"TspTest.ArmStreamStyleSerialization.ErrorResponseMax","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.models.ListResult2":"TspTest.ArmStreamStyleSerialization.ListResult2","tsptest.armstreamstyleserialization.models.ListResult3":"TspTest.ArmStreamStyleSerialization.ListResult3","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"TspTest.ArmStreamStyleSerialization":"2023-12-01-preview"},"crossLanguageDefinitions":{"tsptest.armstreamstyleserialization.fluent.ArmResourceProviderManagementClient":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.fluent.FishesClient":"TspTest.ArmStreamStyleSerialization.Fishes","tsptest.armstreamstyleserialization.fluent.FishesClient.getModel":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModel":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.getOutputOnlyModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.getOutputOnlyModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModel":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FishesClient.putModelWithResponse":"TspTest.ArmStreamStyleSerialization.Fishes.putModel","tsptest.armstreamstyleserialization.fluent.FunctionsClient":"TspTest.ArmStreamStyleSerialization.Functions","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunction":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.FunctionsClient.createFunctionWithResponse":"TspTest.ArmStreamStyleSerialization.Functions.createFunction","tsptest.armstreamstyleserialization.fluent.ItemsClient":"TspTest.ArmStreamStyleSerialization.Items","tsptest.armstreamstyleserialization.fluent.ItemsClient.list":"TspTest.ArmStreamStyleSerialization.Items.list","tsptest.armstreamstyleserialization.fluent.ItemsClient.list2":"TspTest.ArmStreamStyleSerialization.Items.list2","tsptest.armstreamstyleserialization.fluent.ItemsClient.list3":"TspTest.ArmStreamStyleSerialization.Items.list3","tsptest.armstreamstyleserialization.fluent.ItemsClient.post":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.postWithResponse":"TspTest.ArmStreamStyleSerialization.Items.post","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary":"TspTest.ArmStreamStyleSerialization.Items.summary","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.ItemsClient.summary2WithResponse":"TspTest.ArmStreamStyleSerialization.Items.summary2","tsptest.armstreamstyleserialization.fluent.PrioritiesClient":"TspTest.ArmStreamStyleSerialization.Priorities","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriority":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.PrioritiesClient.setPriorityWithResponse":"TspTest.ArmStreamStyleSerialization.Priorities.setPriority","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.beginUpdate":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.TopLevelArmResourcesClient.update":"TspTest.ArmStreamStyleSerialization.TopLevelArmResources.update","tsptest.armstreamstyleserialization.fluent.models.AnotherFishProperties":"TspTest.ArmStreamStyleSerialization.AnotherFishProperties","tsptest.armstreamstyleserialization.fluent.models.EyeProperties":"TspTest.ArmStreamStyleSerialization.EyeProperties","tsptest.armstreamstyleserialization.fluent.models.FishInner":"TspTest.ArmStreamStyleSerialization.Fish","tsptest.armstreamstyleserialization.fluent.models.FishProperties":"TspTest.ArmStreamStyleSerialization.FishProperties","tsptest.armstreamstyleserialization.fluent.models.FunctionConfiguration":"TspTest.ArmStreamStyleSerialization.FunctionConfiguration","tsptest.armstreamstyleserialization.fluent.models.FunctionInner":"TspTest.ArmStreamStyleSerialization.Function","tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner":"TspTest.ArmStreamStyleSerialization.ListResultSummary2","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelInner":"TspTest.ArmStreamStyleSerialization.OutputOnlyModel","tsptest.armstreamstyleserialization.fluent.models.OutputOnlyModelProperties":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelProperties","tsptest.armstreamstyleserialization.fluent.models.ResultData":"TspTest.ArmStreamStyleSerialization.ResultData","tsptest.armstreamstyleserialization.fluent.models.SalmonInner":"TspTest.ArmStreamStyleSerialization.Salmon","tsptest.armstreamstyleserialization.fluent.models.TailProperties":"TspTest.ArmStreamStyleSerialization.TailProperties","tsptest.armstreamstyleserialization.fluent.models.TopLevelArmResourceInner":"TspTest.ArmStreamStyleSerialization.TopLevelArmResource","tsptest.armstreamstyleserialization.implementation.ArmResourceProviderManagementClientBuilder":"TspTest.ArmStreamStyleSerialization","tsptest.armstreamstyleserialization.implementation.models.ListResult":"TspTest.ArmStreamStyleSerialization.ListResult","tsptest.armstreamstyleserialization.implementation.models.ListResultSummary":"TspTest.ArmStreamStyleSerialization.ListResultSummary","tsptest.armstreamstyleserialization.models.AggregateFunctionProperties":"TspTest.ArmStreamStyleSerialization.AggregateFunctionProperties","tsptest.armstreamstyleserialization.models.Builtin":"TspTest.ArmStreamStyleSerialization.Builtin","tsptest.armstreamstyleserialization.models.Dog":"TspTest.ArmStreamStyleSerialization.Dog","tsptest.armstreamstyleserialization.models.DogKind":"TspTest.ArmStreamStyleSerialization.DogKind","tsptest.armstreamstyleserialization.models.Encoded":"TspTest.ArmStreamStyleSerialization.Encoded","tsptest.armstreamstyleserialization.models.ErrorMax":"TspTest.ArmStreamStyleSerialization.ErrorResponseMax","tsptest.armstreamstyleserialization.models.ErrorMin":"TspTest.ArmStreamStyleSerialization.ErrorResponseMin","tsptest.armstreamstyleserialization.models.FunctionProperties":"TspTest.ArmStreamStyleSerialization.FunctionProperties","tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionHeaders":null,"tsptest.armstreamstyleserialization.models.GoblinShark":"TspTest.ArmStreamStyleSerialization.GoblinShark","tsptest.armstreamstyleserialization.models.Golden":"TspTest.ArmStreamStyleSerialization.Golden","tsptest.armstreamstyleserialization.models.ListResult2":"TspTest.ArmStreamStyleSerialization.ListResult2","tsptest.armstreamstyleserialization.models.ListResult3":"TspTest.ArmStreamStyleSerialization.ListResult3","tsptest.armstreamstyleserialization.models.OutputOnlyModelChild":"TspTest.ArmStreamStyleSerialization.OutputOnlyModelChild","tsptest.armstreamstyleserialization.models.Priority":"TspTest.ArmStreamStyleSerialization.Priority","tsptest.armstreamstyleserialization.models.Result":"TspTest.ArmStreamStyleSerialization.Result","tsptest.armstreamstyleserialization.models.SawShark":"TspTest.ArmStreamStyleSerialization.SawShark","tsptest.armstreamstyleserialization.models.Shark":"TspTest.ArmStreamStyleSerialization.Shark","tsptest.armstreamstyleserialization.models.TopLevelArmResourceProperties":"TspTest.ArmStreamStyleSerialization.TopLevelArmResourceProperties","tsptest.armstreamstyleserialization.models.TopLevelArmResourceTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel"},"generatedFiles":["src/main/java/module-info.java","src/main/java/tsptest/armstreamstyleserialization/ArmResourceProviderManager.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ArmResourceProviderManagementClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FishesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/PrioritiesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/TopLevelArmResourcesClient.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/AnotherFishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/EyeProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FishProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionConfiguration.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/FunctionInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/OutputOnlyModelProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/ResultData.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/SalmonInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TailProperties.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/TopLevelArmResourceInner.java","src/main/java/tsptest/armstreamstyleserialization/fluent/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/fluent/package-info.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientBuilder.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ArmResourceProviderManagementClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FishesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ItemsImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/OutputOnlyModelImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/PrioritiesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/ResourceManagerUtils.java","src/main/java/tsptest/armstreamstyleserialization/implementation/SalmonImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourceImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesClientImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/TopLevelArmResourcesImpl.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResult.java","src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java","src/main/java/tsptest/armstreamstyleserialization/implementation/package-info.java","src/main/java/tsptest/armstreamstyleserialization/models/AggregateFunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Builtin.java","src/main/java/tsptest/armstreamstyleserialization/models/Dog.java","src/main/java/tsptest/armstreamstyleserialization/models/DogKind.java","src/main/java/tsptest/armstreamstyleserialization/models/Encoded.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMax.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMaxException.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMin.java","src/main/java/tsptest/armstreamstyleserialization/models/ErrorMinException.java","src/main/java/tsptest/armstreamstyleserialization/models/Fish.java","src/main/java/tsptest/armstreamstyleserialization/models/Fishes.java","src/main/java/tsptest/armstreamstyleserialization/models/Function.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/Functions.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java","src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java","src/main/java/tsptest/armstreamstyleserialization/models/GoblinShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Golden.java","src/main/java/tsptest/armstreamstyleserialization/models/Items.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResult3.java","src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModel.java","src/main/java/tsptest/armstreamstyleserialization/models/OutputOnlyModelChild.java","src/main/java/tsptest/armstreamstyleserialization/models/Priorities.java","src/main/java/tsptest/armstreamstyleserialization/models/Priority.java","src/main/java/tsptest/armstreamstyleserialization/models/Result.java","src/main/java/tsptest/armstreamstyleserialization/models/Salmon.java","src/main/java/tsptest/armstreamstyleserialization/models/SawShark.java","src/main/java/tsptest/armstreamstyleserialization/models/Shark.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResource.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceProperties.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResourceTagsUpdate.java","src/main/java/tsptest/armstreamstyleserialization/models/TopLevelArmResources.java","src/main/java/tsptest/armstreamstyleserialization/models/package-info.java","src/main/java/tsptest/armstreamstyleserialization/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json index 6782e47b660..736ac7b86c0 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/azure-resourcemanager-operationtemplates-generated_metadata.json @@ -1 +1 @@ -{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.OperationTemplates":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.exportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file +{"flavor":"Azure","apiVersions":{"Azure.ResourceManager.OperationTemplates":"2023-12-01-preview"},"crossLanguageDefinitions":{"azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkGlobalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkGlobal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocal":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.CheckNameAvailabilitiesClient.checkLocalWithResponse":"Azure.ResourceManager.OperationTemplates.CheckNameAvailability.checkLocal","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient":"Azure.ResourceManager.OperationTemplates.LroPaging","azure.resourcemanager.operationtemplates.fluent.LroPagingsClient.postPagingLro":"Azure.ResourceManager.OperationTemplates.LroPaging.postPagingLro","azure.resourcemanager.operationtemplates.fluent.LroesClient":"Azure.ResourceManager.OperationTemplates.Lro","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginCreateOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginDelete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExport":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.beginExportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.LroesClient.createOrReplace":"Azure.ResourceManager.OperationTemplates.Lro.createOrReplace","azure.resourcemanager.operationtemplates.fluent.LroesClient.delete":"Azure.ResourceManager.OperationTemplates.Lro.delete","azure.resourcemanager.operationtemplates.fluent.LroesClient.export":"Azure.ResourceManager.OperationTemplates.Lro.export","azure.resourcemanager.operationtemplates.fluent.LroesClient.exportArray":"Azure.ResourceManager.OperationTemplates.Lro.exportArray","azure.resourcemanager.operationtemplates.fluent.OperationTemplatesClient":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.fluent.OperationsClient":"Azure.ResourceManager.OperationTemplates.Operations","azure.resourcemanager.operationtemplates.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient":"Azure.ResourceManager.OperationTemplates.OptionalBody","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroup":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.get","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patch":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.patchWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.patch","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.post":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.postWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.post","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPost":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.OptionalBodiesClient.providerPostWithResponse":"Azure.ResourceManager.OperationTemplates.OptionalBody.providerPost","azure.resourcemanager.operationtemplates.fluent.models.ActionResultInner":"Azure.ResourceManager.OperationTemplates.ActionResult","azure.resourcemanager.operationtemplates.fluent.models.ChangeAllowanceResultInner":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceResult","azure.resourcemanager.operationtemplates.fluent.models.CheckNameAvailabilityResponseInner":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityResponse","azure.resourcemanager.operationtemplates.fluent.models.ExportResultInner":"Azure.ResourceManager.OperationTemplates.ExportResult","azure.resourcemanager.operationtemplates.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","azure.resourcemanager.operationtemplates.fluent.models.OrderInner":"Azure.ResourceManager.OperationTemplates.Order","azure.resourcemanager.operationtemplates.fluent.models.ProductInner":"Azure.ResourceManager.OperationTemplates.Product","azure.resourcemanager.operationtemplates.fluent.models.WidgetInner":"Azure.ResourceManager.OperationTemplates.Widget","azure.resourcemanager.operationtemplates.implementation.OperationTemplatesClientBuilder":"Azure.ResourceManager.OperationTemplates","azure.resourcemanager.operationtemplates.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","azure.resourcemanager.operationtemplates.implementation.models.ProductListResult":"Azure.ResourceManager.OperationTemplates.ProductListResult","azure.resourcemanager.operationtemplates.models.ActionRequest":"Azure.ResourceManager.OperationTemplates.ActionRequest","azure.resourcemanager.operationtemplates.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","azure.resourcemanager.operationtemplates.models.ChangeAllowanceRequest":"Azure.ResourceManager.OperationTemplates.ChangeAllowanceRequest","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityReason":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityReason","azure.resourcemanager.operationtemplates.models.CheckNameAvailabilityRequest":"Azure.ResourceManager.CommonTypes.CheckNameAvailabilityRequest","azure.resourcemanager.operationtemplates.models.ExportRequest":"Azure.ResourceManager.OperationTemplates.ExportRequest","azure.resourcemanager.operationtemplates.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","azure.resourcemanager.operationtemplates.models.OrderProperties":"Azure.ResourceManager.OperationTemplates.OrderProperties","azure.resourcemanager.operationtemplates.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","azure.resourcemanager.operationtemplates.models.ProductProperties":"Azure.ResourceManager.OperationTemplates.ProductProperties","azure.resourcemanager.operationtemplates.models.WidgetProperties":"Azure.ResourceManager.OperationTemplates.WidgetProperties"},"generatedFiles":["src/main/java/azure/resourcemanager/operationtemplates/OperationTemplatesManager.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/CheckNameAvailabilitiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroPagingsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/LroesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationTemplatesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OperationsClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/OptionalBodiesClient.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ActionResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ChangeAllowanceResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/CheckNameAvailabilityResponseInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ExportResultInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OperationInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/OrderInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/ProductInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/WidgetInner.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/fluent/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ActionResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ChangeAllowanceResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilitiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/CheckNameAvailabilityResponseImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ExportResultImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroPagingsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/LroesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientBuilder.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationTemplatesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OperationsImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesClientImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OptionalBodiesImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/OrderImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ProductImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/ResourceManagerUtils.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/WidgetImpl.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/OperationListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/models/ProductListResult.java","src/main/java/azure/resourcemanager/operationtemplates/implementation/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/ActionType.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ChangeAllowanceResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilities.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityReason.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/CheckNameAvailabilityResponse.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportRequest.java","src/main/java/azure/resourcemanager/operationtemplates/models/ExportResult.java","src/main/java/azure/resourcemanager/operationtemplates/models/LroPagings.java","src/main/java/azure/resourcemanager/operationtemplates/models/Lroes.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operation.java","src/main/java/azure/resourcemanager/operationtemplates/models/OperationDisplay.java","src/main/java/azure/resourcemanager/operationtemplates/models/Operations.java","src/main/java/azure/resourcemanager/operationtemplates/models/OptionalBodies.java","src/main/java/azure/resourcemanager/operationtemplates/models/Order.java","src/main/java/azure/resourcemanager/operationtemplates/models/OrderProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Origin.java","src/main/java/azure/resourcemanager/operationtemplates/models/Product.java","src/main/java/azure/resourcemanager/operationtemplates/models/ProductProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/Widget.java","src/main/java/azure/resourcemanager/operationtemplates/models/WidgetProperties.java","src/main/java/azure/resourcemanager/operationtemplates/models/package-info.java","src/main/java/azure/resourcemanager/operationtemplates/package-info.java","src/main/java/module-info.java"]} \ No newline at end of file From c5589552e9871eb5bc1f0c6c4c3537fd5e7fb09a Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 16:13:52 +0800 Subject: [PATCH 09/11] test --- .../armstreamstyleserialization/PagedModelPackageTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java index 2be886de28d..acc5506f354 100644 --- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java @@ -9,6 +9,7 @@ import tsptest.armstreamstyleserialization.implementation.models.ListResult; import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.ListResult3; public class PagedModelPackageTests { @@ -20,6 +21,9 @@ public void testPagedModelPackage() { // ListResult2 not in implementation, because its child ListResultSummary2(Inner) is PUBLIC Assertions.assertFalse(isInImplementationModels(ListResult2.class)); Assertions.assertFalse(isInImplementationModels(ListResultSummary2Inner.class)); + + // ListResult3 not in implementation, because we add `@access(Access.public)` to the model + Assertions.assertFalse(isInImplementationModels(ListResult3.class)); } private static boolean isInImplementationModels(Class clazz) { From 73eff0d0589a86e029dad58a9ddd489da5dccd0a Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Wed, 25 Mar 2026 16:16:51 +0800 Subject: [PATCH 10/11] changelog --- ...p-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md | 7 +++++++ ...p-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 .chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md create mode 100644 .chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md diff --git a/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md new file mode 100644 index 00000000000..f341bf07409 --- /dev/null +++ b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-24-16-23-15.md @@ -0,0 +1,7 @@ +--- +changeKind: dependencies +packages: + - "@typespec/http-client-java" +--- + +Update Node dependencies \ No newline at end of file diff --git a/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md new file mode 100644 index 00000000000..9ba257825cc --- /dev/null +++ b/.chronus/changes/http-client-java_bug-fix-paged-model-2026-2-25-16-16-24.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +access=public should override Paged \ No newline at end of file From efe0e892fae61ca5cea2f2588678926bfe3c519c Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 26 Mar 2026 10:09:57 +0800 Subject: [PATCH 11/11] update node.js and regen --- .../package.json | 8 +- .../pageable/PageableClientBuilder.java | 13 + ...nPaginationAlternateInitialVerbClient.java | 68 + .../implementation/PageableClientImpl.java | 15 + ...enPaginationAlternateInitialVerbsImpl.java | 265 +++ .../alternateinitialverb/Filter.java | 79 + .../implementation/PostResponse.java | 104 ++ .../implementation/package-info.java | 5 + .../alternateinitialverb/package-info.java | 5 + .../src/main/java/payload/xml/Author.java | 101 ++ .../src/main/java/payload/xml/Book.java | 101 ++ .../payload/xml/ModelWithArrayOfModel.java | 2 +- .../xml/ModelWithArrayOfModelValueClient.java | 4 +- .../java/payload/xml/ModelWithAttributes.java | 2 +- .../xml/ModelWithAttributesValueClient.java | 4 +- .../java/payload/xml/ModelWithNamespace.java | 126 ++ .../xml/ModelWithNamespaceOnProperties.java | 156 ++ ...lWithNamespaceOnPropertiesValueClient.java | 97 ++ .../xml/ModelWithNamespaceValueClient.java | 95 ++ .../payload/xml/ModelWithNestedModel.java | 102 ++ .../xml/ModelWithNestedModelValueClient.java | 95 ++ .../payload/xml/ModelWithRenamedArrays.java | 3 +- .../ModelWithRenamedArraysValueClient.java | 4 +- .../xml/ModelWithRenamedAttribute.java | 145 ++ .../ModelWithRenamedAttributeValueClient.java | 96 ++ .../payload/xml/ModelWithRenamedFields.java | 2 +- .../ModelWithRenamedFieldsValueClient.java | 5 +- .../xml/ModelWithRenamedNestedModel.java | 103 ++ ...odelWithRenamedNestedModelValueClient.java | 96 ++ .../payload/xml/ModelWithRenamedProperty.java | 125 ++ .../ModelWithRenamedPropertyValueClient.java | 96 ++ .../ModelWithRenamedUnwrappedModelArray.java | 114 ++ ...RenamedUnwrappedModelArrayValueClient.java | 96 ++ ...elWithRenamedWrappedAndItemModelArray.java | 124 ++ ...edWrappedAndItemModelArrayValueClient.java | 99 ++ .../ModelWithRenamedWrappedModelArray.java | 123 ++ ...thRenamedWrappedModelArrayValueClient.java | 96 ++ .../payload/xml/ModelWithSimpleArrays.java | 2 +- .../xml/ModelWithSimpleArraysValueClient.java | 4 +- .../main/java/payload/xml/ModelWithText.java | 2 +- .../payload/xml/ModelWithTextValueClient.java | 4 +- .../payload/xml/ModelWithUnwrappedArray.java | 2 +- .../ModelWithUnwrappedArrayValueClient.java | 4 +- .../xml/ModelWithUnwrappedModelArray.java | 112 ++ ...delWithUnwrappedModelArrayValueClient.java | 96 ++ ...elWithWrappedPrimitiveCustomItemNames.java | 124 ++ ...edPrimitiveCustomItemNamesValueClient.java | 99 ++ .../main/java/payload/xml/SimpleModel.java | 2 +- .../payload/xml/SimpleModelValueClient.java | 4 +- .../java/payload/xml/XmlClientBuilder.java | 203 ++- .../java/payload/xml/XmlErrorValueClient.java | 4 +- .../ModelWithArrayOfModelValuesImpl.java | 2 +- .../ModelWithAttributesValuesImpl.java | 2 +- ...elWithNamespaceOnPropertiesValuesImpl.java | 124 ++ .../ModelWithNamespaceValuesImpl.java | 121 ++ .../ModelWithNestedModelValuesImpl.java | 121 ++ .../ModelWithRenamedArraysValuesImpl.java | 2 +- .../ModelWithRenamedAttributeValuesImpl.java | 121 ++ .../ModelWithRenamedFieldsValuesImpl.java | 3 +- ...ModelWithRenamedNestedModelValuesImpl.java | 122 ++ .../ModelWithRenamedPropertyValuesImpl.java | 121 ++ ...hRenamedUnwrappedModelArrayValuesImpl.java | 123 ++ ...medWrappedAndItemModelArrayValuesImpl.java | 126 ++ ...ithRenamedWrappedModelArrayValuesImpl.java | 123 ++ .../ModelWithSimpleArraysValuesImpl.java | 2 +- .../ModelWithTextValuesImpl.java | 2 +- .../ModelWithUnwrappedArrayValuesImpl.java | 2 +- ...odelWithUnwrappedModelArrayValuesImpl.java | 122 ++ ...pedPrimitiveCustomItemNamesValuesImpl.java | 126 ++ .../implementation/SimpleModelValuesImpl.java | 2 +- .../xml/implementation/XmlClientImpl.java | 249 ++- .../implementation/XmlErrorValuesImpl.java | 2 +- .../META-INF/payload-pageable_metadata.json | 2 +- .../META-INF/payload-xml_metadata.json | 2 +- .../http-client-generator-test/package.json | 8 +- packages/http-client-java/package-lock.json | 1435 +++++++---------- packages/http-client-java/package.json | 18 +- 77 files changed, 5552 insertions(+), 967 deletions(-) create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java create mode 100644 packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java 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 ad2270cfb06..dc53f5f90e1 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 @@ -14,7 +14,7 @@ "dependencies": { "@typespec/spector": "0.1.0-alpha.24", "@typespec/spec-api": "0.1.0-alpha.13", - "@typespec/http-specs": "0.1.0-alpha.34", + "@typespec/http-specs": "0.1.0-alpha.35", "@typespec/json-schema": "1.10.0", "@typespec/http-client-java": "file:../../typespec-http-client-java-0.7.0.tgz", "@typespec/http-client-java-tests": "file:" @@ -29,10 +29,10 @@ "@typespec/events": "0.80.0", "@typespec/sse": "0.80.0", "@typespec/streams": "0.80.0", - "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-azure-core": "0.66.1", + "@azure-tools/typespec-client-generator-core": "0.66.4", "@azure-tools/typespec-azure-resource-manager": "0.66.0", - "@azure-tools/typespec-autorest": "0.66.0" + "@azure-tools/typespec-autorest": "0.66.1" }, "private": true } diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java index ef831f93d4e..5685b81069d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/PageableClientBuilder.java @@ -34,6 +34,7 @@ @ServiceClientBuilder( serviceClients = { ServerDrivenPaginationClient.class, + ServerDrivenPaginationAlternateInitialVerbClient.class, ServerDrivenPaginationContinuationTokenClient.class, PageSizeClient.class, XmlPaginationClient.class }) @@ -239,6 +240,18 @@ public ServerDrivenPaginationClient buildServerDrivenPaginationClient() { innerClient.getInstrumentation()); } + /** + * Builds an instance of ServerDrivenPaginationAlternateInitialVerbClient class. + * + * @return an instance of ServerDrivenPaginationAlternateInitialVerbClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ServerDrivenPaginationAlternateInitialVerbClient buildServerDrivenPaginationAlternateInitialVerbClient() { + PageableClientImpl innerClient = buildInnerClient(); + return new ServerDrivenPaginationAlternateInitialVerbClient( + innerClient.getServerDrivenPaginationAlternateInitialVerbs(), innerClient.getInstrumentation()); + } + /** * Builds an instance of ServerDrivenPaginationContinuationTokenClient class. * diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java new file mode 100644 index 00000000000..bd88c989471 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java @@ -0,0 +1,68 @@ +package payload.pageable; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.pageable.implementation.ServerDrivenPaginationAlternateInitialVerbsImpl; +import payload.pageable.serverdrivenpagination.alternateinitialverb.Filter; + +/** + * Initializes a new instance of the synchronous PageableClient type. + */ +@ServiceClient(builder = PageableClientBuilder.class) +public final class ServerDrivenPaginationAlternateInitialVerbClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ServerDrivenPaginationAlternateInitialVerbsImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ServerDrivenPaginationAlternateInitialVerbClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ServerDrivenPaginationAlternateInitialVerbClient(ServerDrivenPaginationAlternateInitialVerbsImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body) { + return post(body, RequestContext.none()); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body, RequestContext requestContext) { + return this.serviceClient.post(body, requestContext); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java index 8fbf04923c5..5daf053a968 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/PageableClientImpl.java @@ -63,6 +63,20 @@ public ServerDrivenPaginationsImpl getServerDrivenPaginations() { return this.serverDrivenPaginations; } + /** + * The ServerDrivenPaginationAlternateInitialVerbsImpl object to access its operations. + */ + private final ServerDrivenPaginationAlternateInitialVerbsImpl serverDrivenPaginationAlternateInitialVerbs; + + /** + * Gets the ServerDrivenPaginationAlternateInitialVerbsImpl object to access its operations. + * + * @return the ServerDrivenPaginationAlternateInitialVerbsImpl object. + */ + public ServerDrivenPaginationAlternateInitialVerbsImpl getServerDrivenPaginationAlternateInitialVerbs() { + return this.serverDrivenPaginationAlternateInitialVerbs; + } + /** * The ServerDrivenPaginationContinuationTokensImpl object to access its operations. */ @@ -117,6 +131,7 @@ public PageableClientImpl(HttpPipeline httpPipeline, Instrumentation instrumenta this.instrumentation = instrumentation; this.endpoint = endpoint; this.serverDrivenPaginations = new ServerDrivenPaginationsImpl(this); + this.serverDrivenPaginationAlternateInitialVerbs = new ServerDrivenPaginationAlternateInitialVerbsImpl(this); this.serverDrivenPaginationContinuationTokens = new ServerDrivenPaginationContinuationTokensImpl(this); this.pageSizes = new PageSizesImpl(this); this.xmlPaginations = new XmlPaginationsImpl(this); diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java new file mode 100644 index 00000000000..6b712ffdde3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java @@ -0,0 +1,265 @@ +package payload.pageable.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.PathParam; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.paging.PagedIterable; +import io.clientcore.core.http.paging.PagedResponse; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import io.clientcore.core.instrumentation.logging.ClientLogger; +import java.lang.reflect.InvocationTargetException; +import payload.pageable.Pet; +import payload.pageable.serverdrivenpagination.alternateinitialverb.Filter; +import payload.pageable.serverdrivenpagination.alternateinitialverb.implementation.PostResponse; + +/** + * An instance of this class provides access to all the operations defined in + * ServerDrivenPaginationAlternateInitialVerbs. + */ +public final class ServerDrivenPaginationAlternateInitialVerbsImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ServerDrivenPaginationAlternateInitialVerbsService service; + + /** + * The service client containing this operation class. + */ + private final PageableClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ServerDrivenPaginationAlternateInitialVerbsImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ServerDrivenPaginationAlternateInitialVerbsImpl(PageableClientImpl client) { + this.service = ServerDrivenPaginationAlternateInitialVerbsService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for PageableClientServerDrivenPaginationAlternateInitialVerbs to be used + * by the proxy service to perform REST calls. + */ + @ServiceInterface(name = "PageableClientServerDrivenPaginationAlternateInitialVerbs", host = "{endpoint}") + public interface ServerDrivenPaginationAlternateInitialVerbsService { + static ServerDrivenPaginationAlternateInitialVerbsService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.pageable.implementation.ServerDrivenPaginationAlternateInitialVerbsServiceImpl"); + return (ServerDrivenPaginationAlternateInitialVerbsService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.POST, + path = "/payload/pageable/server-driven-pagination/link/initial-post", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response post(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + @BodyParam("application/json") Filter body, RequestContext requestContext); + + @HttpRequestInformation(method = HttpMethod.GET, path = "{nextLink}", expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response postNext(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postSinglePage(Filter body) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", RequestContext.none(), + updatedContext -> { + final String accept = "application/json"; + Response res = service.post(this.client.getEndpoint(), accept, body, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postSinglePage(Filter body, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", requestContext, updatedContext -> { + final String accept = "application/json"; + Response res = service.post(this.client.getEndpoint(), accept, body, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body) { + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getContinuationToken() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "continuationToken") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + return postSinglePage(body); + }, (pagingOptions, nextLink) -> postNextSinglePage(nextLink)); + } + + /** + * The post operation. + * + * @param body The body parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the paginated response with {@link PagedIterable}. + */ + @ServiceMethod(returns = ReturnType.COLLECTION) + public PagedIterable post(Filter body, RequestContext requestContext) { + RequestContext requestContextForNextPage = requestContext != null ? requestContext : RequestContext.none(); + return new PagedIterable<>((pagingOptions) -> { + if (pagingOptions.getOffset() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "offset") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageSize() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageSize") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getPageIndex() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "pageIndex") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + if (pagingOptions.getContinuationToken() != null) { + throw LOGGER.throwableAtError() + .addKeyValue("propertyName", "continuationToken") + .addKeyValue("methodName", "post") + .log("Not a supported paging option in this API", IllegalArgumentException::new); + } + return postSinglePage(body, requestContext); + }, (pagingOptions, nextLink) -> postNextSinglePage(nextLink, requestContextForNextPage)); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postNextSinglePage(String nextLink) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", RequestContext.none(), + updatedContext -> { + final String accept = "application/json"; + Response res + = service.postNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + /** + * Get the next page of items. + * + * @param nextLink The URL to get the next list of items. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the response body along with {@link PagedResponse}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public PagedResponse postNextSinglePage(String nextLink, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post", requestContext, updatedContext -> { + final String accept = "application/json"; + Response res + = service.postNext(nextLink, this.client.getEndpoint(), accept, updatedContext); + return new PagedResponse<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), + res.getValue().getPets(), null, res.getValue().getNext() != null ? res.getValue().getNext() : null, + null, null, null); + }); + } + + private static final ClientLogger LOGGER = new ClientLogger(ServerDrivenPaginationAlternateInitialVerbsImpl.class); +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java new file mode 100644 index 00000000000..968e10461af --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java @@ -0,0 +1,79 @@ +package payload.pageable.serverdrivenpagination.alternateinitialverb; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; + +/** + * The Filter model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Filter implements JsonSerializable { + /* + * The filter property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String filter; + + /** + * Creates an instance of Filter class. + * + * @param filter the filter value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Filter(String filter) { + this.filter = filter; + } + + /** + * Get the filter property: The filter property. + * + * @return the filter value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getFilter() { + return this.filter; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeStringField("filter", this.filter); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of Filter from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of Filter if the JsonReader was pointing to an instance of it, or null if it was pointing to + * JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the Filter. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Filter fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + String filter = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("filter".equals(fieldName)) { + filter = reader.getString(); + } else { + reader.skipChildren(); + } + } + return new Filter(filter); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java new file mode 100644 index 00000000000..bd2013d7d53 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java @@ -0,0 +1,104 @@ +package payload.pageable.serverdrivenpagination.alternateinitialverb.implementation; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.json.JsonReader; +import io.clientcore.core.serialization.json.JsonSerializable; +import io.clientcore.core.serialization.json.JsonToken; +import io.clientcore.core.serialization.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import payload.pageable.Pet; + +/** + * The PostResponse model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class PostResponse implements JsonSerializable { + /* + * The pets property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List pets; + + /* + * The next property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private String next; + + /** + * Creates an instance of PostResponse class. + * + * @param pets the pets value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private PostResponse(List pets) { + this.pets = pets; + } + + /** + * Get the pets property: The pets property. + * + * @return the pets value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getPets() { + return this.pets; + } + + /** + * Get the next property: The next property. + * + * @return the next value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getNext() { + return this.next; + } + + /** + * {@inheritDoc} + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("pets", this.pets, (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("next", this.next); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of PostResponse from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of PostResponse if the JsonReader was pointing to an instance of it, or null if it was + * pointing to JSON null. + * @throws IllegalStateException If the deserialized JSON object was missing any required properties. + * @throws IOException If an error occurs while reading the PostResponse. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static PostResponse fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + List pets = null; + String next = null; + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("pets".equals(fieldName)) { + pets = reader.readArray(reader1 -> Pet.fromJson(reader1)); + } else if ("next".equals(fieldName)) { + next = reader.getString(); + } else { + reader.skipChildren(); + } + } + PostResponse deserializedPostResponse = new PostResponse(pets); + deserializedPostResponse.next = next; + + return deserializedPostResponse; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java new file mode 100644 index 00000000000..f3483f4acde --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the data models for Pageable. + * Test for pageable payload. + */ +package payload.pageable.serverdrivenpagination.alternateinitialverb.implementation; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java new file mode 100644 index 00000000000..e18e01d730d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java @@ -0,0 +1,5 @@ +/** + * Package containing the data models for Pageable. + * Test for pageable payload. + */ +package payload.pageable.serverdrivenpagination.alternateinitialverb; diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java new file mode 100644 index 00000000000..2abf05a5e9d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Author.java @@ -0,0 +1,101 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Author model with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Author implements XmlSerializable { + /* + * The name property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String name; + + /** + * Creates an instance of Author class. + * + * @param name the name value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Author(String name) { + this.name = name; + } + + /** + * Get the name property: The name property. + * + * @return the name value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getName() { + return this.name; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "XmlAuthor" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("name", this.name); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of Author from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of Author if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Author. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Author fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of Author from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of Author if the XmlReader was pointing to an instance of it, or null if it was pointing to + * XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Author. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Author fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "XmlAuthor" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String name = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("name".equals(elementName.getLocalPart())) { + name = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new Author(name); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java new file mode 100644 index 00000000000..b6a1b07592d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/Book.java @@ -0,0 +1,101 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * Book model with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class Book implements XmlSerializable { + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /** + * Creates an instance of Book class. + * + * @param title the title value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Book(String title) { + this.title = title; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "XmlBook" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("title", this.title); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of Book from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of Book if the XmlReader was pointing to an instance of it, or null if it was pointing to XML + * null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Book. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Book fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of Book from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of Book if the XmlReader was pointing to an instance of it, or null if it was pointing to XML + * null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the Book. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static Book fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "XmlBook" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new Book(title); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java index 9a7272bf216..c47976a3e00 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModel.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains an array of models. + * §4.1 — Contains an array of models. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithArrayOfModel implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java index ceed78c57ef..50e8096cf0d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithArrayOfModelValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models along with {@link Response}. + * @return §4.1 — Contains an array of models along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestCon * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models. + * @return §4.1 — Contains an array of models. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java index c584856a910..3dc261eb287 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributes.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields that are XML attributes. + * §5.1 — Contains fields that are XML attributes. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithAttributes implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java index 55f0f798d96..211384df9f0 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithAttributesValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithAttributesValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes along with {@link Response}. + * @return §5.1 — Contains fields that are XML attributes along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestConte * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes. + * @return §5.1 — Contains fields that are XML attributes. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java new file mode 100644 index 00000000000..6cd2cb14061 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespace.java @@ -0,0 +1,126 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §6.1, §7.1 — Contains fields with XML namespace on the model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNamespace implements XmlSerializable { + private static final String EXAMPLE_COM__SCHEMA = "http://example.com/schema"; + + /* + * The id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /** + * Creates an instance of ModelWithNamespace class. + * + * @param id the id value to set. + * @param title the title value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespace(int id, String title) { + this.id = id; + this.title = title; + } + + /** + * Get the id property: The id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespace" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeNamespace(EXAMPLE_COM__SCHEMA); + xmlWriter.writeIntElement("id", this.id); + xmlWriter.writeStringElement("title", this.title); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNamespace from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNamespace if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespace. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespace fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNamespace from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNamespace if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespace. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespace fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespace" : rootElementName; + return xmlReader.readObject(EXAMPLE_COM__SCHEMA, finalRootElementName, reader -> { + int id = 0; + String title = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("id".equals(elementName.getLocalPart())) { + id = reader.getIntElement(); + } else if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithNamespace(id, title); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java new file mode 100644 index 00000000000..a463536c8a8 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnProperties.java @@ -0,0 +1,156 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §6.2, §7.2 — Contains fields with different XML namespaces on individual properties. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNamespaceOnProperties implements XmlSerializable { + private static final String EXAMPLE_COM__SCHEMA = "http://example.com/schema"; + + private static final String EXAMPLE_COM__NS2 = "http://example.com/ns2"; + + /* + * The id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithNamespaceOnProperties class. + * + * @param id the id value to set. + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceOnProperties(int id, String title, String author) { + this.id = id; + this.title = title; + this.author = author; + } + + /** + * Get the id property: The id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespaceOnProperties" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeNamespace(EXAMPLE_COM__SCHEMA); + xmlWriter.writeNamespace("smp", EXAMPLE_COM__SCHEMA); + xmlWriter.writeNamespace("ns2", EXAMPLE_COM__NS2); + xmlWriter.writeIntElement("id", this.id); + xmlWriter.writeStringElement(EXAMPLE_COM__SCHEMA, "title", this.title); + xmlWriter.writeStringElement(EXAMPLE_COM__NS2, "author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNamespaceOnProperties from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNamespaceOnProperties if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespaceOnProperties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespaceOnProperties fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNamespaceOnProperties from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNamespaceOnProperties if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNamespaceOnProperties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNamespaceOnProperties fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNamespaceOnProperties" : rootElementName; + return xmlReader.readObject(EXAMPLE_COM__SCHEMA, finalRootElementName, reader -> { + int id = 0; + String title = null; + String author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("id".equals(elementName.getLocalPart())) { + id = reader.getIntElement(); + } else if ("title".equals(elementName.getLocalPart()) + && EXAMPLE_COM__SCHEMA.equals(elementName.getNamespaceURI())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart()) + && EXAMPLE_COM__NS2.equals(elementName.getNamespaceURI())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithNamespaceOnProperties(id, title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java new file mode 100644 index 00000000000..a1406378bef --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java @@ -0,0 +1,97 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNamespaceOnPropertiesValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNamespaceOnPropertiesValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNamespaceOnPropertiesValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceOnPropertiesValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNamespaceOnPropertiesValueClient(ModelWithNamespaceOnPropertiesValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with + * {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNamespaceOnProperties get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespaceOnProperties input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNamespaceOnProperties input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java new file mode 100644 index 00000000000..7252d78891f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNamespaceValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNamespaceValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNamespaceValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNamespaceValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNamespaceValueClient(ModelWithNamespaceValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNamespace get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespace input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNamespace input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java new file mode 100644 index 00000000000..abd318497dd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModel.java @@ -0,0 +1,102 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §2.1 — Contains a property that references another model. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithNestedModel implements XmlSerializable { + /* + * The nested property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final SimpleModel nested; + + /** + * Creates an instance of ModelWithNestedModel class. + * + * @param nested the nested value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNestedModel(SimpleModel nested) { + this.nested = nested; + } + + /** + * Get the nested property: The nested property. + * + * @return the nested value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public SimpleModel getNested() { + return this.nested; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNestedModel" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeXml(this.nested, "nested"); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithNestedModel if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNestedModel fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithNestedModel if the XmlReader was pointing to an instance of it, or null if it was + * pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithNestedModel fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithNestedModel" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + SimpleModel nested = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("nested".equals(elementName.getLocalPart())) { + nested = SimpleModel.fromXml(reader, "nested"); + } else { + reader.skipElement(); + } + } + return new ModelWithNestedModel(nested); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java new file mode 100644 index 00000000000..f1e1387ed15 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithNestedModelValueClient.java @@ -0,0 +1,95 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithNestedModelValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithNestedModelValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithNestedModelValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNestedModelValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithNestedModelValueClient(ModelWithNestedModelValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithNestedModel get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithNestedModel input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java index 89b759092b7..bfb82143e26 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArrays.java @@ -12,7 +12,8 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of wrapped and unwrapped arrays of primitive types that have different XML representations. + * §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * representations. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithRenamedArrays implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java index fccb3ac22d6..cce36a3476b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithRenamedArraysValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @@ -55,7 +55,7 @@ public Response getWithResponse(RequestContext requestCo * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations. */ @Metadata(properties = { MetadataProperties.GENERATED }) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java new file mode 100644 index 00000000000..6454b86dcaa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttribute.java @@ -0,0 +1,145 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §5.2 — Contains a renamed XML attribute. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedAttribute implements XmlSerializable { + /* + * The xml-id property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final int id; + + /* + * The title property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithRenamedAttribute class. + * + * @param id the id value to set. + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedAttribute(int id, String title, String author) { + this.id = id; + this.title = title; + this.author = author; + } + + /** + * Get the id property: The xml-id property. + * + * @return the id value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public int getId() { + return this.id; + } + + /** + * Get the title property: The title property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedAttribute" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeIntAttribute("xml-id", this.id); + xmlWriter.writeStringElement("title", this.title); + xmlWriter.writeStringElement("author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedAttribute from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedAttribute if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedAttribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedAttribute fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedAttribute from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedAttribute if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedAttribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedAttribute fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedAttribute" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + String author = null; + int id = reader.getIntAttribute(null, "xml-id"); + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("title".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedAttribute(id, title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java new file mode 100644 index 00000000000..6ea54457ea9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedAttributeValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedAttributeValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedAttributeValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedAttributeValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedAttributeValueClient(ModelWithRenamedAttributeValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedAttribute get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedAttribute input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedAttribute input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java index f2060abcd17..9d2ed599206 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFields.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of the same type that have different XML representation. + * §1.3, §2.3 — Contains fields of the same type that have different XML representation. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithRenamedFields implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java index 33e7e3d1b47..f4d5e7de357 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java @@ -40,7 +40,8 @@ public final class ModelWithRenamedFieldsValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation along with {@link Response}. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with + * {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +55,7 @@ public Response getWithResponse(RequestContext requestCo * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java new file mode 100644 index 00000000000..5358504684b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModel.java @@ -0,0 +1,103 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §2.2 — Contains a property whose type has. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedNestedModel implements XmlSerializable { + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final Author author; + + /** + * Creates an instance of ModelWithRenamedNestedModel class. + * + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedNestedModel(Author author) { + this.author = author; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public Author getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedNestedModel" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeXml(this.author, "author"); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedNestedModel if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedNestedModel fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedNestedModel from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedNestedModel if the XmlReader was pointing to an instance of it, or null if + * it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedNestedModel. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedNestedModel fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedNestedModel" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + Author author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("author".equals(elementName.getLocalPart())) { + author = Author.fromXml(reader, "author"); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedNestedModel(author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java new file mode 100644 index 00000000000..7919e9ba426 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedNestedModelValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedNestedModelValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedNestedModelValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedNestedModelValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedNestedModelValueClient(ModelWithRenamedNestedModelValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedNestedModel get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedNestedModel input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java new file mode 100644 index 00000000000..de93892e28e --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedProperty.java @@ -0,0 +1,125 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §1.2 — Contains a scalar property with a custom XML name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedProperty implements XmlSerializable { + /* + * The renamedTitle property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String title; + + /* + * The author property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final String author; + + /** + * Creates an instance of ModelWithRenamedProperty class. + * + * @param title the title value to set. + * @param author the author value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedProperty(String title, String author) { + this.title = title; + this.author = author; + } + + /** + * Get the title property: The renamedTitle property. + * + * @return the title value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getTitle() { + return this.title; + } + + /** + * Get the author property: The author property. + * + * @return the author value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public String getAuthor() { + return this.author; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedProperty" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + xmlWriter.writeStringElement("renamedTitle", this.title); + xmlWriter.writeStringElement("author", this.author); + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedProperty from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedProperty if the XmlReader was pointing to an instance of it, or null if it + * was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedProperty fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedProperty from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedProperty if the XmlReader was pointing to an instance of it, or null if it + * was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedProperty. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedProperty fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithRenamedProperty" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + String title = null; + String author = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("renamedTitle".equals(elementName.getLocalPart())) { + title = reader.getStringElement(); + } else if ("author".equals(elementName.getLocalPart())) { + author = reader.getStringElement(); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedProperty(title, author); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java new file mode 100644 index 00000000000..536ac10f25a --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedPropertyValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedPropertyValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedPropertyValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedPropertyValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedPropertyValueClient(ModelWithRenamedPropertyValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedProperty get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedProperty input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedProperty input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java new file mode 100644 index 00000000000..f563c908deb --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java @@ -0,0 +1,114 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.4 — Contains an unwrapped array of models with a custom item name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedUnwrappedModelArray implements XmlSerializable { + /* + * The ModelItem property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithRenamedUnwrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedUnwrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The ModelItem property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedUnwrappedModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "ModelItem"); + } + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedUnwrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedUnwrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedUnwrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedUnwrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedUnwrappedModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("ModelItem".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "ModelItem")); + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedUnwrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java new file mode 100644 index 00000000000..9dbb46316fa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedUnwrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedUnwrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedUnwrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedUnwrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedUnwrappedModelArrayValueClient(ModelWithRenamedUnwrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedUnwrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedUnwrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java new file mode 100644 index 00000000000..59d3a6ddedb --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java @@ -0,0 +1,124 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.5 — Contains a wrapped array of models with custom wrapper and item names. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedWrappedAndItemModelArray + implements XmlSerializable { + /* + * The AllBooks property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List books; + + /** + * Creates an instance of ModelWithRenamedWrappedAndItemModelArray class. + * + * @param books the books value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedAndItemModelArray(List books) { + this.books = books; + } + + /** + * Get the books property: The AllBooks property. + * + * @return the books value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getBooks() { + return this.books; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedAndItemModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.books != null) { + xmlWriter.writeStartElement("AllBooks"); + for (Book element : this.books) { + xmlWriter.writeXml(element, "XmlBook"); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedWrappedAndItemModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedWrappedAndItemModelArray if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedAndItemModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedAndItemModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedWrappedAndItemModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedWrappedAndItemModelArray if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedAndItemModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedAndItemModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedAndItemModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List books = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("AllBooks".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("XmlBook".equals(elementName.getLocalPart())) { + if (books == null) { + books = new ArrayList<>(); + } + books.add(Book.fromXml(reader, "XmlBook")); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedWrappedAndItemModelArray(books); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java new file mode 100644 index 00000000000..36ff0eafdbc --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java @@ -0,0 +1,99 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedWrappedAndItemModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedWrappedAndItemModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedWrappedAndItemModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedWrappedAndItemModelArrayValueClient( + ModelWithRenamedWrappedAndItemModelArrayValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedWrappedAndItemModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedWrappedAndItemModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java new file mode 100644 index 00000000000..2ce1cab47f3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java @@ -0,0 +1,123 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.3 — Contains a wrapped array of models with a custom wrapper name. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithRenamedWrappedModelArray implements XmlSerializable { + /* + * The AllItems property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithRenamedWrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The AllItems property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedModelArray" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + xmlWriter.writeStartElement("AllItems"); + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "SimpleModel"); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithRenamedWrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithRenamedWrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithRenamedWrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithRenamedWrappedModelArray if the XmlReader was pointing to an instance of it, or + * null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithRenamedWrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithRenamedWrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithRenamedWrappedModelArray" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("AllItems".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("SimpleModel".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "SimpleModel")); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithRenamedWrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java new file mode 100644 index 00000000000..1c3c92dfd57 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithRenamedWrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithRenamedWrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithRenamedWrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithRenamedWrappedModelArrayValueClient(ModelWithRenamedWrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithRenamedWrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithRenamedWrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java index a3d2b3669d8..cbec66fd52b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArrays.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of arrays of primitive types. + * §3.1 — Contains fields of arrays of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithSimpleArrays implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java index b25f0743b9d..8dcae65d81f 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithSimpleArraysValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types along with {@link Response}. + * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestCon * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types. + * @return §3.1 — Contains fields of arrays of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java index eb280d52f35..3b31c344b70 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithText.java @@ -8,7 +8,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains an attribute and text. + * §8.1 — Contains an attribute and text. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithText implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java index 717763ff547..5b3219ec202 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithTextValueClient.java @@ -40,7 +40,7 @@ public final class ModelWithTextValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text along with {@link Response}. + * @return §8.1 — Contains an attribute and text along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestContext) { * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text. + * @return §8.1 — Contains an attribute and text. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java index d06eceeb6ed..ad440a001b1 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArray.java @@ -12,7 +12,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of wrapped and unwrapped arrays of primitive types. + * §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class ModelWithUnwrappedArray implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java index 8c8a81ca835..1c6d3825c88 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java @@ -41,7 +41,7 @@ public final class ModelWithUnwrappedArrayValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -55,7 +55,7 @@ public Response getWithResponse(RequestContext requestC * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java new file mode 100644 index 00000000000..4481d088563 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArray.java @@ -0,0 +1,112 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §4.2 — Contains an unwrapped array of models. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithUnwrappedModelArray implements XmlSerializable { + /* + * The items property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List items; + + /** + * Creates an instance of ModelWithUnwrappedModelArray class. + * + * @param items the items value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithUnwrappedModelArray(List items) { + this.items = items; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getItems() { + return this.items; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithUnwrappedModelArray" : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.items != null) { + for (SimpleModel element : this.items) { + xmlWriter.writeXml(element, "items"); + } + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithUnwrappedModelArray if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithUnwrappedModelArray fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithUnwrappedModelArray from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithUnwrappedModelArray if the XmlReader was pointing to an instance of it, or null + * if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithUnwrappedModelArray. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithUnwrappedModelArray fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName + = rootElementName == null || rootElementName.isEmpty() ? "ModelWithUnwrappedModelArray" : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List items = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("items".equals(elementName.getLocalPart())) { + if (items == null) { + items = new ArrayList<>(); + } + items.add(SimpleModel.fromXml(reader, "items")); + } else { + reader.skipElement(); + } + } + return new ModelWithUnwrappedModelArray(items); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java new file mode 100644 index 00000000000..01a719743dd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java @@ -0,0 +1,96 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithUnwrappedModelArrayValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithUnwrappedModelArrayValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithUnwrappedModelArrayValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithUnwrappedModelArrayValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithUnwrappedModelArrayValueClient(ModelWithUnwrappedModelArrayValuesImpl serviceClient, + Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.get", + requestContext, updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithUnwrappedModelArray get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.put", + requestContext, updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithUnwrappedModelArray input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java new file mode 100644 index 00000000000..a2518d4b629 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java @@ -0,0 +1,124 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.serialization.xml.XmlReader; +import io.clientcore.core.serialization.xml.XmlSerializable; +import io.clientcore.core.serialization.xml.XmlToken; +import io.clientcore.core.serialization.xml.XmlWriter; +import java.util.ArrayList; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +/** + * §3.5 — Contains a wrapped primitive array with custom wrapper and item names. + */ +@Metadata(properties = { MetadataProperties.IMMUTABLE }) +public final class ModelWithWrappedPrimitiveCustomItemNames + implements XmlSerializable { + /* + * The ItemsTags property. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + private final List tags; + + /** + * Creates an instance of ModelWithWrappedPrimitiveCustomItemNames class. + * + * @param tags the tags value to set. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithWrappedPrimitiveCustomItemNames(List tags) { + this.tags = tags; + } + + /** + * Get the tags property: The ItemsTags property. + * + * @return the tags value. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public List getTags() { + return this.tags; + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException { + return toXml(xmlWriter, null); + } + + @Metadata(properties = { MetadataProperties.GENERATED }) + @Override + public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException { + rootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithWrappedPrimitiveCustomItemNames" + : rootElementName; + xmlWriter.writeStartElement(rootElementName); + if (this.tags != null) { + xmlWriter.writeStartElement("ItemsTags"); + for (String element : this.tags) { + xmlWriter.writeStringElement("string", element); + } + xmlWriter.writeEndElement(); + } + return xmlWriter.writeEndElement(); + } + + /** + * Reads an instance of ModelWithWrappedPrimitiveCustomItemNames from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @return An instance of ModelWithWrappedPrimitiveCustomItemNames if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithWrappedPrimitiveCustomItemNames. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithWrappedPrimitiveCustomItemNames fromXml(XmlReader xmlReader) throws XMLStreamException { + return fromXml(xmlReader, null); + } + + /** + * Reads an instance of ModelWithWrappedPrimitiveCustomItemNames from the XmlReader. + * + * @param xmlReader The XmlReader being read. + * @param rootElementName Optional root element name to override the default defined by the model. Used to support + * cases where the model can deserialize from different root element names. + * @return An instance of ModelWithWrappedPrimitiveCustomItemNames if the XmlReader was pointing to an instance of + * it, or null if it was pointing to XML null. + * @throws IllegalStateException If the deserialized XML object was missing any required properties. + * @throws XMLStreamException If an error occurs while reading the ModelWithWrappedPrimitiveCustomItemNames. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public static ModelWithWrappedPrimitiveCustomItemNames fromXml(XmlReader xmlReader, String rootElementName) + throws XMLStreamException { + String finalRootElementName = rootElementName == null || rootElementName.isEmpty() + ? "ModelWithWrappedPrimitiveCustomItemNames" + : rootElementName; + return xmlReader.readObject(finalRootElementName, reader -> { + List tags = null; + while (reader.nextElement() != XmlToken.END_ELEMENT) { + QName elementName = reader.getElementName(); + + if ("ItemsTags".equals(elementName.getLocalPart())) { + while (reader.nextElement() != XmlToken.END_ELEMENT) { + elementName = reader.getElementName(); + if ("string".equals(elementName.getLocalPart())) { + if (tags == null) { + tags = new ArrayList<>(); + } + tags.add(reader.getStringElement()); + } else { + reader.skipElement(); + } + } + } else { + reader.skipElement(); + } + } + return new ModelWithWrappedPrimitiveCustomItemNames(tags); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java new file mode 100644 index 00000000000..f0317b4b75f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java @@ -0,0 +1,99 @@ +package payload.xml; + +import io.clientcore.core.annotations.Metadata; +import io.clientcore.core.annotations.MetadataProperties; +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceClient; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.instrumentation.Instrumentation; +import payload.xml.implementation.ModelWithWrappedPrimitiveCustomItemNamesValuesImpl; + +/** + * Initializes a new instance of the synchronous XmlClient type. + */ +@ServiceClient(builder = XmlClientBuilder.class) +public final class ModelWithWrappedPrimitiveCustomItemNamesValueClient { + @Metadata(properties = { MetadataProperties.GENERATED }) + private final ModelWithWrappedPrimitiveCustomItemNamesValuesImpl serviceClient; + + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient class. + * + * @param serviceClient the service client implementation. + * @param instrumentation the instrumentation instance. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + ModelWithWrappedPrimitiveCustomItemNamesValueClient( + ModelWithWrappedPrimitiveCustomItemNamesValuesImpl serviceClient, Instrumentation instrumentation) { + this.serviceClient = serviceClient; + this.instrumentation = instrumentation; + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get", requestContext, + updatedContext -> this.serviceClient.getWithResponse(updatedContext)); + } + + /** + * The get operation. + * + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public ModelWithWrappedPrimitiveCustomItemNames get() { + return getWithResponse(RequestContext.none()).getValue(); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put", requestContext, + updatedContext -> this.serviceClient.putWithResponse(input, updatedContext)); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + @ServiceMethod(returns = ReturnType.SINGLE) + public void put(ModelWithWrappedPrimitiveCustomItemNames input) { + putWithResponse(input, RequestContext.none()); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java index 81402ee227d..743885da2f6 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModel.java @@ -10,7 +10,7 @@ import javax.xml.stream.XMLStreamException; /** - * Contains fields of primitive types. + * §1.1 — Contains fields of primitive types. */ @Metadata(properties = { MetadataProperties.IMMUTABLE }) public final class SimpleModel implements XmlSerializable { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java index 58548f34b11..14194ac8a3d 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/SimpleModelValueClient.java @@ -40,7 +40,7 @@ public final class SimpleModelValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestContext) { * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types. + * @return §1.1 — Contains fields of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java index b7b5e0d08fb..859fd9979dc 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlClientBuilder.java @@ -34,15 +34,26 @@ @ServiceClientBuilder( serviceClients = { SimpleModelValueClient.class, + ModelWithRenamedPropertyValueClient.class, + ModelWithRenamedFieldsValueClient.class, + ModelWithNestedModelValueClient.class, + ModelWithRenamedNestedModelValueClient.class, ModelWithSimpleArraysValueClient.class, - ModelWithArrayOfModelValueClient.class, - ModelWithOptionalFieldValueClient.class, - ModelWithAttributesValueClient.class, ModelWithUnwrappedArrayValueClient.class, ModelWithRenamedArraysValueClient.class, - ModelWithRenamedFieldsValueClient.class, - ModelWithEmptyArrayValueClient.class, + ModelWithWrappedPrimitiveCustomItemNamesValueClient.class, + ModelWithArrayOfModelValueClient.class, + ModelWithUnwrappedModelArrayValueClient.class, + ModelWithRenamedWrappedModelArrayValueClient.class, + ModelWithRenamedUnwrappedModelArrayValueClient.class, + ModelWithRenamedWrappedAndItemModelArrayValueClient.class, + ModelWithAttributesValueClient.class, + ModelWithRenamedAttributeValueClient.class, + ModelWithNamespaceValueClient.class, + ModelWithNamespaceOnPropertiesValueClient.class, ModelWithTextValueClient.class, + ModelWithOptionalFieldValueClient.class, + ModelWithEmptyArrayValueClient.class, ModelWithDictionaryValueClient.class, ModelWithEncodedNamesValueClient.class, ModelWithEnumValueClient.class, @@ -250,50 +261,62 @@ public SimpleModelValueClient buildSimpleModelValueClient() { } /** - * Builds an instance of ModelWithSimpleArraysValueClient class. + * Builds an instance of ModelWithRenamedPropertyValueClient class. * - * @return an instance of ModelWithSimpleArraysValueClient. + * @return an instance of ModelWithRenamedPropertyValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithSimpleArraysValueClient buildModelWithSimpleArraysValueClient() { + public ModelWithRenamedPropertyValueClient buildModelWithRenamedPropertyValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithSimpleArraysValueClient(innerClient.getModelWithSimpleArraysValues(), + return new ModelWithRenamedPropertyValueClient(innerClient.getModelWithRenamedPropertyValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithArrayOfModelValueClient class. + * Builds an instance of ModelWithRenamedFieldsValueClient class. * - * @return an instance of ModelWithArrayOfModelValueClient. + * @return an instance of ModelWithRenamedFieldsValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithArrayOfModelValueClient buildModelWithArrayOfModelValueClient() { + public ModelWithRenamedFieldsValueClient buildModelWithRenamedFieldsValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithArrayOfModelValueClient(innerClient.getModelWithArrayOfModelValues(), + return new ModelWithRenamedFieldsValueClient(innerClient.getModelWithRenamedFieldsValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithOptionalFieldValueClient class. + * Builds an instance of ModelWithNestedModelValueClient class. * - * @return an instance of ModelWithOptionalFieldValueClient. + * @return an instance of ModelWithNestedModelValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithOptionalFieldValueClient buildModelWithOptionalFieldValueClient() { + public ModelWithNestedModelValueClient buildModelWithNestedModelValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithOptionalFieldValueClient(innerClient.getModelWithOptionalFieldValues(), + return new ModelWithNestedModelValueClient(innerClient.getModelWithNestedModelValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithAttributesValueClient class. + * Builds an instance of ModelWithRenamedNestedModelValueClient class. * - * @return an instance of ModelWithAttributesValueClient. + * @return an instance of ModelWithRenamedNestedModelValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithAttributesValueClient buildModelWithAttributesValueClient() { + public ModelWithRenamedNestedModelValueClient buildModelWithRenamedNestedModelValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithAttributesValueClient(innerClient.getModelWithAttributesValues(), + return new ModelWithRenamedNestedModelValueClient(innerClient.getModelWithRenamedNestedModelValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithSimpleArraysValueClient class. + * + * @return an instance of ModelWithSimpleArraysValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithSimpleArraysValueClient buildModelWithSimpleArraysValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithSimpleArraysValueClient(innerClient.getModelWithSimpleArraysValues(), innerClient.getInstrumentation()); } @@ -322,26 +345,124 @@ public ModelWithRenamedArraysValueClient buildModelWithRenamedArraysValueClient( } /** - * Builds an instance of ModelWithRenamedFieldsValueClient class. + * Builds an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient class. * - * @return an instance of ModelWithRenamedFieldsValueClient. + * @return an instance of ModelWithWrappedPrimitiveCustomItemNamesValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithRenamedFieldsValueClient buildModelWithRenamedFieldsValueClient() { + public ModelWithWrappedPrimitiveCustomItemNamesValueClient + buildModelWithWrappedPrimitiveCustomItemNamesValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithRenamedFieldsValueClient(innerClient.getModelWithRenamedFieldsValues(), + return new ModelWithWrappedPrimitiveCustomItemNamesValueClient( + innerClient.getModelWithWrappedPrimitiveCustomItemNamesValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithArrayOfModelValueClient class. + * + * @return an instance of ModelWithArrayOfModelValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithArrayOfModelValueClient buildModelWithArrayOfModelValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithArrayOfModelValueClient(innerClient.getModelWithArrayOfModelValues(), innerClient.getInstrumentation()); } /** - * Builds an instance of ModelWithEmptyArrayValueClient class. + * Builds an instance of ModelWithUnwrappedModelArrayValueClient class. * - * @return an instance of ModelWithEmptyArrayValueClient. + * @return an instance of ModelWithUnwrappedModelArrayValueClient. */ @Metadata(properties = { MetadataProperties.GENERATED }) - public ModelWithEmptyArrayValueClient buildModelWithEmptyArrayValueClient() { + public ModelWithUnwrappedModelArrayValueClient buildModelWithUnwrappedModelArrayValueClient() { XmlClientImpl innerClient = buildInnerClient(); - return new ModelWithEmptyArrayValueClient(innerClient.getModelWithEmptyArrayValues(), + return new ModelWithUnwrappedModelArrayValueClient(innerClient.getModelWithUnwrappedModelArrayValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedWrappedModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedWrappedModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedModelArrayValueClient buildModelWithRenamedWrappedModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedWrappedModelArrayValueClient( + innerClient.getModelWithRenamedWrappedModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedUnwrappedModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedUnwrappedModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedUnwrappedModelArrayValueClient buildModelWithRenamedUnwrappedModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedUnwrappedModelArrayValueClient( + innerClient.getModelWithRenamedUnwrappedModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient class. + * + * @return an instance of ModelWithRenamedWrappedAndItemModelArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedWrappedAndItemModelArrayValueClient + buildModelWithRenamedWrappedAndItemModelArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedWrappedAndItemModelArrayValueClient( + innerClient.getModelWithRenamedWrappedAndItemModelArrayValues(), innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithAttributesValueClient class. + * + * @return an instance of ModelWithAttributesValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithAttributesValueClient buildModelWithAttributesValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithAttributesValueClient(innerClient.getModelWithAttributesValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithRenamedAttributeValueClient class. + * + * @return an instance of ModelWithRenamedAttributeValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithRenamedAttributeValueClient buildModelWithRenamedAttributeValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithRenamedAttributeValueClient(innerClient.getModelWithRenamedAttributeValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithNamespaceValueClient class. + * + * @return an instance of ModelWithNamespaceValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceValueClient buildModelWithNamespaceValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithNamespaceValueClient(innerClient.getModelWithNamespaceValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithNamespaceOnPropertiesValueClient class. + * + * @return an instance of ModelWithNamespaceOnPropertiesValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithNamespaceOnPropertiesValueClient buildModelWithNamespaceOnPropertiesValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithNamespaceOnPropertiesValueClient(innerClient.getModelWithNamespaceOnPropertiesValues(), innerClient.getInstrumentation()); } @@ -356,6 +477,30 @@ public ModelWithTextValueClient buildModelWithTextValueClient() { return new ModelWithTextValueClient(innerClient.getModelWithTextValues(), innerClient.getInstrumentation()); } + /** + * Builds an instance of ModelWithOptionalFieldValueClient class. + * + * @return an instance of ModelWithOptionalFieldValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithOptionalFieldValueClient buildModelWithOptionalFieldValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithOptionalFieldValueClient(innerClient.getModelWithOptionalFieldValues(), + innerClient.getInstrumentation()); + } + + /** + * Builds an instance of ModelWithEmptyArrayValueClient class. + * + * @return an instance of ModelWithEmptyArrayValueClient. + */ + @Metadata(properties = { MetadataProperties.GENERATED }) + public ModelWithEmptyArrayValueClient buildModelWithEmptyArrayValueClient() { + XmlClientImpl innerClient = buildInnerClient(); + return new ModelWithEmptyArrayValueClient(innerClient.getModelWithEmptyArrayValues(), + innerClient.getInstrumentation()); + } + /** * Builds an instance of ModelWithDictionaryValueClient class. * diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java index 50b3bbf7e9c..8c26f598105 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/XmlErrorValueClient.java @@ -40,7 +40,7 @@ public final class XmlErrorValueClient { * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) @@ -54,7 +54,7 @@ public Response getWithResponse(RequestContext requestContext) { * * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types. + * @return §1.1 — Contains fields of primitive types. */ @Metadata(properties = { MetadataProperties.GENERATED }) @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java index 87ef41426e2..933e90f228b 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an array of models along with {@link Response}. + * @return §4.1 — Contains an array of models along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java index 2fef01461fc..5a76bf14cfd 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields that are XML attributes along with {@link Response}. + * @return §5.1 — Contains fields that are XML attributes along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java new file mode 100644 index 00000000000..6954b9b693c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java @@ -0,0 +1,124 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNamespaceOnProperties; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNamespaceOnPropertiesValues. + */ +public final class ModelWithNamespaceOnPropertiesValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNamespaceOnPropertiesValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceOnPropertiesValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNamespaceOnPropertiesValuesImpl(XmlClientImpl client) { + this.service = ModelWithNamespaceOnPropertiesValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNamespaceOnPropertiesValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNamespaceOnPropertiesValues", host = "{endpoint}") + public interface ModelWithNamespaceOnPropertiesValuesService { + static ModelWithNamespaceOnPropertiesValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithNamespaceOnPropertiesValuesServiceImpl"); + return (ModelWithNamespaceOnPropertiesValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNamespaceOnProperties", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNamespaceOnProperties", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNamespaceOnProperties input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.2, §7.2 — Contains fields with different XML namespaces on individual properties along with + * {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespaceOnProperties input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceOnPropertiesValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java new file mode 100644 index 00000000000..d92e3a74134 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNamespace; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNamespaceValues. + */ +public final class ModelWithNamespaceValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNamespaceValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNamespaceValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNamespaceValuesImpl(XmlClientImpl client) { + this.service = ModelWithNamespaceValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNamespaceValues to be used by the proxy service to + * perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNamespaceValues", host = "{endpoint}") + public interface ModelWithNamespaceValuesService { + static ModelWithNamespaceValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithNamespaceValuesServiceImpl"); + return (ModelWithNamespaceValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNamespace", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNamespace", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNamespace input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §6.1, §7.1 — Contains fields with XML namespace on the model along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNamespace input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNamespaceValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java new file mode 100644 index 00000000000..d8b0049ab67 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithNestedModel; + +/** + * An instance of this class provides access to all the operations defined in ModelWithNestedModelValues. + */ +public final class ModelWithNestedModelValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithNestedModelValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithNestedModelValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithNestedModelValuesImpl(XmlClientImpl client) { + this.service = ModelWithNestedModelValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithNestedModelValues to be used by the proxy service + * to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithNestedModelValues", host = "{endpoint}") + public interface ModelWithNestedModelValuesService { + static ModelWithNestedModelValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithNestedModelValuesServiceImpl"); + return (ModelWithNestedModelValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithNestedModel", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithNestedModel", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithNestedModel input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.1 — Contains a property that references another model along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.get", requestContext, + updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithNestedModelValue.put", requestContext, + updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java index bbf57985249..1a3d6ebd070 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types that have different XML + * @return §3.3, §3.4 — Contains fields of wrapped and unwrapped arrays of primitive types that have different XML * representations along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java new file mode 100644 index 00000000000..409a8cc4521 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedAttribute; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedAttributeValues. + */ +public final class ModelWithRenamedAttributeValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedAttributeValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedAttributeValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedAttributeValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedAttributeValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedAttributeValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedAttributeValues", host = "{endpoint}") + public interface ModelWithRenamedAttributeValuesService { + static ModelWithRenamedAttributeValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithRenamedAttributeValuesServiceImpl"); + return (ModelWithRenamedAttributeValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedAttribute", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedAttribute", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedAttribute input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §5.2 — Contains a renamed XML attribute along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedAttribute input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedAttributeValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java index 26c6ad661f7..92d4c20b7da 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java @@ -89,7 +89,8 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of the same type that have different XML representation along with {@link Response}. + * @return §1.3, §2.3 — Contains fields of the same type that have different XML representation along with + * {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java new file mode 100644 index 00000000000..d0972aeaf97 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java @@ -0,0 +1,122 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedNestedModel; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedNestedModelValues. + */ +public final class ModelWithRenamedNestedModelValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedNestedModelValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedNestedModelValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedNestedModelValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedNestedModelValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedNestedModelValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedNestedModelValues", host = "{endpoint}") + public interface ModelWithRenamedNestedModelValuesService { + static ModelWithRenamedNestedModelValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedNestedModelValuesServiceImpl"); + return (ModelWithRenamedNestedModelValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedNestedModel", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedNestedModel", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedNestedModel input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §2.2 — Contains a property whose type has along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedNestedModel input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedNestedModelValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java new file mode 100644 index 00000000000..ecb76372770 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java @@ -0,0 +1,121 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedProperty; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedPropertyValues. + */ +public final class ModelWithRenamedPropertyValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedPropertyValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedPropertyValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedPropertyValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedPropertyValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedPropertyValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedPropertyValues", host = "{endpoint}") + public interface ModelWithRenamedPropertyValuesService { + static ModelWithRenamedPropertyValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class.forName("payload.xml.implementation.ModelWithRenamedPropertyValuesServiceImpl"); + return (ModelWithRenamedPropertyValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedProperty", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedProperty", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedProperty input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §1.2 — Contains a scalar property with a custom XML name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedProperty input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedPropertyValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..70b0c0a2dbd --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java @@ -0,0 +1,123 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedUnwrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedUnwrappedModelArrayValues. + */ +public final class ModelWithRenamedUnwrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedUnwrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedUnwrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedUnwrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedUnwrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedUnwrappedModelArrayValues to be used by the + * proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedUnwrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedUnwrappedModelArrayValuesService { + static ModelWithRenamedUnwrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedUnwrappedModelArrayValuesServiceImpl"); + return (ModelWithRenamedUnwrappedModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedUnwrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedUnwrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.4 — Contains an unwrapped array of models with a custom item name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java new file mode 100644 index 00000000000..25696709af9 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java @@ -0,0 +1,126 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedWrappedAndItemModelArray; + +/** + * An instance of this class provides access to all the operations defined in + * ModelWithRenamedWrappedAndItemModelArrayValues. + */ +public final class ModelWithRenamedWrappedAndItemModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedWrappedAndItemModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedAndItemModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedWrappedAndItemModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedWrappedAndItemModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedWrappedAndItemModelArrayValues to be used by + * the proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedWrappedAndItemModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedWrappedAndItemModelArrayValuesService { + static ModelWithRenamedWrappedAndItemModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.xml.implementation.ModelWithRenamedWrappedAndItemModelArrayValuesServiceImpl"); + return (ModelWithRenamedWrappedAndItemModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedWrappedAndItemModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.5 — Contains a wrapped array of models with custom wrapper and item names along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.get", requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedAndItemModelArray input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue.put", requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..f5243db600b --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java @@ -0,0 +1,123 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithRenamedWrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithRenamedWrappedModelArrayValues. + */ +public final class ModelWithRenamedWrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithRenamedWrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithRenamedWrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithRenamedWrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithRenamedWrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithRenamedWrappedModelArrayValues to be used by the + * proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithRenamedWrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithRenamedWrappedModelArrayValuesService { + static ModelWithRenamedWrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithRenamedWrappedModelArrayValuesServiceImpl"); + return (ModelWithRenamedWrappedModelArrayValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithRenamedWrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithRenamedWrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithRenamedWrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.3 — Contains a wrapped array of models with a custom wrapper name along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithRenamedWrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithRenamedWrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java index 6aa61a08313..7b6b8734f48 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of arrays of primitive types along with {@link Response}. + * @return §3.1 — Contains fields of arrays of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java index 6b6197f02da..6c874932fa8 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains an attribute and text along with {@link Response}. + * @return §8.1 — Contains an attribute and text along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java index cf0a4a5e998..448d98ceb97 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. + * @return §3.2 — Contains fields of wrapped and unwrapped arrays of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java new file mode 100644 index 00000000000..9dbcdc7f1aa --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java @@ -0,0 +1,122 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithUnwrappedModelArray; + +/** + * An instance of this class provides access to all the operations defined in ModelWithUnwrappedModelArrayValues. + */ +public final class ModelWithUnwrappedModelArrayValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithUnwrappedModelArrayValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithUnwrappedModelArrayValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithUnwrappedModelArrayValuesImpl(XmlClientImpl client) { + this.service = ModelWithUnwrappedModelArrayValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithUnwrappedModelArrayValues to be used by the proxy + * service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithUnwrappedModelArrayValues", host = "{endpoint}") + public interface ModelWithUnwrappedModelArrayValuesService { + static ModelWithUnwrappedModelArrayValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz + = Class.forName("payload.xml.implementation.ModelWithUnwrappedModelArrayValuesServiceImpl"); + return (ModelWithUnwrappedModelArrayValuesService) clazz.getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithUnwrappedModelArray", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithUnwrappedModelArray", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithUnwrappedModelArray input, RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §4.2 — Contains an unwrapped array of models along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.get", + requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithUnwrappedModelArray input, RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse("Payload.Xml.ModelWithUnwrappedModelArrayValue.put", + requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java new file mode 100644 index 00000000000..796c5801467 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java @@ -0,0 +1,126 @@ +package payload.xml.implementation; + +import io.clientcore.core.annotations.ReturnType; +import io.clientcore.core.annotations.ServiceInterface; +import io.clientcore.core.annotations.ServiceMethod; +import io.clientcore.core.http.annotations.BodyParam; +import io.clientcore.core.http.annotations.HeaderParam; +import io.clientcore.core.http.annotations.HostParam; +import io.clientcore.core.http.annotations.HttpRequestInformation; +import io.clientcore.core.http.annotations.UnexpectedResponseExceptionDetail; +import io.clientcore.core.http.models.HttpMethod; +import io.clientcore.core.http.models.HttpResponseException; +import io.clientcore.core.http.models.RequestContext; +import io.clientcore.core.http.models.Response; +import io.clientcore.core.http.pipeline.HttpPipeline; +import io.clientcore.core.instrumentation.Instrumentation; +import java.lang.reflect.InvocationTargetException; +import payload.xml.ModelWithWrappedPrimitiveCustomItemNames; + +/** + * An instance of this class provides access to all the operations defined in + * ModelWithWrappedPrimitiveCustomItemNamesValues. + */ +public final class ModelWithWrappedPrimitiveCustomItemNamesValuesImpl { + /** + * The proxy service used to perform REST calls. + */ + private final ModelWithWrappedPrimitiveCustomItemNamesValuesService service; + + /** + * The service client containing this operation class. + */ + private final XmlClientImpl client; + + /** + * The instance of instrumentation to report telemetry. + */ + private final Instrumentation instrumentation; + + /** + * Initializes an instance of ModelWithWrappedPrimitiveCustomItemNamesValuesImpl. + * + * @param client the instance of the service client containing this operation class. + */ + ModelWithWrappedPrimitiveCustomItemNamesValuesImpl(XmlClientImpl client) { + this.service = ModelWithWrappedPrimitiveCustomItemNamesValuesService.getNewInstance(client.getHttpPipeline()); + this.client = client; + this.instrumentation = client.getInstrumentation(); + } + + /** + * The interface defining all the services for XmlClientModelWithWrappedPrimitiveCustomItemNamesValues to be used by + * the proxy service to perform REST calls. + */ + @ServiceInterface(name = "XmlClientModelWithWrappedPrimitiveCustomItemNamesValues", host = "{endpoint}") + public interface ModelWithWrappedPrimitiveCustomItemNamesValuesService { + static ModelWithWrappedPrimitiveCustomItemNamesValuesService getNewInstance(HttpPipeline pipeline) { + try { + Class clazz = Class + .forName("payload.xml.implementation.ModelWithWrappedPrimitiveCustomItemNamesValuesServiceImpl"); + return (ModelWithWrappedPrimitiveCustomItemNamesValuesService) clazz + .getMethod("getNewInstance", HttpPipeline.class) + .invoke(null, pipeline); + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException + | InvocationTargetException e) { + throw new RuntimeException(e); + } + + } + + @HttpRequestInformation( + method = HttpMethod.GET, + path = "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + expectedStatusCodes = { 200 }) + @UnexpectedResponseExceptionDetail + Response get(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, RequestContext requestContext); + + @HttpRequestInformation( + method = HttpMethod.PUT, + path = "/payload/xml/modelWithWrappedPrimitiveCustomItemNames", + expectedStatusCodes = { 204 }) + @UnexpectedResponseExceptionDetail + Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content-type") String contentType, + @BodyParam("application/xml") ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext); + } + + /** + * The get operation. + * + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return §3.5 — Contains a wrapped primitive array with custom wrapper and item names along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getWithResponse(RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.get", requestContext, updatedContext -> { + final String accept = "application/xml"; + return service.get(this.client.getEndpoint(), accept, updatedContext); + }); + } + + /** + * The put operation. + * + * @param input The input parameter. + * @param requestContext The context to configure the HTTP request before HTTP client sends it. + * @throws IllegalArgumentException thrown if parameters fail the validation. + * @throws HttpResponseException thrown if the service returns an error. + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. + * @return the {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response putWithResponse(ModelWithWrappedPrimitiveCustomItemNames input, + RequestContext requestContext) { + return this.instrumentation.instrumentWithResponse( + "Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue.put", requestContext, updatedContext -> { + final String contentType = "application/xml"; + return service.put(this.client.getEndpoint(), contentType, input, updatedContext); + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java index 4ae27fc8b63..f0fbdbe02f1 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java @@ -89,7 +89,7 @@ Response put(@HostParam("endpoint") String endpoint, @HeaderParam("content * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java index f078fff1f43..aab486db195 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlClientImpl.java @@ -64,59 +64,73 @@ public SimpleModelValuesImpl getSimpleModelValues() { } /** - * The ModelWithSimpleArraysValuesImpl object to access its operations. + * The ModelWithRenamedPropertyValuesImpl object to access its operations. */ - private final ModelWithSimpleArraysValuesImpl modelWithSimpleArraysValues; + private final ModelWithRenamedPropertyValuesImpl modelWithRenamedPropertyValues; /** - * Gets the ModelWithSimpleArraysValuesImpl object to access its operations. + * Gets the ModelWithRenamedPropertyValuesImpl object to access its operations. * - * @return the ModelWithSimpleArraysValuesImpl object. + * @return the ModelWithRenamedPropertyValuesImpl object. */ - public ModelWithSimpleArraysValuesImpl getModelWithSimpleArraysValues() { - return this.modelWithSimpleArraysValues; + public ModelWithRenamedPropertyValuesImpl getModelWithRenamedPropertyValues() { + return this.modelWithRenamedPropertyValues; } /** - * The ModelWithArrayOfModelValuesImpl object to access its operations. + * The ModelWithRenamedFieldsValuesImpl object to access its operations. */ - private final ModelWithArrayOfModelValuesImpl modelWithArrayOfModelValues; + private final ModelWithRenamedFieldsValuesImpl modelWithRenamedFieldsValues; /** - * Gets the ModelWithArrayOfModelValuesImpl object to access its operations. + * Gets the ModelWithRenamedFieldsValuesImpl object to access its operations. * - * @return the ModelWithArrayOfModelValuesImpl object. + * @return the ModelWithRenamedFieldsValuesImpl object. */ - public ModelWithArrayOfModelValuesImpl getModelWithArrayOfModelValues() { - return this.modelWithArrayOfModelValues; + public ModelWithRenamedFieldsValuesImpl getModelWithRenamedFieldsValues() { + return this.modelWithRenamedFieldsValues; } /** - * The ModelWithOptionalFieldValuesImpl object to access its operations. + * The ModelWithNestedModelValuesImpl object to access its operations. */ - private final ModelWithOptionalFieldValuesImpl modelWithOptionalFieldValues; + private final ModelWithNestedModelValuesImpl modelWithNestedModelValues; /** - * Gets the ModelWithOptionalFieldValuesImpl object to access its operations. + * Gets the ModelWithNestedModelValuesImpl object to access its operations. * - * @return the ModelWithOptionalFieldValuesImpl object. + * @return the ModelWithNestedModelValuesImpl object. */ - public ModelWithOptionalFieldValuesImpl getModelWithOptionalFieldValues() { - return this.modelWithOptionalFieldValues; + public ModelWithNestedModelValuesImpl getModelWithNestedModelValues() { + return this.modelWithNestedModelValues; } /** - * The ModelWithAttributesValuesImpl object to access its operations. + * The ModelWithRenamedNestedModelValuesImpl object to access its operations. */ - private final ModelWithAttributesValuesImpl modelWithAttributesValues; + private final ModelWithRenamedNestedModelValuesImpl modelWithRenamedNestedModelValues; /** - * Gets the ModelWithAttributesValuesImpl object to access its operations. + * Gets the ModelWithRenamedNestedModelValuesImpl object to access its operations. * - * @return the ModelWithAttributesValuesImpl object. + * @return the ModelWithRenamedNestedModelValuesImpl object. */ - public ModelWithAttributesValuesImpl getModelWithAttributesValues() { - return this.modelWithAttributesValues; + public ModelWithRenamedNestedModelValuesImpl getModelWithRenamedNestedModelValues() { + return this.modelWithRenamedNestedModelValues; + } + + /** + * The ModelWithSimpleArraysValuesImpl object to access its operations. + */ + private final ModelWithSimpleArraysValuesImpl modelWithSimpleArraysValues; + + /** + * Gets the ModelWithSimpleArraysValuesImpl object to access its operations. + * + * @return the ModelWithSimpleArraysValuesImpl object. + */ + public ModelWithSimpleArraysValuesImpl getModelWithSimpleArraysValues() { + return this.modelWithSimpleArraysValues; } /** @@ -148,31 +162,143 @@ public ModelWithRenamedArraysValuesImpl getModelWithRenamedArraysValues() { } /** - * The ModelWithRenamedFieldsValuesImpl object to access its operations. + * The ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object to access its operations. */ - private final ModelWithRenamedFieldsValuesImpl modelWithRenamedFieldsValues; + private final ModelWithWrappedPrimitiveCustomItemNamesValuesImpl modelWithWrappedPrimitiveCustomItemNamesValues; /** - * Gets the ModelWithRenamedFieldsValuesImpl object to access its operations. + * Gets the ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object to access its operations. * - * @return the ModelWithRenamedFieldsValuesImpl object. + * @return the ModelWithWrappedPrimitiveCustomItemNamesValuesImpl object. */ - public ModelWithRenamedFieldsValuesImpl getModelWithRenamedFieldsValues() { - return this.modelWithRenamedFieldsValues; + public ModelWithWrappedPrimitiveCustomItemNamesValuesImpl getModelWithWrappedPrimitiveCustomItemNamesValues() { + return this.modelWithWrappedPrimitiveCustomItemNamesValues; } /** - * The ModelWithEmptyArrayValuesImpl object to access its operations. + * The ModelWithArrayOfModelValuesImpl object to access its operations. */ - private final ModelWithEmptyArrayValuesImpl modelWithEmptyArrayValues; + private final ModelWithArrayOfModelValuesImpl modelWithArrayOfModelValues; /** - * Gets the ModelWithEmptyArrayValuesImpl object to access its operations. + * Gets the ModelWithArrayOfModelValuesImpl object to access its operations. * - * @return the ModelWithEmptyArrayValuesImpl object. + * @return the ModelWithArrayOfModelValuesImpl object. */ - public ModelWithEmptyArrayValuesImpl getModelWithEmptyArrayValues() { - return this.modelWithEmptyArrayValues; + public ModelWithArrayOfModelValuesImpl getModelWithArrayOfModelValues() { + return this.modelWithArrayOfModelValues; + } + + /** + * The ModelWithUnwrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithUnwrappedModelArrayValuesImpl modelWithUnwrappedModelArrayValues; + + /** + * Gets the ModelWithUnwrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithUnwrappedModelArrayValuesImpl object. + */ + public ModelWithUnwrappedModelArrayValuesImpl getModelWithUnwrappedModelArrayValues() { + return this.modelWithUnwrappedModelArrayValues; + } + + /** + * The ModelWithRenamedWrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedWrappedModelArrayValuesImpl modelWithRenamedWrappedModelArrayValues; + + /** + * Gets the ModelWithRenamedWrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedWrappedModelArrayValuesImpl object. + */ + public ModelWithRenamedWrappedModelArrayValuesImpl getModelWithRenamedWrappedModelArrayValues() { + return this.modelWithRenamedWrappedModelArrayValues; + } + + /** + * The ModelWithRenamedUnwrappedModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedUnwrappedModelArrayValuesImpl modelWithRenamedUnwrappedModelArrayValues; + + /** + * Gets the ModelWithRenamedUnwrappedModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedUnwrappedModelArrayValuesImpl object. + */ + public ModelWithRenamedUnwrappedModelArrayValuesImpl getModelWithRenamedUnwrappedModelArrayValues() { + return this.modelWithRenamedUnwrappedModelArrayValues; + } + + /** + * The ModelWithRenamedWrappedAndItemModelArrayValuesImpl object to access its operations. + */ + private final ModelWithRenamedWrappedAndItemModelArrayValuesImpl modelWithRenamedWrappedAndItemModelArrayValues; + + /** + * Gets the ModelWithRenamedWrappedAndItemModelArrayValuesImpl object to access its operations. + * + * @return the ModelWithRenamedWrappedAndItemModelArrayValuesImpl object. + */ + public ModelWithRenamedWrappedAndItemModelArrayValuesImpl getModelWithRenamedWrappedAndItemModelArrayValues() { + return this.modelWithRenamedWrappedAndItemModelArrayValues; + } + + /** + * The ModelWithAttributesValuesImpl object to access its operations. + */ + private final ModelWithAttributesValuesImpl modelWithAttributesValues; + + /** + * Gets the ModelWithAttributesValuesImpl object to access its operations. + * + * @return the ModelWithAttributesValuesImpl object. + */ + public ModelWithAttributesValuesImpl getModelWithAttributesValues() { + return this.modelWithAttributesValues; + } + + /** + * The ModelWithRenamedAttributeValuesImpl object to access its operations. + */ + private final ModelWithRenamedAttributeValuesImpl modelWithRenamedAttributeValues; + + /** + * Gets the ModelWithRenamedAttributeValuesImpl object to access its operations. + * + * @return the ModelWithRenamedAttributeValuesImpl object. + */ + public ModelWithRenamedAttributeValuesImpl getModelWithRenamedAttributeValues() { + return this.modelWithRenamedAttributeValues; + } + + /** + * The ModelWithNamespaceValuesImpl object to access its operations. + */ + private final ModelWithNamespaceValuesImpl modelWithNamespaceValues; + + /** + * Gets the ModelWithNamespaceValuesImpl object to access its operations. + * + * @return the ModelWithNamespaceValuesImpl object. + */ + public ModelWithNamespaceValuesImpl getModelWithNamespaceValues() { + return this.modelWithNamespaceValues; + } + + /** + * The ModelWithNamespaceOnPropertiesValuesImpl object to access its operations. + */ + private final ModelWithNamespaceOnPropertiesValuesImpl modelWithNamespaceOnPropertiesValues; + + /** + * Gets the ModelWithNamespaceOnPropertiesValuesImpl object to access its operations. + * + * @return the ModelWithNamespaceOnPropertiesValuesImpl object. + */ + public ModelWithNamespaceOnPropertiesValuesImpl getModelWithNamespaceOnPropertiesValues() { + return this.modelWithNamespaceOnPropertiesValues; } /** @@ -189,6 +315,34 @@ public ModelWithTextValuesImpl getModelWithTextValues() { return this.modelWithTextValues; } + /** + * The ModelWithOptionalFieldValuesImpl object to access its operations. + */ + private final ModelWithOptionalFieldValuesImpl modelWithOptionalFieldValues; + + /** + * Gets the ModelWithOptionalFieldValuesImpl object to access its operations. + * + * @return the ModelWithOptionalFieldValuesImpl object. + */ + public ModelWithOptionalFieldValuesImpl getModelWithOptionalFieldValues() { + return this.modelWithOptionalFieldValues; + } + + /** + * The ModelWithEmptyArrayValuesImpl object to access its operations. + */ + private final ModelWithEmptyArrayValuesImpl modelWithEmptyArrayValues; + + /** + * Gets the ModelWithEmptyArrayValuesImpl object to access its operations. + * + * @return the ModelWithEmptyArrayValuesImpl object. + */ + public ModelWithEmptyArrayValuesImpl getModelWithEmptyArrayValues() { + return this.modelWithEmptyArrayValues; + } + /** * The ModelWithDictionaryValuesImpl object to access its operations. */ @@ -271,15 +425,28 @@ public XmlClientImpl(HttpPipeline httpPipeline, Instrumentation instrumentation, this.instrumentation = instrumentation; this.endpoint = endpoint; this.simpleModelValues = new SimpleModelValuesImpl(this); + this.modelWithRenamedPropertyValues = new ModelWithRenamedPropertyValuesImpl(this); + this.modelWithRenamedFieldsValues = new ModelWithRenamedFieldsValuesImpl(this); + this.modelWithNestedModelValues = new ModelWithNestedModelValuesImpl(this); + this.modelWithRenamedNestedModelValues = new ModelWithRenamedNestedModelValuesImpl(this); this.modelWithSimpleArraysValues = new ModelWithSimpleArraysValuesImpl(this); - this.modelWithArrayOfModelValues = new ModelWithArrayOfModelValuesImpl(this); - this.modelWithOptionalFieldValues = new ModelWithOptionalFieldValuesImpl(this); - this.modelWithAttributesValues = new ModelWithAttributesValuesImpl(this); this.modelWithUnwrappedArrayValues = new ModelWithUnwrappedArrayValuesImpl(this); this.modelWithRenamedArraysValues = new ModelWithRenamedArraysValuesImpl(this); - this.modelWithRenamedFieldsValues = new ModelWithRenamedFieldsValuesImpl(this); - this.modelWithEmptyArrayValues = new ModelWithEmptyArrayValuesImpl(this); + this.modelWithWrappedPrimitiveCustomItemNamesValues + = new ModelWithWrappedPrimitiveCustomItemNamesValuesImpl(this); + this.modelWithArrayOfModelValues = new ModelWithArrayOfModelValuesImpl(this); + this.modelWithUnwrappedModelArrayValues = new ModelWithUnwrappedModelArrayValuesImpl(this); + this.modelWithRenamedWrappedModelArrayValues = new ModelWithRenamedWrappedModelArrayValuesImpl(this); + this.modelWithRenamedUnwrappedModelArrayValues = new ModelWithRenamedUnwrappedModelArrayValuesImpl(this); + this.modelWithRenamedWrappedAndItemModelArrayValues + = new ModelWithRenamedWrappedAndItemModelArrayValuesImpl(this); + this.modelWithAttributesValues = new ModelWithAttributesValuesImpl(this); + this.modelWithRenamedAttributeValues = new ModelWithRenamedAttributeValuesImpl(this); + this.modelWithNamespaceValues = new ModelWithNamespaceValuesImpl(this); + this.modelWithNamespaceOnPropertiesValues = new ModelWithNamespaceOnPropertiesValuesImpl(this); this.modelWithTextValues = new ModelWithTextValuesImpl(this); + this.modelWithOptionalFieldValues = new ModelWithOptionalFieldValuesImpl(this); + this.modelWithEmptyArrayValues = new ModelWithEmptyArrayValuesImpl(this); this.modelWithDictionaryValues = new ModelWithDictionaryValuesImpl(this); this.modelWithEncodedNamesValues = new ModelWithEncodedNamesValuesImpl(this); this.modelWithEnumValues = new ModelWithEnumValuesImpl(this); diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java index 64ab861b946..78d41aa2ed9 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java @@ -79,7 +79,7 @@ Response get(@HostParam("endpoint") String endpoint, @HeaderParam(" * @throws IllegalArgumentException thrown if parameters fail the validation. * @throws HttpResponseException thrown if the service returns an error. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains fields of primitive types along with {@link Response}. + * @return §1.1 — Contains fields of primitive types along with {@link Response}. */ @ServiceMethod(returns = ReturnType.SINGLE) public Response getWithResponse(RequestContext requestContext) { diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json index 34d66bb8f20..367e49c6fad 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-pageable_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.pageable.PageSizeClient":"Payload.Pageable.PageSize","payload.pageable.PageableClientBuilder":"Payload.Pageable","payload.pageable.Pet":"Payload.Pageable.Pet","payload.pageable.ServerDrivenPaginationClient":"Payload.Pageable.ServerDrivenPagination","payload.pageable.ServerDrivenPaginationContinuationTokenClient":"Payload.Pageable.ServerDrivenPagination.ContinuationToken","payload.pageable.XmlPaginationClient":"Payload.Pageable.XmlPagination","payload.pageable.XmlPet":"Payload.Pageable.XmlPet","payload.pageable.implementation.RequestHeaderResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous","payload.pageable.implementation.RequestQueryResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous","payload.pageable.implementation.XmlPetListResult":"Payload.Pageable.XmlPetListResult","payload.pageable.implementation.XmlPetListResultWithNextLink":"Payload.Pageable.XmlPetListResultWithNextLink","payload.pageable.pagesize.implementation.ListWithPageSizeResponse":"Payload.Pageable.PageSize.listWithPageSize.Response.anonymous","payload.pageable.pagesize.implementation.ListWithoutContinuationResponse":"Payload.Pageable.PageSize.listWithoutContinuation.Response.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkResponse":"Payload.Pageable.ServerDrivenPagination.link.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkStringResponse":"Payload.Pageable.ServerDrivenPagination.linkString.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.NestedLinkResponse":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/pageable/PageSizeClient.java","src/main/java/payload/pageable/PageableClientBuilder.java","src/main/java/payload/pageable/Pet.java","src/main/java/payload/pageable/ServerDrivenPaginationClient.java","src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java","src/main/java/payload/pageable/XmlPaginationClient.java","src/main/java/payload/pageable/XmlPet.java","src/main/java/payload/pageable/implementation/PageSizesImpl.java","src/main/java/payload/pageable/implementation/PageableClientImpl.java","src/main/java/payload/pageable/implementation/RequestHeaderResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/RequestQueryResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPetListResult.java","src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java","src/main/java/payload/pageable/implementation/package-info.java","src/main/java/payload/pageable/package-info.java","src/main/java/payload/pageable/pagesize/implementation/ListWithPageSizeResponse.java","src/main/java/payload/pageable/pagesize/implementation/ListWithoutContinuationResponse.java","src/main/java/payload/pageable/pagesize/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkStringResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/NestedLinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.pageable.PageSizeClient":"Payload.Pageable.PageSize","payload.pageable.PageableClientBuilder":"Payload.Pageable","payload.pageable.Pet":"Payload.Pageable.Pet","payload.pageable.ServerDrivenPaginationAlternateInitialVerbClient":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb","payload.pageable.ServerDrivenPaginationClient":"Payload.Pageable.ServerDrivenPagination","payload.pageable.ServerDrivenPaginationContinuationTokenClient":"Payload.Pageable.ServerDrivenPagination.ContinuationToken","payload.pageable.XmlPaginationClient":"Payload.Pageable.XmlPagination","payload.pageable.XmlPet":"Payload.Pageable.XmlPet","payload.pageable.implementation.RequestHeaderResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseHeader.Response.anonymous","payload.pageable.implementation.RequestQueryResponseHeaderResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseHeader.Response.anonymous","payload.pageable.implementation.XmlPetListResult":"Payload.Pageable.XmlPetListResult","payload.pageable.implementation.XmlPetListResultWithNextLink":"Payload.Pageable.XmlPetListResultWithNextLink","payload.pageable.pagesize.implementation.ListWithPageSizeResponse":"Payload.Pageable.PageSize.listWithPageSize.Response.anonymous","payload.pageable.pagesize.implementation.ListWithoutContinuationResponse":"Payload.Pageable.PageSize.listWithoutContinuation.Response.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.NestedLinkResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.alternateinitialverb.Filter":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.Filter","payload.pageable.serverdrivenpagination.alternateinitialverb.implementation.PostResponse":"Payload.Pageable.ServerDrivenPagination.AlternateInitialVerb.post.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestHeaderNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedItems":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedItems.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.RequestQueryNestedResponseBodyResponseNestedNext":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.nestedNext.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestHeaderResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestHeaderResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryNestedResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryNestedResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.continuationtoken.implementation.RequestQueryResponseBodyResponse":"Payload.Pageable.ServerDrivenPagination.ContinuationToken.requestQueryResponseBody.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkResponse":"Payload.Pageable.ServerDrivenPagination.link.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.LinkStringResponse":"Payload.Pageable.ServerDrivenPagination.linkString.Response.anonymous","payload.pageable.serverdrivenpagination.implementation.NestedLinkResponse":"Payload.Pageable.ServerDrivenPagination.nestedLink.Response.anonymous"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/pageable/PageSizeClient.java","src/main/java/payload/pageable/PageableClientBuilder.java","src/main/java/payload/pageable/Pet.java","src/main/java/payload/pageable/ServerDrivenPaginationAlternateInitialVerbClient.java","src/main/java/payload/pageable/ServerDrivenPaginationClient.java","src/main/java/payload/pageable/ServerDrivenPaginationContinuationTokenClient.java","src/main/java/payload/pageable/XmlPaginationClient.java","src/main/java/payload/pageable/XmlPet.java","src/main/java/payload/pageable/implementation/PageSizesImpl.java","src/main/java/payload/pageable/implementation/PageableClientImpl.java","src/main/java/payload/pageable/implementation/RequestHeaderResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/RequestQueryResponseHeaderResponse.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationAlternateInitialVerbsImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationContinuationTokensImpl.java","src/main/java/payload/pageable/implementation/ServerDrivenPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPaginationsImpl.java","src/main/java/payload/pageable/implementation/XmlPetListResult.java","src/main/java/payload/pageable/implementation/XmlPetListResultWithNextLink.java","src/main/java/payload/pageable/implementation/package-info.java","src/main/java/payload/pageable/package-info.java","src/main/java/payload/pageable/pagesize/implementation/ListWithPageSizeResponse.java","src/main/java/payload/pageable/pagesize/implementation/ListWithoutContinuationResponse.java","src/main/java/payload/pageable/pagesize/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/NestedLinkResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/Filter.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/PostResponse.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/alternateinitialverb/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestHeaderNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedItems.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/RequestQueryNestedResponseBodyResponseNestedNext.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestHeaderResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryNestedResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/RequestQueryResponseBodyResponse.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/continuationtoken/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/LinkStringResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/NestedLinkResponse.java","src/main/java/payload/pageable/serverdrivenpagination/implementation/package-info.java","src/main/java/payload/pageable/serverdrivenpagination/package-info.java"]} \ No newline at end of file diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json index 8377a845788..51d86e9ae61 100644 --- a/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json +++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/resources/META-INF/payload-xml_metadata.json @@ -1 +1 @@ -{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.xml.ModelWithArrayOfModel":"Payload.Xml.ModelWithArrayOfModel","payload.xml.ModelWithArrayOfModelValueClient":"Payload.Xml.ModelWithArrayOfModelValue","payload.xml.ModelWithAttributes":"Payload.Xml.ModelWithAttributes","payload.xml.ModelWithAttributesValueClient":"Payload.Xml.ModelWithAttributesValue","payload.xml.ModelWithDatetime":"Payload.Xml.ModelWithDatetime","payload.xml.ModelWithDatetimeValueClient":"Payload.Xml.ModelWithDatetimeValue","payload.xml.ModelWithDictionary":"Payload.Xml.ModelWithDictionary","payload.xml.ModelWithDictionaryValueClient":"Payload.Xml.ModelWithDictionaryValue","payload.xml.ModelWithEmptyArray":"Payload.Xml.ModelWithEmptyArray","payload.xml.ModelWithEmptyArrayValueClient":"Payload.Xml.ModelWithEmptyArrayValue","payload.xml.ModelWithEncodedNames":"Payload.Xml.ModelWithEncodedNames","payload.xml.ModelWithEncodedNamesValueClient":"Payload.Xml.ModelWithEncodedNamesValue","payload.xml.ModelWithEnum":"Payload.Xml.ModelWithEnum","payload.xml.ModelWithEnumValueClient":"Payload.Xml.ModelWithEnumValue","payload.xml.ModelWithOptionalField":"Payload.Xml.ModelWithOptionalField","payload.xml.ModelWithOptionalFieldValueClient":"Payload.Xml.ModelWithOptionalFieldValue","payload.xml.ModelWithRenamedArrays":"Payload.Xml.ModelWithRenamedArrays","payload.xml.ModelWithRenamedArraysValueClient":"Payload.Xml.ModelWithRenamedArraysValue","payload.xml.ModelWithRenamedFields":"Payload.Xml.ModelWithRenamedFields","payload.xml.ModelWithRenamedFieldsValueClient":"Payload.Xml.ModelWithRenamedFieldsValue","payload.xml.ModelWithSimpleArrays":"Payload.Xml.ModelWithSimpleArrays","payload.xml.ModelWithSimpleArraysValueClient":"Payload.Xml.ModelWithSimpleArraysValue","payload.xml.ModelWithText":"Payload.Xml.ModelWithText","payload.xml.ModelWithTextValueClient":"Payload.Xml.ModelWithTextValue","payload.xml.ModelWithUnwrappedArray":"Payload.Xml.ModelWithUnwrappedArray","payload.xml.ModelWithUnwrappedArrayValueClient":"Payload.Xml.ModelWithUnwrappedArrayValue","payload.xml.SimpleModel":"Payload.Xml.SimpleModel","payload.xml.SimpleModelValueClient":"Payload.Xml.SimpleModelValue","payload.xml.Status":"Payload.Xml.Status","payload.xml.XmlClientBuilder":"Payload.Xml","payload.xml.XmlErrorBody":"Payload.Xml.XmlErrorBody","payload.xml.XmlErrorValueClient":"Payload.Xml.XmlErrorValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/xml/ModelWithArrayOfModel.java","src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java","src/main/java/payload/xml/ModelWithAttributes.java","src/main/java/payload/xml/ModelWithAttributesValueClient.java","src/main/java/payload/xml/ModelWithDatetime.java","src/main/java/payload/xml/ModelWithDatetimeValueClient.java","src/main/java/payload/xml/ModelWithDictionary.java","src/main/java/payload/xml/ModelWithDictionaryValueClient.java","src/main/java/payload/xml/ModelWithEmptyArray.java","src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java","src/main/java/payload/xml/ModelWithEncodedNames.java","src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java","src/main/java/payload/xml/ModelWithEnum.java","src/main/java/payload/xml/ModelWithEnumValueClient.java","src/main/java/payload/xml/ModelWithOptionalField.java","src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java","src/main/java/payload/xml/ModelWithRenamedArrays.java","src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java","src/main/java/payload/xml/ModelWithRenamedFields.java","src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java","src/main/java/payload/xml/ModelWithSimpleArrays.java","src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java","src/main/java/payload/xml/ModelWithText.java","src/main/java/payload/xml/ModelWithTextValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedArray.java","src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java","src/main/java/payload/xml/SimpleModel.java","src/main/java/payload/xml/SimpleModelValueClient.java","src/main/java/payload/xml/Status.java","src/main/java/payload/xml/XmlClientBuilder.java","src/main/java/payload/xml/XmlErrorBody.java","src/main/java/payload/xml/XmlErrorValueClient.java","src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java","src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java","src/main/java/payload/xml/implementation/XmlClientImpl.java","src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java","src/main/java/payload/xml/implementation/package-info.java","src/main/java/payload/xml/package-info.java"]} \ No newline at end of file +{"flavor":"generic","apiVersions":{},"crossLanguageDefinitions":{"payload.xml.Author":"Payload.Xml.Author","payload.xml.Book":"Payload.Xml.Book","payload.xml.ModelWithArrayOfModel":"Payload.Xml.ModelWithArrayOfModel","payload.xml.ModelWithArrayOfModelValueClient":"Payload.Xml.ModelWithArrayOfModelValue","payload.xml.ModelWithAttributes":"Payload.Xml.ModelWithAttributes","payload.xml.ModelWithAttributesValueClient":"Payload.Xml.ModelWithAttributesValue","payload.xml.ModelWithDatetime":"Payload.Xml.ModelWithDatetime","payload.xml.ModelWithDatetimeValueClient":"Payload.Xml.ModelWithDatetimeValue","payload.xml.ModelWithDictionary":"Payload.Xml.ModelWithDictionary","payload.xml.ModelWithDictionaryValueClient":"Payload.Xml.ModelWithDictionaryValue","payload.xml.ModelWithEmptyArray":"Payload.Xml.ModelWithEmptyArray","payload.xml.ModelWithEmptyArrayValueClient":"Payload.Xml.ModelWithEmptyArrayValue","payload.xml.ModelWithEncodedNames":"Payload.Xml.ModelWithEncodedNames","payload.xml.ModelWithEncodedNamesValueClient":"Payload.Xml.ModelWithEncodedNamesValue","payload.xml.ModelWithEnum":"Payload.Xml.ModelWithEnum","payload.xml.ModelWithEnumValueClient":"Payload.Xml.ModelWithEnumValue","payload.xml.ModelWithNamespace":"Payload.Xml.ModelWithNamespace","payload.xml.ModelWithNamespaceOnProperties":"Payload.Xml.ModelWithNamespaceOnProperties","payload.xml.ModelWithNamespaceOnPropertiesValueClient":"Payload.Xml.ModelWithNamespaceOnPropertiesValue","payload.xml.ModelWithNamespaceValueClient":"Payload.Xml.ModelWithNamespaceValue","payload.xml.ModelWithNestedModel":"Payload.Xml.ModelWithNestedModel","payload.xml.ModelWithNestedModelValueClient":"Payload.Xml.ModelWithNestedModelValue","payload.xml.ModelWithOptionalField":"Payload.Xml.ModelWithOptionalField","payload.xml.ModelWithOptionalFieldValueClient":"Payload.Xml.ModelWithOptionalFieldValue","payload.xml.ModelWithRenamedArrays":"Payload.Xml.ModelWithRenamedArrays","payload.xml.ModelWithRenamedArraysValueClient":"Payload.Xml.ModelWithRenamedArraysValue","payload.xml.ModelWithRenamedAttribute":"Payload.Xml.ModelWithRenamedAttribute","payload.xml.ModelWithRenamedAttributeValueClient":"Payload.Xml.ModelWithRenamedAttributeValue","payload.xml.ModelWithRenamedFields":"Payload.Xml.ModelWithRenamedFields","payload.xml.ModelWithRenamedFieldsValueClient":"Payload.Xml.ModelWithRenamedFieldsValue","payload.xml.ModelWithRenamedNestedModel":"Payload.Xml.ModelWithRenamedNestedModel","payload.xml.ModelWithRenamedNestedModelValueClient":"Payload.Xml.ModelWithRenamedNestedModelValue","payload.xml.ModelWithRenamedProperty":"Payload.Xml.ModelWithRenamedProperty","payload.xml.ModelWithRenamedPropertyValueClient":"Payload.Xml.ModelWithRenamedPropertyValue","payload.xml.ModelWithRenamedUnwrappedModelArray":"Payload.Xml.ModelWithRenamedUnwrappedModelArray","payload.xml.ModelWithRenamedUnwrappedModelArrayValueClient":"Payload.Xml.ModelWithRenamedUnwrappedModelArrayValue","payload.xml.ModelWithRenamedWrappedAndItemModelArray":"Payload.Xml.ModelWithRenamedWrappedAndItemModelArray","payload.xml.ModelWithRenamedWrappedAndItemModelArrayValueClient":"Payload.Xml.ModelWithRenamedWrappedAndItemModelArrayValue","payload.xml.ModelWithRenamedWrappedModelArray":"Payload.Xml.ModelWithRenamedWrappedModelArray","payload.xml.ModelWithRenamedWrappedModelArrayValueClient":"Payload.Xml.ModelWithRenamedWrappedModelArrayValue","payload.xml.ModelWithSimpleArrays":"Payload.Xml.ModelWithSimpleArrays","payload.xml.ModelWithSimpleArraysValueClient":"Payload.Xml.ModelWithSimpleArraysValue","payload.xml.ModelWithText":"Payload.Xml.ModelWithText","payload.xml.ModelWithTextValueClient":"Payload.Xml.ModelWithTextValue","payload.xml.ModelWithUnwrappedArray":"Payload.Xml.ModelWithUnwrappedArray","payload.xml.ModelWithUnwrappedArrayValueClient":"Payload.Xml.ModelWithUnwrappedArrayValue","payload.xml.ModelWithUnwrappedModelArray":"Payload.Xml.ModelWithUnwrappedModelArray","payload.xml.ModelWithUnwrappedModelArrayValueClient":"Payload.Xml.ModelWithUnwrappedModelArrayValue","payload.xml.ModelWithWrappedPrimitiveCustomItemNames":"Payload.Xml.ModelWithWrappedPrimitiveCustomItemNames","payload.xml.ModelWithWrappedPrimitiveCustomItemNamesValueClient":"Payload.Xml.ModelWithWrappedPrimitiveCustomItemNamesValue","payload.xml.SimpleModel":"Payload.Xml.SimpleModel","payload.xml.SimpleModelValueClient":"Payload.Xml.SimpleModelValue","payload.xml.Status":"Payload.Xml.Status","payload.xml.XmlClientBuilder":"Payload.Xml","payload.xml.XmlErrorBody":"Payload.Xml.XmlErrorBody","payload.xml.XmlErrorValueClient":"Payload.Xml.XmlErrorValue"},"generatedFiles":["src/main/java/module-info.java","src/main/java/payload/xml/Author.java","src/main/java/payload/xml/Book.java","src/main/java/payload/xml/ModelWithArrayOfModel.java","src/main/java/payload/xml/ModelWithArrayOfModelValueClient.java","src/main/java/payload/xml/ModelWithAttributes.java","src/main/java/payload/xml/ModelWithAttributesValueClient.java","src/main/java/payload/xml/ModelWithDatetime.java","src/main/java/payload/xml/ModelWithDatetimeValueClient.java","src/main/java/payload/xml/ModelWithDictionary.java","src/main/java/payload/xml/ModelWithDictionaryValueClient.java","src/main/java/payload/xml/ModelWithEmptyArray.java","src/main/java/payload/xml/ModelWithEmptyArrayValueClient.java","src/main/java/payload/xml/ModelWithEncodedNames.java","src/main/java/payload/xml/ModelWithEncodedNamesValueClient.java","src/main/java/payload/xml/ModelWithEnum.java","src/main/java/payload/xml/ModelWithEnumValueClient.java","src/main/java/payload/xml/ModelWithNamespace.java","src/main/java/payload/xml/ModelWithNamespaceOnProperties.java","src/main/java/payload/xml/ModelWithNamespaceOnPropertiesValueClient.java","src/main/java/payload/xml/ModelWithNamespaceValueClient.java","src/main/java/payload/xml/ModelWithNestedModel.java","src/main/java/payload/xml/ModelWithNestedModelValueClient.java","src/main/java/payload/xml/ModelWithOptionalField.java","src/main/java/payload/xml/ModelWithOptionalFieldValueClient.java","src/main/java/payload/xml/ModelWithRenamedArrays.java","src/main/java/payload/xml/ModelWithRenamedArraysValueClient.java","src/main/java/payload/xml/ModelWithRenamedAttribute.java","src/main/java/payload/xml/ModelWithRenamedAttributeValueClient.java","src/main/java/payload/xml/ModelWithRenamedFields.java","src/main/java/payload/xml/ModelWithRenamedFieldsValueClient.java","src/main/java/payload/xml/ModelWithRenamedNestedModel.java","src/main/java/payload/xml/ModelWithRenamedNestedModelValueClient.java","src/main/java/payload/xml/ModelWithRenamedProperty.java","src/main/java/payload/xml/ModelWithRenamedPropertyValueClient.java","src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArray.java","src/main/java/payload/xml/ModelWithRenamedUnwrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArray.java","src/main/java/payload/xml/ModelWithRenamedWrappedAndItemModelArrayValueClient.java","src/main/java/payload/xml/ModelWithRenamedWrappedModelArray.java","src/main/java/payload/xml/ModelWithRenamedWrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithSimpleArrays.java","src/main/java/payload/xml/ModelWithSimpleArraysValueClient.java","src/main/java/payload/xml/ModelWithText.java","src/main/java/payload/xml/ModelWithTextValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedArray.java","src/main/java/payload/xml/ModelWithUnwrappedArrayValueClient.java","src/main/java/payload/xml/ModelWithUnwrappedModelArray.java","src/main/java/payload/xml/ModelWithUnwrappedModelArrayValueClient.java","src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNames.java","src/main/java/payload/xml/ModelWithWrappedPrimitiveCustomItemNamesValueClient.java","src/main/java/payload/xml/SimpleModel.java","src/main/java/payload/xml/SimpleModelValueClient.java","src/main/java/payload/xml/Status.java","src/main/java/payload/xml/XmlClientBuilder.java","src/main/java/payload/xml/XmlErrorBody.java","src/main/java/payload/xml/XmlErrorValueClient.java","src/main/java/payload/xml/implementation/ModelWithArrayOfModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithAttributesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDatetimeValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithDictionaryValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEmptyArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEncodedNamesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithEnumValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNamespaceOnPropertiesValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNamespaceValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithNestedModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithOptionalFieldValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedAttributeValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedFieldsValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedNestedModelValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedPropertyValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedUnwrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedWrappedAndItemModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithRenamedWrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithSimpleArraysValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithTextValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithUnwrappedModelArrayValuesImpl.java","src/main/java/payload/xml/implementation/ModelWithWrappedPrimitiveCustomItemNamesValuesImpl.java","src/main/java/payload/xml/implementation/SimpleModelValuesImpl.java","src/main/java/payload/xml/implementation/XmlClientImpl.java","src/main/java/payload/xml/implementation/XmlErrorValuesImpl.java","src/main/java/payload/xml/implementation/package-info.java","src/main/java/payload/xml/package-info.java"]} \ No newline at end of file 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 0f19c33bd9c..812dac4c2d9 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 @@ -14,7 +14,7 @@ "dependencies": { "@typespec/spector": "0.1.0-alpha.24", "@typespec/spec-api": "0.1.0-alpha.13", - "@typespec/http-specs": "0.1.0-alpha.34", + "@typespec/http-specs": "0.1.0-alpha.35", "@azure-tools/azure-http-specs": "0.1.0-alpha.38", "@typespec/http-client-java": "file:../../typespec-http-client-java-0.7.0.tgz", "@typespec/http-client-java-tests": "file:" @@ -29,10 +29,10 @@ "@typespec/events": "0.80.0", "@typespec/sse": "0.80.0", "@typespec/streams": "0.80.0", - "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-azure-core": "0.66.1", + "@azure-tools/typespec-client-generator-core": "0.66.4", "@azure-tools/typespec-azure-resource-manager": "0.66.0", - "@azure-tools/typespec-autorest": "0.66.0" + "@azure-tools/typespec-autorest": "0.66.1" }, "private": true } diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json index 10319e7bcea..224c82c2a40 100644 --- a/packages/http-client-java/package-lock.json +++ b/packages/http-client-java/package-lock.json @@ -14,11 +14,11 @@ "lodash": "~4.17.23" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.66.0", - "@azure-tools/typespec-azure-core": "0.66.0", + "@azure-tools/typespec-autorest": "0.66.1", + "@azure-tools/typespec-azure-core": "0.66.1", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-client-generator-core": "0.66.4", "@microsoft/api-extractor": "^7.57.7", "@microsoft/api-extractor-model": "^7.33.4", "@types/js-yaml": "~4.0.9", @@ -34,21 +34,21 @@ "@typespec/streams": "0.80.0", "@typespec/versioning": "0.80.0", "@typespec/xml": "0.80.0", - "@vitest/coverage-v8": "^4.0.18", - "@vitest/ui": "^4.0.18", + "@vitest/coverage-v8": "^4.1.1", + "@vitest/ui": "^4.1.1", "c8": "~11.0.0", "rimraf": "~6.1.3", "typescript": "~6.0.2", - "vitest": "^4.0.18" + "vitest": "^4.1.1" }, "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.66.1 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.66.1 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.4 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/events": ">=0.80.0 <1.0.0", "@typespec/http": "^1.10.0", @@ -110,18 +110,18 @@ } }, "node_modules/@azure-tools/typespec-autorest": { - "version": "0.66.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.66.0.tgz", - "integrity": "sha512-sznnlQ2Cyxny7bXSl+PzGu+qQf/rrSIvf2qR7G/bqWbK6MNykXwiDk9uR5q93Y8spA9vv4jk38Il4rSXqmAzLQ==", + "version": "0.66.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.66.1.tgz", + "integrity": "sha512-9R2S9hr1nie5lvJQnubvywPajOhdUApTED5MIef5KlF1zZL+DKMFDDOKwnSvFvW7ROmL+Ph8FQagw/6+PStlOg==", "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.66.0", + "@azure-tools/typespec-azure-core": "^0.66.1", "@azure-tools/typespec-azure-resource-manager": "^0.66.0", - "@azure-tools/typespec-client-generator-core": "^0.66.0", + "@azure-tools/typespec-client-generator-core": "^0.66.4", "@typespec/compiler": "^1.10.0", "@typespec/http": "^1.10.0", "@typespec/openapi": "^1.10.0", @@ -136,9 +136,9 @@ } }, "node_modules/@azure-tools/typespec-azure-core": { - "version": "0.66.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.66.0.tgz", - "integrity": "sha512-OBKxRN7AucK3snh+GtLKSDdcZTz08IgcSZlIO3c4KSlmcR5twT1NMyqf1+V8SAhyOdZimndb+ikzrkkgab+GpA==", + "version": "0.66.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.66.1.tgz", + "integrity": "sha512-i8lMegL4s0I6xQT61zIIhmN1aA6iYFoH+7owSl/msOD0yVWx3Khf3ETULX53yHFd7OoUDAjmFx7+8j9atWXzHQ==", "dev": true, "license": "MIT", "peer": true, @@ -191,9 +191,9 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.66.3", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.3.tgz", - "integrity": "sha512-sNetQ6igxAp/vL6X2kEIy715ToDTqoJeb+OL59GEUtOW/3KBSi5tsxvDdCwSfEoaNEmv/FYjh/gJDwAWCJdFJg==", + "version": "0.66.4", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.4.tgz", + "integrity": "sha512-KRMWLvojku2qFnPpUiZNTa/nm49IjSsGVhPmFhQ5a01KwI2T7zT+Ga39/xLTLHHT4aIgBaMWxD4ioZa2ZhbEKw==", "dev": true, "license": "MIT", "peer": true, @@ -206,7 +206,7 @@ "node": ">=20.0.0" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": "^0.66.0", + "@azure-tools/typespec-azure-core": "^0.66.1", "@typespec/compiler": "^1.10.0", "@typespec/events": "^0.80.0", "@typespec/http": "^1.10.0", @@ -571,446 +571,38 @@ "node": ">=18" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.4.tgz", - "integrity": "sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.4.tgz", - "integrity": "sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.4.tgz", - "integrity": "sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.4.tgz", - "integrity": "sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.4.tgz", - "integrity": "sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.4.tgz", - "integrity": "sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.4.tgz", - "integrity": "sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.4.tgz", - "integrity": "sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.4.tgz", - "integrity": "sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.4.tgz", - "integrity": "sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.4.tgz", - "integrity": "sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.4.tgz", - "integrity": "sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.4.tgz", - "integrity": "sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.4.tgz", - "integrity": "sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.4.tgz", - "integrity": "sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.4.tgz", - "integrity": "sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.4.tgz", - "integrity": "sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.4.tgz", - "integrity": "sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.4.tgz", - "integrity": "sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.4.tgz", - "integrity": "sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.4.tgz", - "integrity": "sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.4.tgz", - "integrity": "sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.4.tgz", - "integrity": "sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.4.tgz", - "integrity": "sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==", - "cpu": [ - "arm64" - ], + "node_modules/@emnapi/core": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz", + "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "@emnapi/wasi-threads": "1.2.0", + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.4.tgz", - "integrity": "sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==", - "cpu": [ - "ia32" - ], + "node_modules/@emnapi/runtime": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz", + "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/win32-x64": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.4.tgz", - "integrity": "sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==", - "cpu": [ - "x64" - ], + "node_modules/@emnapi/wasi-threads": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz", + "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, "node_modules/@inquirer/ansi": { @@ -1591,6 +1183,23 @@ "resolve": "~1.22.2" } }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz", + "integrity": "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1", + "@tybys/wasm-util": "^0.10.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -1629,6 +1238,16 @@ "node": ">= 8" } }, + "node_modules/@oxc-project/types": { + "version": "0.122.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.122.0.tgz", + "integrity": "sha512-oLAl5kBpV4w69UtFZ9xqcmTi+GENWOcPF7FCrczTiBbmC0ibXxCwyvZGbO39rCVEuLGAZM84DH0pUIyyv/YJzA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/Boshen" + } + }, "node_modules/@polka/url": { "version": "1.0.0-next.29", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz", @@ -1636,24 +1255,10 @@ "dev": true, "license": "MIT" }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.0.tgz", - "integrity": "sha512-WOhNW9K8bR3kf4zLxbfg6Pxu2ybOUbB2AjMDHSQx86LIF4rH4Ft7vmMwNt0loO0eonglSNy4cpD3MKXXKQu0/A==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.0.tgz", - "integrity": "sha512-u6JHLll5QKRvjciE78bQXDmqRqNs5M/3GVqZeMwvmjaNODJih/WIrJlFVEihvV0MiYFmd+ZyPr9wxOVbPAG2Iw==", + "node_modules/@rolldown/binding-android-arm64": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.11.tgz", + "integrity": "sha512-SJ+/g+xNnOh6NqYxD0V3uVN4W3VfnrGsC9/hoglicgTNfABFG9JjISvkkU0dNY84MNHLWyOgxP9v9Y9pX4S7+A==", "cpu": [ "arm64" ], @@ -1662,12 +1267,15 @@ "optional": true, "os": [ "android" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.0.tgz", - "integrity": "sha512-qEF7CsKKzSRc20Ciu2Zw1wRrBz4g56F7r/vRwY430UPp/nt1x21Q/fpJ9N5l47WWvJlkNCPJz3QRVw008fi7yA==", + "node_modules/@rolldown/binding-darwin-arm64": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.11.tgz", + "integrity": "sha512-7WQgR8SfOPwmDZGFkThUvsmd/nwAWv91oCO4I5LS7RKrssPZmOt7jONN0cW17ydGC1n/+puol1IpoieKqQidmg==", "cpu": [ "arm64" ], @@ -1676,12 +1284,15 @@ "optional": true, "os": [ "darwin" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.0.tgz", - "integrity": "sha512-WADYozJ4QCnXCH4wPB+3FuGmDPoFseVCUrANmA5LWwGmC6FL14BWC7pcq+FstOZv3baGX65tZ378uT6WG8ynTw==", + "node_modules/@rolldown/binding-darwin-x64": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.11.tgz", + "integrity": "sha512-39Ks6UvIHq4rEogIfQBoBRusj0Q0nPVWIvqmwBLaT6aqQGIakHdESBVOPRRLacy4WwUPIx4ZKzfZ9PMW+IeyUQ==", "cpu": [ "x64" ], @@ -1690,26 +1301,15 @@ "optional": true, "os": [ "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.0.tgz", - "integrity": "sha512-6b8wGHJlDrGeSE3aH5mGNHBjA0TTkxdoNHik5EkvPHCt351XnigA4pS7Wsj/Eo9Y8RBU6f35cjN9SYmCFBtzxw==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.0.tgz", - "integrity": "sha512-h25Ga0t4jaylMB8M/JKAyrvvfxGRjnPQIR8lnCayyzEjEOx2EJIlIiMbhpWxDRKGKF8jbNH01NnN663dH638mA==", + "node_modules/@rolldown/binding-freebsd-x64": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.11.tgz", + "integrity": "sha512-jfsm0ZHfhiqrvWjJAmzsqiIFPz5e7mAoCOPBNTcNgkiid/LaFKiq92+0ojH+nmJmKYkre4t71BWXUZDNp7vsag==", "cpu": [ "x64" ], @@ -1718,26 +1318,15 @@ "optional": true, "os": [ "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.0.tgz", - "integrity": "sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==", - "cpu": [ - "arm" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.0.tgz", - "integrity": "sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==", + "node_modules/@rolldown/binding-linux-arm-gnueabihf": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.11.tgz", + "integrity": "sha512-zjQaUtSyq1nVe3nxmlSCuR96T1LPlpvmJ0SZy0WJFEsV4kFbXcq2u68L4E6O0XeFj4aex9bEauqjW8UQBeAvfQ==", "cpu": [ "arm" ], @@ -1746,26 +1335,15 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.0.tgz", - "integrity": "sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.0.tgz", - "integrity": "sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==", + "node_modules/@rolldown/binding-linux-arm64-gnu": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.11.tgz", + "integrity": "sha512-WMW1yE6IOnehTcFE9eipFkm3XN63zypWlrJQ2iF7NrQ9b2LDRjumFoOGJE8RJJTJCTBAdmLMnJ8uVitACUUo1Q==", "cpu": [ "arm64" ], @@ -1774,54 +1352,32 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.0.tgz", - "integrity": "sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==", - "cpu": [ - "loong64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.0.tgz", - "integrity": "sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==", + "node_modules/@rolldown/binding-linux-arm64-musl": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.11.tgz", + "integrity": "sha512-jfndI9tsfm4APzjNt6QdBkYwre5lRPUgHeDHoI7ydKUuJvz3lZeCfMsI56BZj+7BYqiKsJm7cfd/6KYV7ubrBg==", "cpu": [ - "loong64" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.0.tgz", - "integrity": "sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==", - "cpu": [ - "ppc64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.0.tgz", - "integrity": "sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==", + "node_modules/@rolldown/binding-linux-ppc64-gnu": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.11.tgz", + "integrity": "sha512-ZlFgw46NOAGMgcdvdYwAGu2Q+SLFA9LzbJLW+iyMOJyhj5wk6P3KEE9Gct4xWwSzFoPI7JCdYmYMzVtlgQ+zfw==", "cpu": [ "ppc64" ], @@ -1830,40 +1386,15 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.0.tgz", - "integrity": "sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.0.tgz", - "integrity": "sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==", - "cpu": [ - "riscv64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.0.tgz", - "integrity": "sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==", + "node_modules/@rolldown/binding-linux-s390x-gnu": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.11.tgz", + "integrity": "sha512-hIOYmuT6ofM4K04XAZd3OzMySEO4K0/nc9+jmNcxNAxRi6c5UWpqfw3KMFV4MVFWL+jQsSh+bGw2VqmaPMTLyw==", "cpu": [ "s390x" ], @@ -1872,12 +1403,15 @@ "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.0.tgz", - "integrity": "sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==", + "node_modules/@rolldown/binding-linux-x64-gnu": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.11.tgz", + "integrity": "sha512-qXBQQO9OvkjjQPLdUVr7Nr2t3QTZI7s4KZtfw7HzBgjbmAPSFwSv4rmET9lLSgq3rH/ndA3ngv3Qb8l2njoPNA==", "cpu": [ "x64" ], @@ -1886,12 +1420,15 @@ "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.0.tgz", - "integrity": "sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==", + "node_modules/@rolldown/binding-linux-x64-musl": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.11.tgz", + "integrity": "sha512-/tpFfoSTzUkH9LPY+cYbqZBDyyX62w5fICq9qzsHLL8uTI6BHip3Q9Uzft0wylk/i8OOwKik8OxW+QAhDmzwmg==", "cpu": [ "x64" ], @@ -1900,26 +1437,15 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.0.tgz", - "integrity": "sha512-1o/0/pIhozoSaDJoDcec+IVLbnRtQmHwPV730+AOD29lHEEo4F5BEUB24H0OBdhbBBDwIOSuf7vgg0Ywxdfiiw==", - "cpu": [ - "x64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.0.tgz", - "integrity": "sha512-pESDkos/PDzYwtyzB5p/UoNU/8fJo68vcXM9ZW2V0kjYayj1KaaUfi1NmTUTUpMn4UhU4gTuK8gIaFO4UGuMbA==", + "node_modules/@rolldown/binding-openharmony-arm64": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.11.tgz", + "integrity": "sha512-mcp3Rio2w72IvdZG0oQ4bM2c2oumtwHfUfKncUM6zGgz0KgPz4YmDPQfnXEiY5t3+KD/i8HG2rOB/LxdmieK2g==", "cpu": [ "arm64" ], @@ -1928,54 +1454,49 @@ "optional": true, "os": [ "openharmony" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.0.tgz", - "integrity": "sha512-hj1wFStD7B1YBeYmvY+lWXZ7ey73YGPcViMShYikqKT1GtstIKQAtfUI6yrzPjAy/O7pO0VLXGmUVWXQMaYgTQ==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.0.tgz", - "integrity": "sha512-SyaIPFoxmUPlNDq5EHkTbiKzmSEmq/gOYFI/3HHJ8iS/v1mbugVa7dXUzcJGQfoytp9DJFLhHH4U3/eTy2Bq4w==", + "node_modules/@rolldown/binding-wasm32-wasi": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.11.tgz", + "integrity": "sha512-LXk5Hii1Ph9asuGRjBuz8TUxdc1lWzB7nyfdoRgI0WGPZKmCxvlKk8KfYysqtr4MfGElu/f/pEQRh8fcEgkrWw==", "cpu": [ - "ia32" + "wasm32" ], "dev": true, "license": "MIT", "optional": true, - "os": [ - "win32" - ] + "dependencies": { + "@napi-rs/wasm-runtime": "^1.1.1" + }, + "engines": { + "node": ">=14.0.0" + } }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.0.tgz", - "integrity": "sha512-RdcryEfzZr+lAr5kRm2ucN9aVlCCa2QNq4hXelZxb8GG0NJSazq44Z3PCCc8wISRuCVnGs0lQJVX5Vp6fKA+IA==", + "node_modules/@rolldown/binding-win32-arm64-msvc": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.11.tgz", + "integrity": "sha512-dDwf5otnx0XgRY1yqxOC4ITizcdzS/8cQ3goOWv3jFAo4F+xQYni+hnMuO6+LssHHdJW7+OCVL3CoU4ycnh35Q==", "cpu": [ - "x64" + "arm64" ], "dev": true, "license": "MIT", "optional": true, "os": [ "win32" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz", - "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==", + "node_modules/@rolldown/binding-win32-x64-msvc": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.11.tgz", + "integrity": "sha512-LN4/skhSggybX71ews7dAj6r2geaMJfm3kMbK2KhFMg9B10AZXnKoLCVVgzhMHL0S+aKtr4p8QbAW8k+w95bAA==", "cpu": [ "x64" ], @@ -1984,7 +1505,17 @@ "optional": true, "os": [ "win32" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.11.tgz", + "integrity": "sha512-xQO9vbwBecJRv9EUcQ/y0dzSTJgA7Q6UVN7xp6B81+tBGSLVAK03yJ9NkJaUA7JFD91kbjxRSC/mDnmvXzbHoQ==", + "dev": true, + "license": "MIT" }, "node_modules/@rushstack/node-core-library": { "version": "5.20.3", @@ -2129,6 +1660,17 @@ "dev": true, "license": "MIT" }, + "node_modules/@tybys/wasm-util": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", + "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@types/argparse": { "version": "1.0.38", "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", @@ -2704,29 +2246,29 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.0.18.tgz", - "integrity": "sha512-7i+N2i0+ME+2JFZhfuz7Tg/FqKtilHjGyGvoHYQ6iLV0zahbsJ9sljC9OcFcPDbhYKCet+sG8SsVqlyGvPflZg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.1.tgz", + "integrity": "sha512-nZ4RWwGCoGOQRMmU/Q9wlUY540RVRxJZ9lxFsFfy0QV7Zmo5VVBhB6Sl9Xa0KIp2iIs3zWfPlo9LcY1iqbpzCw==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.0.18", - "ast-v8-to-istanbul": "^0.3.10", + "@vitest/utils": "4.1.1", + "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", "istanbul-reports": "^3.2.0", - "magicast": "^0.5.1", + "magicast": "^0.5.2", "obug": "^2.1.1", - "std-env": "^3.10.0", + "std-env": "^4.0.0-rc.1", "tinyrainbow": "^3.0.3" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.0.18", - "vitest": "4.0.18" + "@vitest/browser": "4.1.1", + "vitest": "4.1.1" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -2735,17 +2277,17 @@ } }, "node_modules/@vitest/expect": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.0.18.tgz", - "integrity": "sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.1.tgz", + "integrity": "sha512-xAV0fqBTk44Rn6SjJReEQkHP3RrqbJo6JQ4zZ7/uVOiJZRarBtblzrOfFIZeYUrukp2YD6snZG6IBqhOoHTm+A==", "dev": true, "license": "MIT", "dependencies": { - "@standard-schema/spec": "^1.0.0", + "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.0.18", - "@vitest/utils": "4.0.18", - "chai": "^6.2.1", + "@vitest/spy": "4.1.1", + "@vitest/utils": "4.1.1", + "chai": "^6.2.2", "tinyrainbow": "^3.0.3" }, "funding": { @@ -2753,13 +2295,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.0.18.tgz", - "integrity": "sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.1.tgz", + "integrity": "sha512-h3BOylsfsCLPeceuCPAAJ+BvNwSENgJa4hXoXu4im0bs9Lyp4URc4JYK4pWLZ4pG/UQn7AT92K6IByi6rE6g3A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.0.18", + "@vitest/spy": "4.1.1", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -2768,7 +2310,7 @@ }, "peerDependencies": { "msw": "^2.4.9", - "vite": "^6.0.0 || ^7.0.0-0" + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "msw": { @@ -2780,9 +2322,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.0.18.tgz", - "integrity": "sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.1.tgz", + "integrity": "sha512-GM+TEQN5WhOygr1lp7skeVjdLPqqWMHsfzXrcHAqZJi/lIVh63H0kaRCY8MDhNWikx19zBUK8ceaLB7X5AH9NQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2793,13 +2335,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.0.18.tgz", - "integrity": "sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.1.tgz", + "integrity": "sha512-f7+FPy75vN91QGWsITueq0gedwUZy1fLtHOCMeQpjs8jTekAHeKP80zfDEnhrleviLHzVSDXIWuCIOFn3D3f8A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.0.18", + "@vitest/utils": "4.1.1", "pathe": "^2.0.3" }, "funding": { @@ -2807,13 +2349,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.0.18.tgz", - "integrity": "sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.1.tgz", + "integrity": "sha512-kMVSgcegWV2FibXEx9p9WIKgje58lcTbXgnJixfcg15iK8nzCXhmalL0ZLtTWLW9PH1+1NEDShiFFedB3tEgWg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.18", + "@vitest/pretty-format": "4.1.1", + "@vitest/utils": "4.1.1", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -2822,9 +2365,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.0.18.tgz", - "integrity": "sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.1.tgz", + "integrity": "sha512-6Ti/KT5OVaiupdIZEuZN7l3CZcR0cxnxt70Z0//3CtwgObwA6jZhmVBA3yrXSVN3gmwjgd7oDNLlsXz526gpRA==", "dev": true, "license": "MIT", "funding": { @@ -2832,16 +2375,16 @@ } }, "node_modules/@vitest/ui": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.0.18.tgz", - "integrity": "sha512-CGJ25bc8fRi8Lod/3GHSvXRKi7nBo3kxh0ApW4yCjmrWmRmlT53B5E08XRSZRliygG0aVNxLrBEqPYdz/KcCtQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.1.tgz", + "integrity": "sha512-k0qNVLmCISxoGWvdhOeynlZVrfjx7Xjp95kIptN0fZYyONCgVcKIPn53MpFZ7S+fO6YdKNhgIfl0nu92Q0CCOg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@vitest/utils": "4.0.18", + "@vitest/utils": "4.1.1", "fflate": "^0.8.2", - "flatted": "^3.3.3", + "flatted": "3.4.0", "pathe": "^2.0.3", "sirv": "^3.0.2", "tinyglobby": "^0.2.15", @@ -2851,17 +2394,18 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "4.0.18" + "vitest": "4.1.1" } }, "node_modules/@vitest/utils": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.18.tgz", - "integrity": "sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.1.tgz", + "integrity": "sha512-cNxAlaB3sHoCdL6pj6yyUXv9Gry1NHNg0kFTXdvSIZXLHsqKH7chiWOkwJ5s5+d/oMwcoG9T0bKU38JZWKusrQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.0.18", + "@vitest/pretty-format": "4.1.1", + "convert-source-map": "^2.0.0", "tinyrainbow": "^3.0.3" }, "funding": { @@ -3027,9 +2571,9 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "0.3.12", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.12.tgz", - "integrity": "sha512-BRRC8VRZY2R4Z4lFIL35MwNXmwVqBityvOIwETtsCSwvjl0IdgFsy9NhdaA6j74nUdtJJlIypeRhpDam19Wq3g==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.0.tgz", + "integrity": "sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==", "dev": true, "license": "MIT", "dependencies": { @@ -3556,6 +3100,16 @@ "node": ">= 0.8" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/diff": { "version": "8.0.4", "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz", @@ -3672,9 +3226,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", - "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz", + "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==", "dev": true, "license": "MIT" }, @@ -3691,48 +3245,6 @@ "node": ">= 0.4" } }, - "node_modules/esbuild": { - "version": "0.27.4", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.4.tgz", - "integrity": "sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.4", - "@esbuild/android-arm": "0.27.4", - "@esbuild/android-arm64": "0.27.4", - "@esbuild/android-x64": "0.27.4", - "@esbuild/darwin-arm64": "0.27.4", - "@esbuild/darwin-x64": "0.27.4", - "@esbuild/freebsd-arm64": "0.27.4", - "@esbuild/freebsd-x64": "0.27.4", - "@esbuild/linux-arm": "0.27.4", - "@esbuild/linux-arm64": "0.27.4", - "@esbuild/linux-ia32": "0.27.4", - "@esbuild/linux-loong64": "0.27.4", - "@esbuild/linux-mips64el": "0.27.4", - "@esbuild/linux-ppc64": "0.27.4", - "@esbuild/linux-riscv64": "0.27.4", - "@esbuild/linux-s390x": "0.27.4", - "@esbuild/linux-x64": "0.27.4", - "@esbuild/netbsd-arm64": "0.27.4", - "@esbuild/netbsd-x64": "0.27.4", - "@esbuild/openbsd-arm64": "0.27.4", - "@esbuild/openbsd-x64": "0.27.4", - "@esbuild/openharmony-arm64": "0.27.4", - "@esbuild/sunos-x64": "0.27.4", - "@esbuild/win32-arm64": "0.27.4", - "@esbuild/win32-ia32": "0.27.4", - "@esbuild/win32-x64": "0.27.4" - } - }, "node_modules/escalade": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", @@ -3968,9 +3480,9 @@ } }, "node_modules/flatted": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", - "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.0.tgz", + "integrity": "sha512-kC6Bb+ooptOIvWj5B63EQWkF0FEnNjV2ZNkLMLZRDDduIiWeFF4iKnslwhiWxjAdbg4NzTNo6h0qLuvFrcx+Sw==", "dev": true, "license": "ISC" }, @@ -4958,6 +4470,267 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/lightningcss": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", + "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "dev": true, + "license": "MPL-2.0", + "dependencies": { + "detect-libc": "^2.0.3" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "lightningcss-android-arm64": "1.32.0", + "lightningcss-darwin-arm64": "1.32.0", + "lightningcss-darwin-x64": "1.32.0", + "lightningcss-freebsd-x64": "1.32.0", + "lightningcss-linux-arm-gnueabihf": "1.32.0", + "lightningcss-linux-arm64-gnu": "1.32.0", + "lightningcss-linux-arm64-musl": "1.32.0", + "lightningcss-linux-x64-gnu": "1.32.0", + "lightningcss-linux-x64-musl": "1.32.0", + "lightningcss-win32-arm64-msvc": "1.32.0", + "lightningcss-win32-x64-msvc": "1.32.0" + } + }, + "node_modules/lightningcss-android-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", + "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-arm64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", + "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-darwin-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", + "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-freebsd-x64": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", + "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm-gnueabihf": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", + "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", + "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-arm64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", + "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-gnu": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", + "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-linux-x64-musl": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", + "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-arm64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", + "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/lightningcss-win32-x64-msvc": { + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", + "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MPL-2.0", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -5914,49 +5687,38 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rollup": { - "version": "4.60.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.0.tgz", - "integrity": "sha512-yqjxruMGBQJ2gG4HtjZtAfXArHomazDHoFwFFmZZl0r7Pdo7qCIXKqKHZc8yeoMgzJJ+pO6pEEHa+V7uzWlrAQ==", + "node_modules/rolldown": { + "version": "1.0.0-rc.11", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.11.tgz", + "integrity": "sha512-NRjoKMusSjfRbSYiH3VSumlkgFe7kYAa3pzVOsVYVFY3zb5d7nS+a3KGQ7hJKXuYWbzJKPVQ9Wxq2UvyK+ENpw==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.8" + "@oxc-project/types": "=0.122.0", + "@rolldown/pluginutils": "1.0.0-rc.11" }, "bin": { - "rollup": "dist/bin/rollup" + "rolldown": "bin/cli.mjs" }, "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" + "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.60.0", - "@rollup/rollup-android-arm64": "4.60.0", - "@rollup/rollup-darwin-arm64": "4.60.0", - "@rollup/rollup-darwin-x64": "4.60.0", - "@rollup/rollup-freebsd-arm64": "4.60.0", - "@rollup/rollup-freebsd-x64": "4.60.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.60.0", - "@rollup/rollup-linux-arm-musleabihf": "4.60.0", - "@rollup/rollup-linux-arm64-gnu": "4.60.0", - "@rollup/rollup-linux-arm64-musl": "4.60.0", - "@rollup/rollup-linux-loong64-gnu": "4.60.0", - "@rollup/rollup-linux-loong64-musl": "4.60.0", - "@rollup/rollup-linux-ppc64-gnu": "4.60.0", - "@rollup/rollup-linux-ppc64-musl": "4.60.0", - "@rollup/rollup-linux-riscv64-gnu": "4.60.0", - "@rollup/rollup-linux-riscv64-musl": "4.60.0", - "@rollup/rollup-linux-s390x-gnu": "4.60.0", - "@rollup/rollup-linux-x64-gnu": "4.60.0", - "@rollup/rollup-linux-x64-musl": "4.60.0", - "@rollup/rollup-openbsd-x64": "4.60.0", - "@rollup/rollup-openharmony-arm64": "4.60.0", - "@rollup/rollup-win32-arm64-msvc": "4.60.0", - "@rollup/rollup-win32-ia32-msvc": "4.60.0", - "@rollup/rollup-win32-x64-gnu": "4.60.0", - "@rollup/rollup-win32-x64-msvc": "4.60.0", - "fsevents": "~2.3.2" + "@rolldown/binding-android-arm64": "1.0.0-rc.11", + "@rolldown/binding-darwin-arm64": "1.0.0-rc.11", + "@rolldown/binding-darwin-x64": "1.0.0-rc.11", + "@rolldown/binding-freebsd-x64": "1.0.0-rc.11", + "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.11", + "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.11", + "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.11", + "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.11", + "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.11", + "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.11", + "@rolldown/binding-linux-x64-musl": "1.0.0-rc.11", + "@rolldown/binding-openharmony-arm64": "1.0.0-rc.11", + "@rolldown/binding-wasm32-wasi": "1.0.0-rc.11", + "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.11", + "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.11" } }, "node_modules/router": { @@ -6370,9 +6132,9 @@ } }, "node_modules/std-env": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", - "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.0.0.tgz", + "integrity": "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==", "dev": true, "license": "MIT" }, @@ -6809,18 +6571,16 @@ } }, "node_modules/vite": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.2.tgz", + "integrity": "sha512-1gFhNi+bHhRE/qKZOJXACm6tX4bA3Isy9KuKF15AgSRuRazNBOJfdDemPBU16/mpMxApDPrWvZ08DcLPEoRnuA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "esbuild": "^0.27.0", - "fdir": "^6.5.0", + "lightningcss": "^1.32.0", "picomatch": "^4.0.3", - "postcss": "^8.5.6", - "rollup": "^4.43.0", + "postcss": "^8.5.8", + "rolldown": "1.0.0-rc.11", "tinyglobby": "^0.2.15" }, "bin": { @@ -6837,9 +6597,10 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", + "@vitejs/devtools": "^0.1.0", + "esbuild": "^0.27.0", "jiti": ">=1.21.0", "less": "^4.0.0", - "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", @@ -6852,13 +6613,16 @@ "@types/node": { "optional": true }, - "jiti": { + "@vitejs/devtools": { "optional": true }, - "less": { + "esbuild": { + "optional": true + }, + "jiti": { "optional": true }, - "lightningcss": { + "less": { "optional": true }, "sass": { @@ -6884,31 +6648,12 @@ } } }, - "node_modules/vite/node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, "node_modules/vite/node_modules/picomatch": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -6917,32 +6662,32 @@ } }, "node_modules/vitest": { - "version": "4.0.18", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.0.18.tgz", - "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.1.tgz", + "integrity": "sha512-yF+o4POL41rpAzj5KVILUxm1GCjKnELvaqmU9TLLUbMfDzuN0UpUR9uaDs+mCtjPe+uYPksXDRLQGGPvj1cTmA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@vitest/expect": "4.0.18", - "@vitest/mocker": "4.0.18", - "@vitest/pretty-format": "4.0.18", - "@vitest/runner": "4.0.18", - "@vitest/snapshot": "4.0.18", - "@vitest/spy": "4.0.18", - "@vitest/utils": "4.0.18", - "es-module-lexer": "^1.7.0", - "expect-type": "^1.2.2", + "@vitest/expect": "4.1.1", + "@vitest/mocker": "4.1.1", + "@vitest/pretty-format": "4.1.1", + "@vitest/runner": "4.1.1", + "@vitest/snapshot": "4.1.1", + "@vitest/spy": "4.1.1", + "@vitest/utils": "4.1.1", + "es-module-lexer": "^2.0.0", + "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", - "std-env": "^3.10.0", + "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.0.3", - "vite": "^6.0.0 || ^7.0.0", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "bin": { @@ -6958,12 +6703,13 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.0.18", - "@vitest/browser-preview": "4.0.18", - "@vitest/browser-webdriverio": "4.0.18", - "@vitest/ui": "4.0.18", + "@vitest/browser-playwright": "4.1.1", + "@vitest/browser-preview": "4.1.1", + "@vitest/browser-webdriverio": "4.1.1", + "@vitest/ui": "4.1.1", "happy-dom": "*", - "jsdom": "*" + "jsdom": "*", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "@edge-runtime/vm": { @@ -6992,6 +6738,9 @@ }, "jsdom": { "optional": true + }, + "vite": { + "optional": false } } }, diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json index 866a12934ff..252c5364a0e 100644 --- a/packages/http-client-java/package.json +++ b/packages/http-client-java/package.json @@ -49,10 +49,10 @@ "generator/http-client-generator/target/classes/PerfAutomation.jfc" ], "peerDependencies": { - "@azure-tools/typespec-autorest": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.66.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.66.1 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.66.1 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.66.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.66.3 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.66.4 <1.0.0", "@typespec/compiler": "^1.10.0", "@typespec/events": ">=0.80.0 <1.0.0", "@typespec/http": "^1.10.0", @@ -69,11 +69,11 @@ "lodash": "~4.17.23" }, "devDependencies": { - "@azure-tools/typespec-autorest": "0.66.0", - "@azure-tools/typespec-azure-core": "0.66.0", + "@azure-tools/typespec-autorest": "0.66.1", + "@azure-tools/typespec-azure-core": "0.66.1", "@azure-tools/typespec-azure-resource-manager": "0.66.0", "@azure-tools/typespec-azure-rulesets": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.3", + "@azure-tools/typespec-client-generator-core": "0.66.4", "@microsoft/api-extractor": "^7.57.7", "@microsoft/api-extractor-model": "^7.33.4", "@types/js-yaml": "~4.0.9", @@ -89,11 +89,11 @@ "@typespec/streams": "0.80.0", "@typespec/versioning": "0.80.0", "@typespec/xml": "0.80.0", - "@vitest/coverage-v8": "^4.0.18", - "@vitest/ui": "^4.0.18", + "@vitest/coverage-v8": "^4.1.1", + "@vitest/ui": "^4.1.1", "c8": "~11.0.0", "rimraf": "~6.1.3", "typescript": "~6.0.2", - "vitest": "^4.0.18" + "vitest": "^4.1.1" } }