The Great Gatsby

- +

diff --git a/packages/playground/src/react/output-view/output-view.module.css b/packages/playground/src/react/output-view/output-view.module.css index 7dd38706938..b6bd903e0ef 100644 --- a/packages/playground/src/react/output-view/output-view.module.css +++ b/packages/playground/src/react/output-view/output-view.module.css @@ -18,6 +18,17 @@ min-height: 0; } +.file-viewer-content-with-breadcrumb { + display: flex; + flex-direction: column; + height: 100%; +} + +.file-viewer-content-with-breadcrumb .file-viewer-content { + flex: 1; + min-height: 0; +} + .type-graph-viewer { height: 100%; overflow-y: auto; diff --git a/packages/react-components/src/tree/tree.test.tsx b/packages/react-components/src/tree/tree.test.tsx index c7592b95ee4..96e2ee2e697 100644 --- a/packages/react-components/src/tree/tree.test.tsx +++ b/packages/react-components/src/tree/tree.test.tsx @@ -1,5 +1,5 @@ import { fireEvent, render, screen } from "@testing-library/react"; -import { expect, it } from "vitest"; +import { expect, it, vi } from "vitest"; import { Tree } from "./tree.js"; import type { TreeNode } from "./types.js"; @@ -110,3 +110,86 @@ it("use up down arrow to navigate", async () => { fireEvent.keyDown(treeNode, { key: "ArrowDown", code: "ArrowDown" }); expect(treeNode).toHaveAttribute("aria-activedescendant", nodes[0].id); }); + +it("collapse expanded directory by clicking in selectionMode=single", async () => { + render(); + const child1 = await screen.findByText("Child 1"); + + // Click to expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Click again to collapse + fireEvent.click(child1); + const nodes = await screen.findAllByRole("treeitem"); + expect(nodes).toHaveLength(2); + expect(nodes[0]).toHaveAttribute("aria-expanded", "false"); +}); + +it("collapse expanded directory by pressing space in selectionMode=single", async () => { + render(); + const treeNode = await screen.findByRole("tree"); + fireEvent.focus(treeNode); + + // Space to expand (focus defaults to first item: Child 1) + fireEvent.keyDown(treeNode, { key: "Space", code: "Space" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Space again to collapse (focus stays on Child 1) + fireEvent.keyDown(treeNode, { key: "Space", code: "Space" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); +}); + +it("collapse expanded directory by pressing enter in selectionMode=single", async () => { + render(); + const treeNode = await screen.findByRole("tree"); + fireEvent.focus(treeNode); + + // Enter to expand + fireEvent.keyDown(treeNode, { key: "Enter", code: "Enter" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Enter again to collapse + fireEvent.keyDown(treeNode, { key: "Enter", code: "Enter" }); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); +}); + +it("expand-collapse round trip by clicking in selectionMode=single", async () => { + render(); + const child1 = await screen.findByText("Child 1"); + + // Expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); + + // Collapse + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(2); + + // Re-expand + fireEvent.click(child1); + expect(await screen.findAllByRole("treeitem")).toHaveLength(5); +}); + +it("clicking a file in selectionMode=single still selects it", async () => { + const onSelect = vi.fn(); + render(); + + // Expand Child 1 first + const child1 = await screen.findByText("Child 1"); + fireEvent.click(child1); + + // Click a leaf node + const subChild = await screen.findByText("Sub child 1.2"); + fireEvent.click(subChild); + expect(onSelect).toHaveBeenCalledWith("$.child1.2"); +}); + +it("clicking a directory in selectionMode=single fires onSelect", async () => { + const onSelect = vi.fn(); + render(); + + const child1 = await screen.findByText("Child 1"); + fireEvent.click(child1); + expect(onSelect).toHaveBeenCalledWith("$.child1"); +}); diff --git a/packages/react-components/src/tree/tree.tsx b/packages/react-components/src/tree/tree.tsx index a796d807d38..9922f60b4ea 100644 --- a/packages/react-components/src/tree/tree.tsx +++ b/packages/react-components/src/tree/tree.tsx @@ -60,7 +60,15 @@ export function Tree({ const activateRow = useCallback( (row: TreeRow) => { setFocusedIndex(row.index); - if (selectionMode === "none" || selectedKey === row.id) { + if (row.hasChildren) { + // Always toggle expand/collapse for parent nodes regardless of selection state. + // Note: the useEffect that auto-expands selectedKey only re-runs when selectedKey + // changes, so it won't interfere once a directory is already selected. + toggleExpand(row.id); + if (selectionMode === "single") { + setSelectedKey(row.id); + } + } else if (selectionMode === "none" || selectedKey === row.id) { toggleExpand(row.id); } else { expand(row.id); From 0b83fa0f7db2a42205d5187f862ef13098758700 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Mon, 16 Mar 2026 13:09:13 +0800 Subject: [PATCH 015/137] http-client-java, fix list result property in parent (#10017) issue from billing service https://github.com/Azure/azure-rest-api-specs/pull/40073 --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- ...x-property-in-parent-2026-2-13-15-41-25.md | 7 + .../emitter/src/code-model-builder.ts | 4 +- .../emitter/src/operation-utils.ts | 7 + .../generator/core/mapper/ObjectMapper.java | 20 +- .../fluent/ItemsClient.java | 68 +++ .../models/ListResultSummary2Inner.java | 132 +++++ .../implementation/ItemsClientImpl.java | 494 ++++++++++++++++++ .../implementation/ItemsImpl.java | 35 ++ .../ListResultSummary2Impl.java | 48 ++ .../implementation/models/ListResult.java | 26 +- .../models/ListResultSummary.java | 131 +++++ .../models/Items.java | 61 +++ .../models/ListResult2.java | 133 +++++ .../models/ListResultSummary2.java | 41 ++ ...styleserialization-generated_metadata.json | 2 +- .../PagedModelPackageTests.java | 28 + .../tsp/arm-stream-style-serialization.tsp | 32 ++ 17 files changed, 1261 insertions(+), 8 deletions(-) create mode 100644 .chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java create mode 100644 packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java diff --git a/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md b/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md new file mode 100644 index 00000000000..b3858ae042e --- /dev/null +++ b/.chronus/changes/http-client-java_fix-property-in-parent-2026-2-13-15-41-25.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/http-client-java" +--- + +Fix result segments like "value" not found if defined in parent model. \ No newline at end of file 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 78831b23431..d7af84fcafd 100644 --- a/packages/http-client-java/emitter/src/code-model-builder.ts +++ b/packages/http-client-java/emitter/src/code-model-builder.ts @@ -1886,9 +1886,7 @@ export class CodeModelBuilder { // group schema - // TODO: double check this suppression - // eslint-disable-next-line no-useless-assignment - let coreNamespace = this.namespace; + let coreNamespace; if (this.isAzureV1()) { coreNamespace = "com.azure.core.http"; } else { diff --git a/packages/http-client-java/emitter/src/operation-utils.ts b/packages/http-client-java/emitter/src/operation-utils.ts index 38c4d532b09..1b130748324 100644 --- a/packages/http-client-java/emitter/src/operation-utils.ts +++ b/packages/http-client-java/emitter/src/operation-utils.ts @@ -224,6 +224,13 @@ export function findResponsePropertySegments( const propertyArray: Property[] = []; let currentSchemaProperties: Property[] | undefined = schema.properties; + if (currentSchemaProperties && schema.parents && schema.parents.all) { + for (const parent of schema.parents.all) { + if (parent instanceof ObjectSchema && parent.properties) { + currentSchemaProperties = currentSchemaProperties.concat(parent.properties); + } + } + } for (const propertySegment of propertySegments) { // abort if no properties in current schema. this should not happen though if (!currentSchemaProperties) { 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 67e19dae5fc..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 (isPageModel(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 @@ -137,10 +137,26 @@ protected boolean isInnerModel(ObjectSchema compositeType) { * @param compositeType object type * @return whether the type is a Page model. */ - private static boolean isPageModel(ObjectSchema compositeType) { + 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/tsptest/armstreamstyleserialization/fluent/ItemsClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/ItemsClient.java index b12428994a8..7241457923f 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 @@ -7,7 +7,9 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceMethod; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Result; /** @@ -35,4 +37,70 @@ public interface ItemsClient { */ @ServiceMethod(returns = ReturnType.COLLECTION) PagedIterable list(Context context); + + /** + * The summary 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 summary(); + + /** + * The summary 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 summary(Context context); + + /** + * The list2 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 list2(); + + /** + * The list2 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 list2(Context context); + + /** + * The summary2 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 response body along with {@link Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + Response summary2WithResponse(Context context); + + /** + * The summary2 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 response. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + ListResultSummary2Inner summary2(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java new file mode 100644 index 00000000000..98b509fdb1c --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/fluent/models/ListResultSummary2Inner.java @@ -0,0 +1,132 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.fluent.models; + +import com.azure.core.annotation.Immutable; +import com.azure.core.util.logging.ClientLogger; +import com.azure.json.JsonReader; +import com.azure.json.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.ListResult2; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary2 model. + */ +@Immutable +public final class ListResultSummary2Inner extends ListResult2 { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary2Inner class. + */ + private ListResultSummary2Inner() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary2Inner")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary2Inner.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary2Inner from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary2Inner 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 ListResultSummary2Inner. + */ + public static ListResultSummary2Inner fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary2Inner deserializedListResultSummary2Inner = new ListResultSummary2Inner(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary2Inner.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary2Inner.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary2Inner.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary2Inner; + }); + } +} 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 70d6dc0ac48..1422e8b2dc5 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 @@ -30,7 +30,10 @@ import reactor.core.publisher.Flux; 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.ListResult2; import tsptest.armstreamstyleserialization.models.Result; /** @@ -78,6 +81,48 @@ Mono>> list(@HostParam("endpoint") String endpoint, Response listSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summarySync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> list2(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/list2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response list2Sync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, + Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono> summary2(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/items/summary2") + @ExpectedResponses({ 200 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response summary2Sync(@HostParam("endpoint") String endpoint, + @HeaderParam("Accept") String accept, Context context); + @Headers({ "Content-Type: application/json" }) @Get("{nextLink}") @ExpectedResponses({ 200 }) @@ -91,6 +136,34 @@ Mono> listNext(@PathParam(value = "nextLink", encoded = tru @UnexpectedResponseExceptionType(ManagementException.class) Response listNextSync(@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> summaryNext(@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 summaryNextSync(@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> list2Next(@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 list2NextSync(@PathParam(value = "nextLink", encoded = true) String nextLink, + @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context); } /** @@ -208,6 +281,269 @@ public PagedIterable list(Context context) { return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context)); } + /** + * The summary 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> summarySinglePageAsync() { + 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.summary(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 summary 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 summaryAsync() { + return new PagedFlux<>(() -> summarySinglePageAsync(), nextLink -> summaryNextSinglePageAsync(nextLink)); + } + + /** + * The summary 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 summarySinglePage() { + 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.summarySync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary 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 summarySinglePage(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.summarySync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The summary 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 summary() { + return new PagedIterable<>(() -> summarySinglePage(), nextLink -> summaryNextSinglePage(nextLink)); + } + + /** + * The summary 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 summary(Context context) { + return new PagedIterable<>(() -> summarySinglePage(context), + nextLink -> summaryNextSinglePage(nextLink, context)); + } + + /** + * The list2 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> list2SinglePageAsync() { + 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.list2(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 list2 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 list2Async() { + return new PagedFlux<>(() -> list2SinglePageAsync(), nextLink -> list2NextSinglePageAsync(nextLink)); + } + + /** + * The list2 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 list2SinglePage() { + 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.list2Sync(this.client.getEndpoint(), accept, Context.NONE); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list2 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 list2SinglePage(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.list2Sync(this.client.getEndpoint(), accept, context); + return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().items(), + res.getValue().nextLink(), null); + } + + /** + * The list2 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 list2() { + return new PagedIterable<>(() -> list2SinglePage(), nextLink -> list2NextSinglePage(nextLink)); + } + + /** + * The list2 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 list2(Context context) { + return new PagedIterable<>(() -> list2SinglePage(context), nextLink -> list2NextSinglePage(nextLink, context)); + } + + /** + * The summary2 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 Response} on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> summary2WithResponseAsync() { + 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.summary2(this.client.getEndpoint(), accept, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + + /** + * The summary2 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 on successful completion of {@link Mono}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono summary2Async() { + return summary2WithResponseAsync().flatMap(res -> Mono.justOrEmpty(res.getValue())); + } + + /** + * The summary2 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 Response}. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response summary2WithResponse(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"; + return service.summary2Sync(this.client.getEndpoint(), accept, context); + } + + /** + * The summary2 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. + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public ListResultSummary2Inner summary2() { + return summary2WithResponse(Context.NONE).getValue(); + } + /** * Get the next page of items. * @@ -286,5 +622,163 @@ private PagedResponse listNextSinglePage(String nextLink, Context contex 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> summaryNextSinglePageAsync(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.summaryNext(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 summaryNextSinglePage(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.summaryNextSync(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 summaryNextSinglePage(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.summaryNextSync(nextLink, this.client.getEndpoint(), accept, context); + 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. + * @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> list2NextSinglePageAsync(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.list2Next(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 list2NextSinglePage(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.list2NextSync(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 list2NextSinglePage(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.list2NextSync(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 37ad1648542..cf6522d43c1 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 @@ -5,10 +5,14 @@ package tsptest.armstreamstyleserialization.implementation; import com.azure.core.http.rest.PagedIterable; +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; import tsptest.armstreamstyleserialization.fluent.ItemsClient; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; import tsptest.armstreamstyleserialization.models.Items; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; import tsptest.armstreamstyleserialization.models.Result; public final class ItemsImpl implements Items { @@ -32,6 +36,37 @@ public PagedIterable list(Context context) { return this.serviceClient().list(context); } + public PagedIterable summary() { + return this.serviceClient().summary(); + } + + public PagedIterable summary(Context context) { + return this.serviceClient().summary(context); + } + + public PagedIterable list2() { + return this.serviceClient().list2(); + } + + public PagedIterable list2(Context context) { + return this.serviceClient().list2(context); + } + + public Response summary2WithResponse(Context context) { + Response inner = this.serviceClient().summary2WithResponse(context); + return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(), + new ListResultSummary2Impl(inner.getValue(), this.manager())); + } + + public ListResultSummary2 summary2() { + ListResultSummary2Inner inner = this.serviceClient().summary2(); + if (inner != null) { + return new ListResultSummary2Impl(inner, this.manager()); + } else { + return null; + } + } + private ItemsClient serviceClient() { return this.innerClient; } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java new file mode 100644 index 00000000000..c5fe07fbb58 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/ListResultSummary2Impl.java @@ -0,0 +1,48 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) TypeSpec Code Generator. + +package tsptest.armstreamstyleserialization.implementation; + +import java.util.Collections; +import java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.models.ListResultSummary2; +import tsptest.armstreamstyleserialization.models.Result; + +public final class ListResultSummary2Impl implements ListResultSummary2 { + private ListResultSummary2Inner innerObject; + + private final tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager; + + ListResultSummary2Impl(ListResultSummary2Inner innerObject, + tsptest.armstreamstyleserialization.ArmResourceProviderManager serviceManager) { + this.innerObject = innerObject; + this.serviceManager = serviceManager; + } + + public List items() { + List inner = this.innerModel().items(); + if (inner != null) { + return Collections.unmodifiableList(inner); + } else { + return Collections.emptyList(); + } + } + + public String nextLink() { + return this.innerModel().nextLink(); + } + + public String summary() { + return this.innerModel().summary(); + } + + public ListResultSummary2Inner innerModel() { + return this.innerObject; + } + + private tsptest.armstreamstyleserialization.ArmResourceProviderManager manager() { + return this.serviceManager; + } +} 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 index af772cd80e7..0d612e3c14c 100644 --- 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 @@ -18,7 +18,7 @@ * The ListResult model. */ @Immutable -public final class ListResult implements JsonSerializable { +public class ListResult implements JsonSerializable { /* * The items property. */ @@ -32,7 +32,7 @@ public final class ListResult implements JsonSerializable { /** * Creates an instance of ListResult class. */ - private ListResult() { + protected ListResult() { } /** @@ -44,6 +44,17 @@ 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. * @@ -53,6 +64,17 @@ 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. * 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 new file mode 100644 index 00000000000..04710cf983f --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/implementation/models/ListResultSummary.java @@ -0,0 +1,131 @@ +// 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.JsonToken; +import com.azure.json.JsonWriter; +import java.io.IOException; +import java.util.List; +import tsptest.armstreamstyleserialization.models.Result; + +/** + * The ListResultSummary model. + */ +@Immutable +public final class ListResultSummary extends ListResult { + /* + * The summary property. + */ + private String summary; + + /* + * The nextLink property. + */ + private String nextLink; + + /* + * The items property. + */ + private List items; + + /** + * Creates an instance of ListResultSummary class. + */ + private ListResultSummary() { + } + + /** + * Get the summary property: The summary property. + * + * @return the summary value. + */ + public String summary() { + return this.summary; + } + + /** + * Get the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + @Override + public String nextLink() { + return this.nextLink; + } + + /** + * Get the items property: The items property. + * + * @return the items value. + */ + @Override + public List items() { + return this.items; + } + + /** + * Validates the instance. + * + * @throws IllegalArgumentException thrown if the instance is not valid. + */ + @Override + public void validate() { + if (items() == null) { + throw LOGGER.atError() + .log(new IllegalArgumentException("Missing required property items in model ListResultSummary")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResultSummary.class); + + /** + * {@inheritDoc} + */ + @Override + public JsonWriter toJson(JsonWriter jsonWriter) throws IOException { + jsonWriter.writeStartObject(); + jsonWriter.writeArrayField("items", items(), (writer, element) -> writer.writeJson(element)); + jsonWriter.writeStringField("nextLink", nextLink()); + jsonWriter.writeStringField("summary", this.summary); + return jsonWriter.writeEndObject(); + } + + /** + * Reads an instance of ListResultSummary from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResultSummary 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 ListResultSummary. + */ + public static ListResultSummary fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResultSummary deserializedListResultSummary = new ListResultSummary(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResultSummary.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResultSummary.nextLink = reader.getString(); + } else if ("summary".equals(fieldName)) { + deserializedListResultSummary.summary = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResultSummary; + }); + } +} 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 819aef6f3a4..e6a0925190c 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 @@ -5,6 +5,7 @@ package tsptest.armstreamstyleserialization.models; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.http.rest.Response; import com.azure.core.util.Context; /** @@ -30,4 +31,64 @@ public interface Items { * @return the paginated response with {@link PagedIterable}. */ PagedIterable list(Context context); + + /** + * The summary 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 summary(); + + /** + * The summary 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 summary(Context context); + + /** + * The list2 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 list2(); + + /** + * The list2 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 list2(Context context); + + /** + * The summary2 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 response body along with {@link Response}. + */ + Response summary2WithResponse(Context context); + + /** + * The summary2 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 response. + */ + ListResultSummary2 summary2(); } diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.java new file mode 100644 index 00000000000..27bdf410dd3 --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResult2.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.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; + +/** + * The ListResult2 model. + */ +@Immutable +public class ListResult2 implements JsonSerializable { + /* + * The items property. + */ + private List items; + + /* + * The nextLink property. + */ + private String nextLink; + + /** + * Creates an instance of ListResult2 class. + */ + protected ListResult2() { + } + + /** + * 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 ListResult2 object itself. + */ + ListResult2 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 ListResult2 object itself. + */ + ListResult2 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 ListResult2")); + } else { + items().forEach(e -> e.validate()); + } + } + + private static final ClientLogger LOGGER = new ClientLogger(ListResult2.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 ListResult2 from the JsonReader. + * + * @param jsonReader The JsonReader being read. + * @return An instance of ListResult2 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 ListResult2. + */ + public static ListResult2 fromJson(JsonReader jsonReader) throws IOException { + return jsonReader.readObject(reader -> { + ListResult2 deserializedListResult2 = new ListResult2(); + while (reader.nextToken() != JsonToken.END_OBJECT) { + String fieldName = reader.getFieldName(); + reader.nextToken(); + + if ("items".equals(fieldName)) { + List items = reader.readArray(reader1 -> Result.fromJson(reader1)); + deserializedListResult2.items = items; + } else if ("nextLink".equals(fieldName)) { + deserializedListResult2.nextLink = reader.getString(); + } else { + reader.skipChildren(); + } + } + + return deserializedListResult2; + }); + } +} diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java new file mode 100644 index 00000000000..5bd683003ca --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/tsptest/armstreamstyleserialization/models/ListResultSummary2.java @@ -0,0 +1,41 @@ +// 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 java.util.List; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; + +/** + * An immutable client-side representation of ListResultSummary2. + */ +public interface ListResultSummary2 { + /** + * Gets the items property: The items property. + * + * @return the items value. + */ + List items(); + + /** + * Gets the nextLink property: The nextLink property. + * + * @return the nextLink value. + */ + String nextLink(); + + /** + * Gets the summary property: The summary property. + * + * @return the summary value. + */ + String summary(); + + /** + * Gets the inner tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner object. + * + * @return the inner object. + */ + ListResultSummary2Inner innerModel(); +} 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 93722034665..54b44af1b89 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.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.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.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.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/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/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/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/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.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 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 new file mode 100644 index 00000000000..2be886de28d --- /dev/null +++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/tsptest/armstreamstyleserialization/PagedModelPackageTests.java @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package tsptest.armstreamstyleserialization; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import tsptest.armstreamstyleserialization.fluent.models.ListResultSummary2Inner; +import tsptest.armstreamstyleserialization.implementation.models.ListResult; +import tsptest.armstreamstyleserialization.implementation.models.ListResultSummary; +import tsptest.armstreamstyleserialization.models.ListResult2; + +public class PagedModelPackageTests { + + @Test + public void testPagedModelPackage() { + Assertions.assertTrue(isInImplementationModels(ListResult.class)); + Assertions.assertTrue(isInImplementationModels(ListResultSummary.class)); + + // ListResult2 not in implementation, because its child ListResultSummary2(Inner) is PUBLIC + Assertions.assertFalse(isInImplementationModels(ListResult2.class)); + Assertions.assertFalse(isInImplementationModels(ListResultSummary2Inner.class)); + } + + private static boolean isInImplementationModels(Class clazz) { + return clazz.getPackage().getName().endsWith(".implementation.models"); + } +} 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 c7dfd61b3d2..a240bd8ee1a 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 @@ -264,6 +264,25 @@ interface Items { @get @list list(): ListResult & ArmLroLocationHeader; + + @get + @list + @route("summary") + summary(): ListResultSummary; + + @get + @list + @route("list2") + list2(): ListResult2; + + @get + @route("summary2") + summary2(): ListResultSummary2; +} + +// model does not contain `@pageItems` property, but inherit them from parent +model ListResultSummary extends ListResult { + summary?: string; } model ListResult { @@ -274,6 +293,19 @@ model ListResult { nextLink?: string; } +// This paged model need to be public (instead of in "implementation" package), as its child ListResultSummary2 is public +model ListResult2 { + @pageItems + items: Result[]; + + @nextLink + nextLink?: string; +} + +model ListResultSummary2 extends ListResult2 { + summary?: string; +} + model Result { name: string; From 40ec2015af1fc256c33d001b9303a053bb0103e0 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 07:23:08 +0000 Subject: [PATCH 016/137] [python] Add PUT test coverage for XML ModelWithDatetime scenario (#10035) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `test_model_with_datetime` test only covered GET but was missing the PUT operation — the only XML payload test without round-trip coverage. PR #9995 fixed the Spector server to accept both `2022-08-26T18:38:00.000Z` and `2022-08-26T18:38:00Z` forms, unblocking the PUT test. - **Test changes**: Added `client.model_with_datetime_value.put(model)` to both sync and async `test_model_with_datetime` tests in `generic_mock_api_tests/` - **Dependency bump**: `@typespec/http-specs` → `0.1.0-alpha.35-dev.1`, `@typespec/spec-api` → `0.1.0-alpha.14-dev.1` (includes the server-side datetime validation fix)

Original prompt

> > ---- > > *This section details on the original issue you should resolve* > > [python] add test case for https://github.com/microsoft/typespec/pull/9995 > > follow skill https://github.com/microsoft/typespec/blob/main/.github/skills/python-sdk-spector-mock-api-tests/SKILL.md to write test case for https://github.com/microsoft/typespec/pull/9995 > > > ## Comments on the Issue (you are @copilot in this section) > > > >

- Fixes microsoft/typespec#10028 --- 💬 Send tasks to Copilot coding agent from [Slack](https://gh.io/cca-slack-docs) and [Teams](https://gh.io/cca-teams-docs) to turn conversations into code. Copilot posts an update in your thread when it's finished. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com> Co-authored-by: Yuchao Yan --- ...d-xml-datetime-put-test-2026-3-16-3-9-2.md | 7 +++++ .../asynctests/test_payload_xml_async.py | 1 + .../test_payload_xml.py | 1 + packages/http-client-python/package-lock.json | 30 +++++++++---------- packages/http-client-python/package.json | 4 +-- 5 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 .chronus/changes/add-xml-datetime-put-test-2026-3-16-3-9-2.md diff --git a/.chronus/changes/add-xml-datetime-put-test-2026-3-16-3-9-2.md b/.chronus/changes/add-xml-datetime-put-test-2026-3-16-3-9-2.md new file mode 100644 index 00000000000..9da462bf509 --- /dev/null +++ b/.chronus/changes/add-xml-datetime-put-test-2026-3-16-3-9-2.md @@ -0,0 +1,7 @@ +--- +changeKind: internal +packages: + - "@typespec/http-client-python" +--- + +Add PUT test coverage for `ModelWithDatetime` XML payload scenario and bump `@typespec/http-specs`/`@typespec/spec-api` dependencies to include the datetime validation fix from PR #9995. diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py b/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py index 7d88ecbbb5c..0cfccaee38a 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py +++ b/packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_payload_xml_async.py @@ -138,6 +138,7 @@ async def test_model_with_datetime(client: XmlClient): result = await client.model_with_datetime_value.get() assert result.rfc3339 == model.rfc3339 assert result.rfc7231 == model.rfc7231 + await client.model_with_datetime_value.put(model) @pytest.mark.asyncio diff --git a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py b/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py index a1918285168..22f1c6f7c79 100644 --- a/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py +++ b/packages/http-client-python/generator/test/generic_mock_api_tests/test_payload_xml.py @@ -124,6 +124,7 @@ def test_model_with_datetime(client: XmlClient): result = client.model_with_datetime_value.get() assert result.rfc3339 == model.rfc3339 assert result.rfc7231 == model.rfc7231 + client.model_with_datetime_value.put(model) def test_xml_error_value(client: XmlClient, core_library): diff --git a/packages/http-client-python/package-lock.json b/packages/http-client-python/package-lock.json index 3fa3f6f20e8..c2f0190749c 100644 --- a/packages/http-client-python/package-lock.json +++ b/packages/http-client-python/package-lock.json @@ -29,10 +29,10 @@ "@typespec/compiler": "^1.10.0", "@typespec/events": "~0.80.0", "@typespec/http": "^1.10.0", - "@typespec/http-specs": "0.1.0-alpha.34", + "@typespec/http-specs": "0.1.0-alpha.35-dev.1", "@typespec/openapi": "^1.10.0", "@typespec/rest": "~0.80.0", - "@typespec/spec-api": "0.1.0-alpha.13", + "@typespec/spec-api": "0.1.0-alpha.14-dev.1", "@typespec/spector": "0.1.0-alpha.24", "@typespec/sse": "~0.80.0", "@typespec/streams": "~0.80.0", @@ -2492,25 +2492,25 @@ } }, "node_modules/@typespec/http-specs": { - "version": "0.1.0-alpha.34", - "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.34.tgz", - "integrity": "sha512-xyOOFVUjBgZLYeDaoaZ6Mj6DoLjvDhhUvSRZIpWroAUHL+P30XR2wZ6dKLtOgF9uPn7S2MvpSvAAs4Z+mYh9YQ==", + "version": "0.1.0-alpha.35-dev.1", + "resolved": "https://registry.npmjs.org/@typespec/http-specs/-/http-specs-0.1.0-alpha.35-dev.1.tgz", + "integrity": "sha512-sL3Q9Nmgim1YdHiKTaO1bdaUdPIV+1o1HIT8VbTfgEPresdgxJSp2Mll5uehIoiDzGZ3M11Ka/Lrdijr5VRYiA==", "dev": true, "license": "MIT", "dependencies": { - "@typespec/spec-api": "^0.1.0-alpha.13", - "@typespec/spector": "^0.1.0-alpha.24", + "@typespec/spec-api": "^0.1.0-alpha.13 || >= 0.1.0-alpha.14-dev.1", + "@typespec/spector": "^0.1.0-alpha.24 || >= 0.1.0-dev.0", "deep-equal": "^2.2.0" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@typespec/compiler": "^1.10.0", - "@typespec/http": "^1.10.0", - "@typespec/rest": "^0.80.0", - "@typespec/versioning": "^0.80.0", - "@typespec/xml": "^0.80.0" + "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.0", + "@typespec/http": "^1.10.0 || >= 1.11.0-dev.0", + "@typespec/rest": "^0.80.0 || >= 0.81.0-dev.0", + "@typespec/versioning": "^0.80.0 || >= 0.81.0-dev.0", + "@typespec/xml": "^0.80.0 || >= 0.81.0-dev.0" } }, "node_modules/@typespec/openapi": { @@ -2542,9 +2542,9 @@ } }, "node_modules/@typespec/spec-api": { - "version": "0.1.0-alpha.13", - "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.13.tgz", - "integrity": "sha512-ed0qqGM92vKuangmENUYMeDQZpSlsEMYdeH7+wMl+bIgXzfZ7yv07fNwcmROzSEJd0CzdCTgz+Hp+ifmR4USNQ==", + "version": "0.1.0-alpha.14-dev.1", + "resolved": "https://registry.npmjs.org/@typespec/spec-api/-/spec-api-0.1.0-alpha.14-dev.1.tgz", + "integrity": "sha512-rRgTovGml78TbfHdpphzQDiZOyhgfCZE7U3GXF4PjFl3MXG5WWVGhL6s8gSGvfuwaOVO+lbMp5YKuNtJhy3zHw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/packages/http-client-python/package.json b/packages/http-client-python/package.json index 68081dda5c8..c5305783f37 100644 --- a/packages/http-client-python/package.json +++ b/packages/http-client-python/package.json @@ -90,11 +90,11 @@ "@typespec/versioning": "~0.80.0", "@typespec/events": "~0.80.0", "@typespec/spector": "0.1.0-alpha.24", - "@typespec/spec-api": "0.1.0-alpha.13", + "@typespec/spec-api": "0.1.0-alpha.14-dev.1", "@typespec/sse": "~0.80.0", "@typespec/streams": "~0.80.0", "@typespec/xml": "~0.80.0", - "@typespec/http-specs": "0.1.0-alpha.34", + "@typespec/http-specs": "0.1.0-alpha.35-dev.1", "@types/js-yaml": "~4.0.5", "@types/node": "~25.0.2", "@types/semver": "7.5.8", From 3816fa366388a391432f5eb4d0d3c2063ba80d16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:18:14 +0800 Subject: [PATCH 017/137] Bump tar from 7.5.9 to 7.5.11 in /packages/http-client-python (#9996) Bumps [tar](https://github.com/isaacs/node-tar) from 7.5.9 to 7.5.11.

Commits

bf776f6 7.5.11
f48b5fa prevent escaping symlinks with drive-relative paths
97cff15 docs: more security info
2b72abc 7.5.10
7bc755d parse root off paths before sanitizing .. parts
c8cb846 update deps
See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tar&package-manager=npm_and_yarn&previous-version=7.5.9&new-version=7.5.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/microsoft/typespec/network/alerts).

Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/http-client-python/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/http-client-python/package-lock.json b/packages/http-client-python/package-lock.json index c2f0190749c..d1f50e5651a 100644 --- a/packages/http-client-python/package-lock.json +++ b/packages/http-client-python/package-lock.json @@ -6949,9 +6949,9 @@ } }, "node_modules/tar": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", - "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", + "version": "7.5.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", + "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { From d2db69234201882d86d8541e018f6535bb1bea3f Mon Sep 17 00:00:00 2001 From: Jorge Rangel <102122018+jorgerangel-msft@users.noreply.github.com> Date: Mon, 16 Mar 2026 10:29:02 -0500 Subject: [PATCH 018/137] fix: add semver dep to publish pipeline (#10030) --- packages/http-client-csharp/eng/pipeline/publish.yml | 4 ++++ .../http-client-csharp/eng/scripts/Update-PackageJson.ps1 | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/http-client-csharp/eng/pipeline/publish.yml b/packages/http-client-csharp/eng/pipeline/publish.yml index 37e8b562677..6a919676073 100644 --- a/packages/http-client-csharp/eng/pipeline/publish.yml +++ b/packages/http-client-csharp/eng/pipeline/publish.yml @@ -152,6 +152,10 @@ extends: npm install -g @azure-tools/typespec-client-generator-cli@latest displayName: Install tsp-client + - pwsh: | + npm install -g semver + displayName: Install semver + - task: PowerShell@2 displayName: Update package.json with injected dependencies inputs: diff --git a/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 b/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 index 51b800093f7..d380b73361e 100644 --- a/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 +++ b/packages/http-client-csharp/eng/scripts/Update-PackageJson.ps1 @@ -112,10 +112,9 @@ function Test-TcgcCompatibility { $tcgcRange = ($tcgcRange | Out-String).Trim() Write-Host " Requires tcgc: $tcgcRange" - $jsCode = "try{console.log(require('semver').satisfies('$TcgcVersion','$tcgcRange'))}catch(e){console.log('error')}" - $semverResult = (& node -e $jsCode 2>&1 | Out-String).Trim() + $semverResult = & npx semver -r $tcgcRange $TcgcVersion 2>&1 - if ($semverResult -eq 'true') { + if ($LASTEXITCODE -eq 0 -and $semverResult) { Write-Host " ✓ Compatible" return $true } else { @@ -295,4 +294,4 @@ try { catch { Write-Error "Script failed with error: $_" exit 1 -} \ No newline at end of file +} From 1d82575415f04cc7b36de8f5833d574a8ae5e5b6 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 16:00:16 +0000 Subject: [PATCH 019/137] Bump TCGC to 0.66.2 for http-client-csharp (#10027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump `@azure-tools/typespec-client-generator-core` from 0.66.0 to 0.66.2 in the http-client-csharp package. TCGC 0.66.2 consolidates orphan type discovery into a shared cached `listOrphanTypes`, fixing duplicate client name errors for orphan unions and unstable enum naming with versioned services. - **Dependency update**: `@azure-tools/typespec-client-generator-core` 0.66.0 → 0.66.2 in both devDependencies and peerDependencies - **Regenerated test models**: 3 tspCodeModel.json files updated with stabilized orphan type naming (`content-negotiation`, `xml`, `union`)

Original prompt

> > ---- > > *This section details on the original issue you should resolve* > > Bump TCGC to 0.66.2 > Bump TCGC to [0.66.2](https://github.com/Azure/typespec-azure/blob/main/packages/typespec-client-generator-core/CHANGELOG.md#0662) and it's related dependencies for the http-client-csharp package. > > ## Comments on the Issue (you are @copilot in this section) > > > >

- Fixes microsoft/typespec#10026 --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jorgerangel-msft <102122018+jorgerangel-msft@users.noreply.github.com> --- .../content-negotiation/tspCodeModel.json | 24 +++--- .../http/payload/xml/tspCodeModel.json | 86 +++++++++---------- .../Spector/http/type/union/tspCodeModel.json | 10 +-- packages/http-client-csharp/package-lock.json | 10 +-- packages/http-client-csharp/package.json | 4 +- 5 files changed, 67 insertions(+), 67 deletions(-) diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json index 449693b81d4..7fbd3aebb6f 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/content-negotiation/tspCodeModel.json @@ -22,7 +22,7 @@ { "$id": "3", "kind": "constant", - "name": "PngImageContentType", + "name": "GetAvatarAsPngRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -38,7 +38,7 @@ { "$id": "5", "kind": "constant", - "name": "PngImageContentType1", + "name": "GetAvatarAsPngRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -54,7 +54,7 @@ { "$id": "7", "kind": "constant", - "name": "PngImageContentType2", + "name": "GetAvatarAsPngRequestAccept2", "namespace": "", "usage": "None", "valueType": { @@ -70,7 +70,7 @@ { "$id": "9", "kind": "constant", - "name": "JpegImageContentType", + "name": "GetAvatarAsJpegRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -86,7 +86,7 @@ { "$id": "11", "kind": "constant", - "name": "JpegImageContentType1", + "name": "GetAvatarAsJpegRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -102,7 +102,7 @@ { "$id": "13", "kind": "constant", - "name": "JpegImageContentType2", + "name": "GetAvatarAsJpegRequestAccept2", "namespace": "", "usage": "None", "valueType": { @@ -118,7 +118,7 @@ { "$id": "15", "kind": "constant", - "name": "PngImageContentType3", + "name": "GetAvatarAsPngRequestAccept3", "namespace": "", "usage": "None", "valueType": { @@ -134,7 +134,7 @@ { "$id": "17", "kind": "constant", - "name": "PngImageContentType4", + "name": "GetAvatarAsPngRequestAccept4", "namespace": "", "usage": "None", "valueType": { @@ -150,7 +150,7 @@ { "$id": "19", "kind": "constant", - "name": "PngImageContentType5", + "name": "GetAvatarAsPngRequestAccept5", "namespace": "", "usage": "None", "valueType": { @@ -166,7 +166,7 @@ { "$id": "21", "kind": "constant", - "name": "PngImageAsJsonContentType1", + "name": "GetAvatarAsJsonRequestAccept", "namespace": "", "usage": "None", "valueType": { @@ -182,7 +182,7 @@ { "$id": "23", "kind": "constant", - "name": "PngImageAsJsonContentType2", + "name": "GetAvatarAsJsonRequestAccept1", "namespace": "", "usage": "None", "valueType": { @@ -198,7 +198,7 @@ { "$id": "25", "kind": "constant", - "name": "PngImageAsJsonContentType3", + "name": "GetAvatarAsJsonRequestAccept2", "namespace": "", "usage": "None", "valueType": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json index f3d3730c93e..73f60b20567 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/payload/xml/tspCodeModel.json @@ -86,7 +86,7 @@ { "$id": "8", "kind": "constant", - "name": "XmlErrorContentType", + "name": "GetResponseContentType", "namespace": "", "usage": "None", "valueType": { @@ -102,7 +102,7 @@ { "$id": "10", "kind": "constant", - "name": "XmlErrorContentType1", + "name": "GetResponseContentType1", "namespace": "", "usage": "None", "valueType": { @@ -118,7 +118,7 @@ { "$id": "12", "kind": "constant", - "name": "XmlErrorContentType2", + "name": "GetResponseContentType2", "namespace": "", "usage": "None", "valueType": { @@ -150,7 +150,7 @@ { "$id": "16", "kind": "constant", - "name": "XmlErrorContentType3", + "name": "GetResponseContentType3", "namespace": "", "usage": "None", "valueType": { @@ -166,7 +166,7 @@ { "$id": "18", "kind": "constant", - "name": "XmlErrorContentType4", + "name": "GetResponseContentType4", "namespace": "", "usage": "None", "valueType": { @@ -182,7 +182,7 @@ { "$id": "20", "kind": "constant", - "name": "XmlErrorContentType5", + "name": "GetResponseContentType5", "namespace": "", "usage": "None", "valueType": { @@ -214,7 +214,7 @@ { "$id": "24", "kind": "constant", - "name": "XmlErrorContentType6", + "name": "GetResponseContentType6", "namespace": "", "usage": "None", "valueType": { @@ -230,7 +230,7 @@ { "$id": "26", "kind": "constant", - "name": "XmlErrorContentType7", + "name": "GetResponseContentType7", "namespace": "", "usage": "None", "valueType": { @@ -246,7 +246,7 @@ { "$id": "28", "kind": "constant", - "name": "XmlErrorContentType8", + "name": "GetResponseContentType8", "namespace": "", "usage": "None", "valueType": { @@ -278,7 +278,7 @@ { "$id": "32", "kind": "constant", - "name": "XmlErrorContentType9", + "name": "GetResponseContentType9", "namespace": "", "usage": "None", "valueType": { @@ -294,7 +294,7 @@ { "$id": "34", "kind": "constant", - "name": "XmlErrorContentType10", + "name": "GetResponseContentType10", "namespace": "", "usage": "None", "valueType": { @@ -310,7 +310,7 @@ { "$id": "36", "kind": "constant", - "name": "XmlErrorContentType11", + "name": "GetResponseContentType11", "namespace": "", "usage": "None", "valueType": { @@ -342,7 +342,7 @@ { "$id": "40", "kind": "constant", - "name": "XmlErrorContentType12", + "name": "GetResponseContentType12", "namespace": "", "usage": "None", "valueType": { @@ -358,7 +358,7 @@ { "$id": "42", "kind": "constant", - "name": "XmlErrorContentType13", + "name": "GetResponseContentType13", "namespace": "", "usage": "None", "valueType": { @@ -374,7 +374,7 @@ { "$id": "44", "kind": "constant", - "name": "XmlErrorContentType14", + "name": "GetResponseContentType14", "namespace": "", "usage": "None", "valueType": { @@ -406,7 +406,7 @@ { "$id": "48", "kind": "constant", - "name": "XmlErrorContentType15", + "name": "GetResponseContentType15", "namespace": "", "usage": "None", "valueType": { @@ -422,7 +422,7 @@ { "$id": "50", "kind": "constant", - "name": "XmlErrorContentType16", + "name": "GetResponseContentType16", "namespace": "", "usage": "None", "valueType": { @@ -438,7 +438,7 @@ { "$id": "52", "kind": "constant", - "name": "XmlErrorContentType17", + "name": "GetResponseContentType17", "namespace": "", "usage": "None", "valueType": { @@ -470,7 +470,7 @@ { "$id": "56", "kind": "constant", - "name": "XmlErrorContentType18", + "name": "GetResponseContentType18", "namespace": "", "usage": "None", "valueType": { @@ -486,7 +486,7 @@ { "$id": "58", "kind": "constant", - "name": "XmlErrorContentType19", + "name": "GetResponseContentType19", "namespace": "", "usage": "None", "valueType": { @@ -502,7 +502,7 @@ { "$id": "60", "kind": "constant", - "name": "XmlErrorContentType20", + "name": "GetResponseContentType20", "namespace": "", "usage": "None", "valueType": { @@ -534,7 +534,7 @@ { "$id": "64", "kind": "constant", - "name": "XmlErrorContentType21", + "name": "GetResponseContentType21", "namespace": "", "usage": "None", "valueType": { @@ -550,7 +550,7 @@ { "$id": "66", "kind": "constant", - "name": "XmlErrorContentType22", + "name": "GetResponseContentType22", "namespace": "", "usage": "None", "valueType": { @@ -566,7 +566,7 @@ { "$id": "68", "kind": "constant", - "name": "XmlErrorContentType23", + "name": "GetResponseContentType23", "namespace": "", "usage": "None", "valueType": { @@ -598,7 +598,7 @@ { "$id": "72", "kind": "constant", - "name": "XmlErrorContentType24", + "name": "GetResponseContentType24", "namespace": "", "usage": "None", "valueType": { @@ -614,7 +614,7 @@ { "$id": "74", "kind": "constant", - "name": "XmlErrorContentType25", + "name": "GetResponseContentType25", "namespace": "", "usage": "None", "valueType": { @@ -630,7 +630,7 @@ { "$id": "76", "kind": "constant", - "name": "XmlErrorContentType26", + "name": "GetResponseContentType26", "namespace": "", "usage": "None", "valueType": { @@ -662,7 +662,7 @@ { "$id": "80", "kind": "constant", - "name": "XmlErrorContentType27", + "name": "GetResponseContentType27", "namespace": "", "usage": "None", "valueType": { @@ -678,7 +678,7 @@ { "$id": "82", "kind": "constant", - "name": "XmlErrorContentType28", + "name": "GetResponseContentType28", "namespace": "", "usage": "None", "valueType": { @@ -694,7 +694,7 @@ { "$id": "84", "kind": "constant", - "name": "XmlErrorContentType29", + "name": "GetResponseContentType29", "namespace": "", "usage": "None", "valueType": { @@ -726,7 +726,7 @@ { "$id": "88", "kind": "constant", - "name": "XmlErrorContentType30", + "name": "GetResponseContentType30", "namespace": "", "usage": "None", "valueType": { @@ -742,7 +742,7 @@ { "$id": "90", "kind": "constant", - "name": "XmlErrorContentType31", + "name": "GetResponseContentType31", "namespace": "", "usage": "None", "valueType": { @@ -758,7 +758,7 @@ { "$id": "92", "kind": "constant", - "name": "XmlErrorContentType32", + "name": "GetResponseContentType32", "namespace": "", "usage": "None", "valueType": { @@ -790,7 +790,7 @@ { "$id": "96", "kind": "constant", - "name": "XmlErrorContentType33", + "name": "GetResponseContentType33", "namespace": "", "usage": "None", "valueType": { @@ -806,7 +806,7 @@ { "$id": "98", "kind": "constant", - "name": "XmlErrorContentType34", + "name": "GetResponseContentType34", "namespace": "", "usage": "None", "valueType": { @@ -822,7 +822,7 @@ { "$id": "100", "kind": "constant", - "name": "XmlErrorContentType35", + "name": "GetResponseContentType35", "namespace": "", "usage": "None", "valueType": { @@ -854,7 +854,7 @@ { "$id": "104", "kind": "constant", - "name": "XmlErrorContentType36", + "name": "GetResponseContentType36", "namespace": "", "usage": "None", "valueType": { @@ -870,7 +870,7 @@ { "$id": "106", "kind": "constant", - "name": "XmlErrorContentType37", + "name": "GetResponseContentType37", "namespace": "", "usage": "None", "valueType": { @@ -886,7 +886,7 @@ { "$id": "108", "kind": "constant", - "name": "XmlErrorContentType38", + "name": "GetResponseContentType38", "namespace": "", "usage": "None", "valueType": { @@ -918,7 +918,7 @@ { "$id": "112", "kind": "constant", - "name": "XmlErrorContentType39", + "name": "GetResponseContentType39", "namespace": "", "usage": "None", "valueType": { @@ -934,7 +934,7 @@ { "$id": "114", "kind": "constant", - "name": "XmlErrorContentType40", + "name": "GetResponseContentType40", "namespace": "", "usage": "None", "valueType": { @@ -950,7 +950,7 @@ { "$id": "116", "kind": "constant", - "name": "XmlErrorContentType41", + "name": "GetResponseContentType41", "namespace": "", "usage": "None", "valueType": { @@ -982,7 +982,7 @@ { "$id": "120", "kind": "constant", - "name": "XmlErrorContentType42", + "name": "GetResponseContentType42", "namespace": "", "usage": "None", "valueType": { diff --git a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json index 7b5c6d926d3..2c21b31efe3 100644 --- a/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json +++ b/packages/http-client-csharp/generator/TestProjects/Spector/http/type/union/tspCodeModel.json @@ -394,7 +394,7 @@ { "$id": "34", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral1", + "name": "GetResponseProp5", "namespace": "", "usage": "None", "valueType": { @@ -410,7 +410,7 @@ { "$id": "36", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral2", + "name": "GetResponseProp6", "namespace": "", "usage": "None", "valueType": { @@ -426,7 +426,7 @@ { "$id": "38", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral3", + "name": "GetResponseProp7", "namespace": "", "usage": "None", "valueType": { @@ -442,7 +442,7 @@ { "$id": "40", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral4", + "name": "MixedLiteralsCasesStringLiteral1", "namespace": "", "usage": "None", "valueType": { @@ -458,7 +458,7 @@ { "$id": "42", "kind": "constant", - "name": "MixedLiteralsCasesStringLiteral11", + "name": "GetResponseProp51", "namespace": "", "usage": "None", "valueType": { diff --git a/packages/http-client-csharp/package-lock.json b/packages/http-client-csharp/package-lock.json index 3f4c49f696c..e8812c1af42 100644 --- a/packages/http-client-csharp/package-lock.json +++ b/packages/http-client-csharp/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@azure-tools/azure-http-specs": "0.1.0-alpha.38", "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.0", + "@azure-tools/typespec-client-generator-core": "0.66.2", "@microsoft/api-extractor": "^7.52.2", "@types/node": "~22.12.0", "@typespec/compiler": "1.10.0", @@ -35,7 +35,7 @@ "vitest": "^3.0.5" }, "peerDependencies": { - "@azure-tools/typespec-client-generator-core": ">=0.66.0 <0.67.0 || ~0.67.0-0", + "@azure-tools/typespec-client-generator-core": ">=0.66.2 <0.67.0 || ~0.67.0-0", "@typespec/compiler": "^1.10.0", "@typespec/http": "^1.10.0", "@typespec/openapi": "^1.10.0", @@ -134,9 +134,9 @@ } }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.66.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.66.0.tgz", - "integrity": "sha512-ITg9Ls1p0vr1nTM6BaeO+u3p5+jkJ6JtzomrUAhgBNQUZGsC5MIOt4leOJf8XMBCwW3WFLIRRVF86xMgamMfDA==", + "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==", "dev": true, "license": "MIT", "dependencies": { diff --git a/packages/http-client-csharp/package.json b/packages/http-client-csharp/package.json index 80f74950682..283b0f46bb1 100644 --- a/packages/http-client-csharp/package.json +++ b/packages/http-client-csharp/package.json @@ -52,7 +52,7 @@ "emitter/lib/*.tsp" ], "peerDependencies": { - "@azure-tools/typespec-client-generator-core": ">=0.66.0 <0.67.0 || ~0.67.0-0", + "@azure-tools/typespec-client-generator-core": ">=0.66.2 <0.67.0 || ~0.67.0-0", "@typespec/compiler": "^1.10.0", "@typespec/http": "^1.10.0", "@typespec/openapi": "^1.10.0", @@ -64,7 +64,7 @@ "devDependencies": { "@azure-tools/azure-http-specs": "0.1.0-alpha.38", "@azure-tools/typespec-azure-core": "0.66.0", - "@azure-tools/typespec-client-generator-core": "0.66.0", + "@azure-tools/typespec-client-generator-core": "0.66.2", "@microsoft/api-extractor": "^7.52.2", "@types/node": "~22.12.0", "@typespec/compiler": "1.10.0", From 941f190a157166581c49441580f0cb933c15f14f Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:59:30 +0000 Subject: [PATCH 020/137] fix(openapi3): anyOf with $ref + inline object incorrectly imported as model instead of union (#10041) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When `anyOf` contains a `$ref` alongside an inline object schema, the importer was discarding the `$ref` variant and emitting only a `model` from the object — losing the union semantics entirely. **Root cause**: `getTypeSpecKind` and `unwrapSingleAnyOfOneOf` filtered out `$ref` members when counting "meaningful inline members". With exactly one inline object remaining, they concluded the schema was a plain model, never checking whether `$ref` members were also present as union variants. **Fix**: - Both functions now check `hasRefMembers` before applying the single-inline-object → model shortcut - If any `$ref` members exist alongside the inline object, the schema is correctly classified as a `union` ```yaml # Input — was producing `model VoiceIdsOrCustomVoice { id: string }` VoiceIdsOrCustomVoice: anyOf: - $ref: '#/components/schemas/VoiceIdsShared' - type: object properties: id: { type: string } ``` ```tsp // Now correctly produces: union VoiceIdsOrCustomVoice { VoiceIdsShared, { id: string }, } ``` The single-inline-object → model unwrap still applies when no `$ref` members are present (e.g. `anyOf: [{type: object, ...}, {type: null}]`), preserving existing behavior.

Original prompt

> > ---- > > *This section details on the original issue you should resolve* > > import tool - composition of object + enum not handled correctly > The following OpenAPI description > > ```yaml > components: > schemas: > VoiceIdsOrCustomVoice: > title: Voice > description: | > A built-in voice name or a custom voice reference. > anyOf: > - $ref: '#/components/schemas/VoiceIdsShared' > - type: object > description: Custom voice reference. > additionalProperties: false > required: > - id > properties: > id: > type: string > VoiceIdsShared: > example: ash > anyOf: > - type: string > - type: string > enum: > - alloy > - ash > - ballad > - coral > - echo > - sage > - shimmer > - verse > - marin > - cedar > ``` > > Results in the following TypeSpec definition after import > > ```tsp > /** Custom voice reference. */ > @summary("Voice") > model VoiceIdsOrCustomVoice { > /** The custom voice ID, e.g. `voice_1234`. */ > id: string; > } > > union VoiceIdsShared { > string, > > | "alloy" > | "ash" > | "ballad" > | "coral" > | "echo" > | "sage" > | "shimmer" > | "verse" > | "marin" > | "cedar", > } > ``` > > But should really be > > ```tsp > /** Custom voice reference. */ > @summary("Voice") > union VoiceIdsOrCustomVoice { > VoiceIdsShared, > { > id: string, > }, > } > > union VoiceIdsShared { > string, > > | "alloy" > | "ash" > | "ballad" > | "coral" > | "echo" > | "sage" > | "shimmer" > | "verse" > | "marin" > | "cedar", > } > ``` > > Interestingly enough, the following input OpenAPI description works as expected even though it's more complex. > > ```yaml > components: > schemas: > VoiceIdsOrCustomVoice: > title: Voice > description: | > A built-in voice name or a custom voice reference. > anyOf: > - allOf: > - $ref: '#/components/schemas/VoiceIdsShared' > type: string > - type: object > description: Custom voice reference. > additionalProperties: false > required: > - id > properties: > id: > type: string > VoiceIdsShared: > example: ash > anyOf: > - type: string > - type: string > enum: > - alloy > - ash > - ballad > - coral > - echo > - sage > - shimmer > - verse > - marin > - cedar > ``` > > ## Comments on the Issue (you are @copilot in this section) > > > >

- Fixes microsoft/typespec#10040 --- 📍 Connect Copilot coding agent with [Jira](https://gh.io/cca-jira-docs), [Azure Boards](https://gh.io/cca-azure-boards-docs) or [Linear](https://gh.io/cca-linear-docs) to delegate work to Copilot in one click without leaving your project management tool. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: baywet <7905502+baywet@users.noreply.github.com> --- ...x-import-anyof-ref-and-object-2026-3-16.md | 7 ++ .../transforms/transform-component-schemas.ts | 18 +++- .../tsp-openapi3/anyof-ref-and-object.test.ts | 94 +++++++++++++++++++ 3 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 .chronus/changes/fix-import-anyof-ref-and-object-2026-3-16.md create mode 100644 packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts diff --git a/.chronus/changes/fix-import-anyof-ref-and-object-2026-3-16.md b/.chronus/changes/fix-import-anyof-ref-and-object-2026-3-16.md new file mode 100644 index 00000000000..43ea7d569bf --- /dev/null +++ b/.chronus/changes/fix-import-anyof-ref-and-object-2026-3-16.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/openapi3" +--- + +[importer] Fix `anyOf` with `$ref` and inline object being incorrectly imported as a model instead of a union. diff --git a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts index 81f04d3c184..e9821bbd638 100644 --- a/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts +++ b/packages/openapi3/src/cli/actions/convert/transforms/transform-component-schemas.ts @@ -316,8 +316,13 @@ function unwrapSingleAnyOfOneOf( return (member as any).type !== "null"; }); - // If there's exactly one meaningful inline member AND it's an object type, unwrap it - if (meaningfulInlineMembers.length === 1) { + // Check if there are any $ref members in the union alongside the inline members + const hasRefMembers = unionMembers.some((member) => "$ref" in member); + + // If there's exactly one meaningful inline member AND it's an object type + // AND there are no $ref members alongside it, unwrap it. + // If $ref members are present, the schema is truly a union (e.g. $ref + object). + if (meaningfulInlineMembers.length === 1 && !hasRefMembers) { const member = meaningfulInlineMembers[0]; // Only unwrap if the member is an object schema if (!("$ref" in member) && (member.type === "object" || member.properties)) { @@ -386,8 +391,13 @@ function getTypeSpecKind(schema: Refable): TypeSpecDataT return (member as any).type !== "null"; }); - // If there's exactly one meaningful inline member AND it's an object type, treat it as a model - if (meaningfulInlineMembers.length === 1) { + // Check if there are any $ref members in the union alongside the inline members + const hasRefMembers = unionMembers.some((member) => "$ref" in member); + + // If there's exactly one meaningful inline member AND it's an object type + // AND there are no $ref members alongside it, treat it as a model. + // If $ref members are present, the schema is truly a union (e.g. $ref + object). + if (meaningfulInlineMembers.length === 1 && !hasRefMembers) { const member = meaningfulInlineMembers[0]; // Only unwrap if the member is an object schema if (!("$ref" in member) && (member.type === "object" || member.properties)) { diff --git a/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts b/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts new file mode 100644 index 00000000000..a144bd0a064 --- /dev/null +++ b/packages/openapi3/test/tsp-openapi3/anyof-ref-and-object.test.ts @@ -0,0 +1,94 @@ +import { dereference } from "@scalar/openapi-parser"; +import { OpenAPI } from "@scalar/openapi-types"; +import { beforeAll, describe, expect, it } from "vitest"; +import { generateDataType } from "../../src/cli/actions/convert/generators/generate-model.js"; +import { TypeSpecDataTypes, TypeSpecUnion } from "../../src/cli/actions/convert/interfaces.js"; +import { transformComponentSchemas } from "../../src/cli/actions/convert/transforms/transform-component-schemas.js"; +import { createContext } from "../../src/cli/actions/convert/utils/context.js"; +import { OpenAPI3Document } from "../../src/types.js"; + +describe("tsp-openapi: anyOf with $ref and inline object should produce union", () => { + let doc: OpenAPI.Document<{}>; + + beforeAll(async () => { + const { specification } = await dereference({ + openapi: "3.1.0", + info: { title: "Test", version: "1.0.0" }, + paths: {}, + components: { + schemas: { + VoiceIdsOrCustomVoice: { + title: "Voice", + description: "A built-in voice name or a custom voice reference.", + anyOf: [ + { $ref: "#/components/schemas/VoiceIdsShared" }, + { + type: "object", + description: "Custom voice reference.", + additionalProperties: false, + required: ["id"], + properties: { + id: { type: "string" }, + }, + }, + ], + }, + VoiceIdsShared: { + anyOf: [ + { type: "string" }, + { + type: "string", + enum: ["alloy", "ash", "ballad", "coral", "echo", "sage"], + }, + ], + }, + }, + }, + }); + if (!specification) { + throw new Error("Failed to dereference OpenAPI document"); + } + doc = specification; + }); + + it("should generate a union (not a model) for anyOf with $ref and inline object", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const type = types.find((t) => t.name === "VoiceIdsOrCustomVoice"); + expect(type).toBeDefined(); + expect(type!.kind).toBe("union"); + }); + + it("should generate TypeSpec union code containing both the ref and the inline object", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const union = types.find( + (t) => t.name === "VoiceIdsOrCustomVoice" && t.kind === "union", + ) as TypeSpecUnion; + expect(union).toBeDefined(); + + const generatedCode = generateDataType(union, context); + + // Should be a union, not a model + expect(generatedCode).toContain("union VoiceIdsOrCustomVoice"); + expect(generatedCode).not.toContain("model VoiceIdsOrCustomVoice"); + // Should reference the VoiceIdsShared type + expect(generatedCode).toContain("VoiceIdsShared"); + }); + + it("should preserve description from parent schema on the union", () => { + const context = createContext(doc as OpenAPI3Document); + const types: TypeSpecDataTypes[] = []; + transformComponentSchemas(context, types); + + const union = types.find( + (t) => t.name === "VoiceIdsOrCustomVoice" && t.kind === "union", + ) as TypeSpecUnion; + expect(union).toBeDefined(); + expect(union.doc).toContain("A built-in voice name or a custom voice reference."); + }); +}); From fd3102079c8787eb15195ea11401b9c07231408a Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Mar 2026 21:21:08 +0000 Subject: [PATCH 021/137] fix(openapi3): resolve "Duplicate type name" error for named union with bytes in multipart body (#10046) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - [x] Analyze root cause of "Duplicate type name" error for multipart union with bytes - [x] Fix `addUsagesInOperation` in `visibility-usage.ts` to traverse multipart body part types - [x] Add test case for union with bytes in multipart body - [x] Add changelog entry - [x] Build and test changes (all 2482 tests pass) - [x] Apply prettier formatting

Original prompt

> > ---- > > *This section details on the original issue you should resolve* > > OpenAPI emitter fails on union with bytes for multipart > The following definition > > ```tsp > import "@typespec/http"; > using Http; > > union CreateVideoMultipartBodyInputReference { > bytes, > ImageRefParam, > } > union ImageRefParam { > { > @maxLength(20971520) > image_url: url, > }, > { > file_id: string, > }, > } > model CreateVideoMultipartBody { > > input_reference?: HttpPart; > } > > op createVideo( > @header > contentType: "multipart/form-data", > > @multipartBody > body: CreateVideoMultipartBody, > ): void; > ``` > > Fails with this error message : Duplicate type name: 'CreateVideoMultipartBodyInputReference'. Check @friendlyName decorators and overlap with types in TypeSpec or service namespace. > > Interestingly, if we replace bytes by string or something else, the emission starts working. I'd expect it to work with bytes as well. > > > ## Comments on the Issue (you are @copilot in this section) > > > >

- Fixes microsoft/typespec#10045 --- 💬 Send tasks to Copilot coding agent from [Slack](https://gh.io/cca-slack-docs) and [Teams](https://gh.io/cca-teams-docs) to turn conversations into code. Copilot posts an update in your thread when it's finished. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: baywet <7905502+baywet@users.noreply.github.com> --- ...penapi3-multipart-union-bytes-2026-3-16.md | 7 +++++ packages/openapi3/src/visibility-usage.ts | 10 +++++++ packages/openapi3/test/multipart.test.ts | 27 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 .chronus/changes/fix-openapi3-multipart-union-bytes-2026-3-16.md diff --git a/.chronus/changes/fix-openapi3-multipart-union-bytes-2026-3-16.md b/.chronus/changes/fix-openapi3-multipart-union-bytes-2026-3-16.md new file mode 100644 index 00000000000..264194d9ed4 --- /dev/null +++ b/.chronus/changes/fix-openapi3-multipart-union-bytes-2026-3-16.md @@ -0,0 +1,7 @@ +--- +changeKind: fix +packages: + - "@typespec/openapi3" +--- + +Fix OpenAPI emitter failing with "Duplicate type name" error when using a named union with a `bytes` variant in a multipart body (e.g. `HttpPart` where `MyUnion` includes `bytes`). diff --git a/packages/openapi3/src/visibility-usage.ts b/packages/openapi3/src/visibility-usage.ts index b01ed33dedb..2e30d48499b 100644 --- a/packages/openapi3/src/visibility-usage.ts +++ b/packages/openapi3/src/visibility-usage.ts @@ -152,6 +152,16 @@ function addUsagesInOperation( navigateReferencedTypes(httpOperation.parameters.body.type, visibility, (type, vis) => trackUsage(metadataInfo, usages, type, vis), ); + // For multipart bodies, also navigate part types directly. HttpPart wrappers are + // empty models with no properties, so navigateReferencedTypes won't reach T through + // normal property traversal, causing T to be incorrectly treated as unreachable. + if (httpOperation.parameters.body.bodyKind === "multipart") { + for (const part of httpOperation.parameters.body.parts) { + navigateReferencedTypes(part.body.type, visibility, (type, vis) => + trackUsage(metadataInfo, usages, type, vis), + ); + } + } } for (const param of httpOperation.parameters.parameters) { navigateReferencedTypes(param.param, visibility, (type, vis) => diff --git a/packages/openapi3/test/multipart.test.ts b/packages/openapi3/test/multipart.test.ts index 1858f48e0f7..b5a53caa25d 100644 --- a/packages/openapi3/test/multipart.test.ts +++ b/packages/openapi3/test/multipart.test.ts @@ -91,6 +91,33 @@ worksFor(supportedVersions, ({ openApiFor }) => { description: "My doc", }); }); + + it("named union with bytes variant does not cause 'Duplicate type name' error", async () => { + const res = await openApiFor( + ` + union BinaryOrJson { + bytes, + { file_id: string }, + } + op upload(@header contentType: "multipart/form-data", @multipartBody body: { attachment: HttpPart }): void; + `, + ); + const op = res.paths["/"].post; + // The union should be referenced as a $ref (not inlined), and should be available in components + expect(op.requestBody.content["multipart/form-data"].schema.properties.attachment.$ref).toEqual( + "#/components/schemas/BinaryOrJson", + ); + const schema = res.components.schemas.BinaryOrJson; + expect(schema).toBeDefined(); + // The schema should use anyOf with 2 variants + expect(schema.anyOf).toHaveLength(2); + // The object variant ({file_id: string}) should appear in the schema regardless of version + expect(schema.anyOf).toContainEqual({ + type: "object", + properties: { file_id: { type: "string" } }, + required: ["file_id"], + }); + }); }); worksFor(["3.0.0"], ({ openApiFor }) => { From ed27486eb91a78c8e99c8394c558c0a5bd70a6be Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:53:58 -0700 Subject: [PATCH 022/137] Generate ClientSettings and auth constructors for individually-initialized sub-clients (#10042) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary Extends the C# generator to produce `ClientSettings` classes and authentication constructors for sub-clients that have `InitializedBy.Individually` (i.e., can be constructed directly by the user, not only via parent client accessors). ## Changes ### ClientProvider.cs - **Auth fields for individually-initialized sub-clients**: Sub-clients with `InitializedBy.Individually` now get `_apiKeyAuthFields` / `_oauth2Fields` (previously only root clients had these). - **Auth constructors for sub-clients**: `AppendSubClientPublicConstructors` now generates credential-based constructors (`ApiKeyCredential`, `AuthenticationTokenProvider`) that chain to the internal `AuthenticationPolicy` constructor via `this(...)`. - **Internal constructor always uses auth policy**: Changed `BuildPrimaryConstructorBody` condition from `authPolicyParam != null && authFields != null` to `authPolicyParam != null`. - **`EffectiveClientOptions` property**: Sub-clients resolve the root client's `ClientOptions` type via `GetRootClient()?.ClientOptions`. - **Removed auth params from parent-init constructor**: `GetSubClientInternalConstructorParameters` no longer includes credential params. ### ClientSettingsProvider.cs - Uses `_clientProvider.EffectiveClientOptions` instead of duplicating parent-walking logic. ### ScmOutputLibrary.cs - `ClientSettings` emission decoupled from `ClientOptions != null`. ### Test Updates - Updated 8 expected test data files for the pipeline body change. - Updated sub-client constructor test assertions for the new auth constructor pattern. - 6 new sub-client settings tests in `ClientSettingsProviderTests.cs`. ### Generated Output - `Metrics.cs` now has auth constructors (`ApiKeyCredential`, `AuthenticationTokenProvider`) and auth pipeline. - `MetricsSettings.cs` — new generated settings class for the Metrics sub-client. ## Testing - All 1220 unit tests pass - `Generate.ps1` succeeds with no diff beyond expected changes --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../src/Providers/ClientProvider.cs | 146 ++++++++++----- .../src/Providers/ClientSettingsProvider.cs | 10 +- .../src/ScmOutputLibrary.cs | 13 +- .../ClientProviderCustomizationTests.cs | 4 +- .../ClientProviderSubClientTests.cs | 10 +- .../ClientProviders/ClientProviderTests.cs | 104 ++++++----- ...tiServiceClient_GeneratesExpectedClient.cs | 9 +- ...thThreeServices_GeneratesExpectedClient.cs | 9 +- ...eCombinedClient_GeneratesExpectedClient.cs | 9 +- ...thThreeServices_GeneratesExpectedClient.cs | 9 +- ...yConstructor(WithDefault,False,False,0).cs | 9 +- ...ryConstructor(WithDefault,False,True,0).cs | 9 +- ...ryConstructor(WithDefault,True,False,0).cs | 9 +- ...aryConstructor(WithDefault,True,True,0).cs | 9 +- ...aryConstructor(WithDefault,True,True,1).cs | 9 +- ...Constructor(WithRequired,False,False,0).cs | 9 +- ...yConstructor(WithRequired,False,True,0).cs | 9 +- ...yConstructor(WithRequired,True,False,0).cs | 9 +- ...ryConstructor(WithRequired,True,True,0).cs | 9 +- ...ryConstructor(WithRequired,True,True,1).cs | 9 +- ...ValidateConstructorsWhenUnsupportedAuth.cs | 9 +- .../ClientProviderTests/XmlDocsAreWritten.cs | 11 +- .../Providers/ClientSettingsProviderTests.cs | 173 ++++++++++++++++++ .../test/common/InputFactory.cs | 2 +- .../Sample-TypeSpec/src/Generated/Metrics.cs | 71 ++++++- .../src/Generated/MetricsSettings.cs | 48 +++++ .../src/Generated/SampleTypeSpecClient.cs | 9 +- 27 files changed, 610 insertions(+), 126 deletions(-) create mode 100644 packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/MetricsSettings.cs diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs index c829e290267..7cb68c21967 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientProvider.cs @@ -106,7 +106,10 @@ public ClientProvider(InputClient inputClient) _publicCtorDescription = $"Initializes a new instance of {Name}."; ClientOptions = _inputClient.Parent is null ? ClientOptionsProvider.CreateClientOptionsProvider(_inputClient, this) : null; ClientOptionsParameter = ClientOptions != null ? ScmKnownParameters.ClientOptions(ClientOptions.Type) : null; - ClientSettings = ClientOptions != null ? new ClientSettingsProvider(_inputClient, this) : null; + bool isIndividuallyInitialized = (_inputClient.InitializedBy & InputClientInitializedBy.Individually) != 0; + ClientSettings = isIndividuallyInitialized + ? new ClientSettingsProvider(_inputClient, this) + : null; IsMultiServiceClient = _inputClient.IsMultiServiceClient; var apiKey = _inputAuth?.ApiKey; @@ -133,8 +136,7 @@ public ClientProvider(InputClient inputClient) this, initializationValue: Literal(apiKey.Prefix)) : null; - // skip auth fields for sub-clients - _apiKeyAuthFields = ClientOptions is null ? null : new(apiKeyAuthField, authorizationHeaderField, authorizationApiKeyPrefixField); + _apiKeyAuthFields = isIndividuallyInitialized ? new(apiKeyAuthField, authorizationHeaderField, authorizationApiKeyPrefixField) : null; } var tokenAuth = _inputAuth?.OAuth2; @@ -158,8 +160,7 @@ public ClientProvider(InputClient inputClient) var tokenCredentialScopesField = BuildTokenCredentialScopesField(tokenAuth, tokenCredentialType); - // skip auth fields for sub-clients - _oauth2Fields = ClientOptions is null ? null : new(tokenCredentialField, tokenCredentialScopesField); + _oauth2Fields = isIndividuallyInitialized ? new(tokenCredentialField, tokenCredentialScopesField) : null; } EndpointField = new( FieldModifiers.Private | FieldModifiers.ReadOnly, @@ -300,14 +301,8 @@ private IReadOnlyList GetSubClientInternalConstructorParamete PipelineProperty.AsParameter }; - if (_apiKeyAuthFields != null) - { - subClientParameters.Add(_apiKeyAuthFields.AuthField.AsParameter); - } - if (_oauth2Fields != null) - { - subClientParameters.Add(_oauth2Fields.AuthField.AsParameter); - } + // Auth credentials are NOT included here — the parent passes its authenticated + // pipeline, so the sub-client doesn't need separate credential parameters. subClientParameters.Add(_endpointParameter); subClientParameters.AddRange(ClientParameters); @@ -385,6 +380,12 @@ private IReadOnlyList GetClientParameters() public ClientOptionsProvider? ClientOptions { get; } public ClientSettingsProvider? ClientSettings { get; } + ///

+ /// Gets the effective — the client's own options for root clients, + /// or the root client's options for individually-initialized sub-clients. + ///

+ internal ClientOptionsProvider? EffectiveClientOptions => ClientOptions ?? GetRootClient()?.ClientOptions; + public PropertyProvider PipelineProperty { get; } public FieldProvider EndpointField { get; } @@ -647,7 +648,9 @@ void AppendPublicConstructors( foreach (var p in requiredParameters) { if (authParamName == null || p.Name != authParamName) + { initializerArgs.Add(p); + } } initializerArgs.Add(ClientOptionsParameter!); @@ -686,6 +689,14 @@ private IEnumerable BuildSettingsConstructors() yield break; } + // Only publicly constructible clients should get the Settings constructor. + // Internal clients (e.g., those made internal via custom code) cannot be + // constructed by consumers, so a public Settings constructor is not useful. + if (!DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)) + { + yield break; + } + var settingsParam = new ParameterProvider(SettingsParamName, $"The settings for {Name}.", ClientSettings.Type); var experimentalAttr = new AttributeStatement(typeof(ExperimentalAttribute), [Literal(ClientSettingsProvider.ClientSettingsDiagnosticId)]); @@ -733,64 +744,108 @@ private IEnumerable BuildSettingsConstructors() private void AppendSubClientPublicConstructors(List constructors) { // For sub-clients that can be initialized individually, we need to create public constructors - // similar to the root client constructors but adapted for sub-client needs + // with the same auth pattern as the root client. var primaryConstructors = new List(); var secondaryConstructors = new List(); - // if there is key auth + var rootClient = GetRootClient(); + var clientOptionsParameter = rootClient?.ClientOptionsParameter; + var clientOptionsProvider = rootClient?.ClientOptions; + + if (clientOptionsParameter == null || clientOptionsProvider == null) + { + return; + } + + // Add the internal AuthenticationPolicy constructor first — public constructors chain to it. + var authPolicyParam = new ParameterProvider( + "authenticationPolicy", + $"The authentication policy to use for pipeline creation.", + new CSharpType(typeof(AuthenticationPolicy), isNullable: true)); + + var requiredNonAuthParams = GetRequiredParameters(null); + ParameterProvider[] internalConstructorParameters = [authPolicyParam, _endpointParameter, .. requiredNonAuthParams, clientOptionsParameter]; + + var internalConstructor = new ConstructorProvider( + new ConstructorSignature(Type, _publicCtorDescription, MethodSignatureModifiers.Internal, internalConstructorParameters), + BuildPrimaryConstructorBody(internalConstructorParameters, null, authPolicyParam, clientOptionsProvider, clientOptionsParameter, addExplicitValidation: true), + this); + primaryConstructors.Add(internalConstructor); + + // Add public constructors with auth — same pattern as root client if (_apiKeyAuthFields != null) { AppendSubClientPublicConstructorsForAuth(_apiKeyAuthFields, primaryConstructors, secondaryConstructors); } - // if there is oauth2 auth if (_oauth2Fields != null) { AppendSubClientPublicConstructorsForAuth(_oauth2Fields, primaryConstructors, secondaryConstructors); } - // if there is no auth + bool onlyContainsUnsupportedAuth = _inputAuth != null && _apiKeyAuthFields == null && _oauth2Fields == null; if (_apiKeyAuthFields == null && _oauth2Fields == null) { - AppendSubClientPublicConstructorsForAuth(null, primaryConstructors, secondaryConstructors); + AppendSubClientPublicConstructorsForAuth(null, primaryConstructors, secondaryConstructors, onlyContainsUnsupportedAuth); } constructors.AddRange(secondaryConstructors); constructors.AddRange(primaryConstructors); + // Add Settings constructor for individually-initialized sub-clients + foreach (var settingsConstructor in BuildSettingsConstructors()) + { + constructors.Add(settingsConstructor); + } + void AppendSubClientPublicConstructorsForAuth( AuthFields? authFields, List primaryConstructors, - List secondaryConstructors) - { - // For a sub-client with individual initialization, we need: - // - endpoint parameter - // - auth parameter (if auth exists) - // - client options parameter (we need to get this from the root client) - var rootClient = GetRootClient(); - var clientOptionsParameter = rootClient?.ClientOptionsParameter; - var clientOptionsProvider = rootClient?.ClientOptions; - if (clientOptionsParameter == null || clientOptionsProvider == null) + List secondaryConstructors, + bool onlyContainsUnsupportedAuth = false) + { + // Public constructor with credential parameter — delegates to the internal constructor via this(...). + var requiredParameters = GetRequiredParameters(authFields?.AuthField); + ParameterProvider[] primaryConstructorParameters = [_endpointParameter, .. requiredParameters, clientOptionsParameter]; + var constructorModifier = onlyContainsUnsupportedAuth ? MethodSignatureModifiers.Internal : MethodSignatureModifiers.Public; + + // Build the auth policy expression for the this() initializer + ValueExpression authPolicyArg = BuildAuthPolicyArgument(authFields, requiredParameters); + var initializerArgs = new List { authPolicyArg, _endpointParameter }; + string? authParamName = authFields != null + ? (authFields.AuthField.Name != TokenProviderFieldName ? CredentialParamName : authFields.AuthField.AsParameter.Name) + : null; + foreach (var p in requiredParameters) { - // Cannot create public constructor without client options - return; + if (authParamName == null || p.Name != authParamName) + { + initializerArgs.Add(p); + } } + initializerArgs.Add(clientOptionsParameter!); - var requiredParameters = GetRequiredParameters(authFields?.AuthField); - ParameterProvider[] primaryConstructorParameters = [_endpointParameter, .. requiredParameters, clientOptionsParameter]; var primaryConstructor = new ConstructorProvider( - new ConstructorSignature(Type, _publicCtorDescription, MethodSignatureModifiers.Public, primaryConstructorParameters), - BuildPrimaryConstructorBody(primaryConstructorParameters, authFields, null, clientOptionsProvider, clientOptionsParameter), + new ConstructorSignature(Type, _publicCtorDescription, constructorModifier, primaryConstructorParameters, + initializer: new ConstructorInitializer(false, initializerArgs)), + MethodBodyStatement.Empty, this); - primaryConstructors.Add(primaryConstructor); // If the endpoint parameter contains an initialization value, it is not required. ParameterProvider[] secondaryConstructorParameters = _endpointParameter.InitializationValue is null ? [_endpointParameter, .. requiredParameters] : [.. requiredParameters]; - var secondaryConstructor = BuildSecondaryConstructor(secondaryConstructorParameters, primaryConstructorParameters, MethodSignatureModifiers.Public); + var secondaryConstructor = BuildSecondaryConstructor(secondaryConstructorParameters, primaryConstructorParameters, constructorModifier); secondaryConstructors.Add(secondaryConstructor); + + // When endpoint has a default value and there are required parameters, + // add an additional constructor that accepts required parameters + options. + if (_endpointParameter.InitializationValue is not null && requiredParameters.Count > 0) + { + ParameterProvider[] simplifiedConstructorWithOptionsParameters = [.. requiredParameters, clientOptionsParameter]; + var simplifiedConstructorWithOptions = BuildSecondaryConstructor(simplifiedConstructorWithOptionsParameters, primaryConstructorParameters, constructorModifier); + secondaryConstructors.Add(simplifiedConstructorWithOptions); + } } } @@ -917,11 +972,18 @@ private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList().Create(clientOptionsParameter, perRetryWithAuth)).Terminate(), + PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryWithoutAuth)).Terminate())); } else { @@ -940,9 +1002,9 @@ private MethodBodyStatement[] BuildPrimaryConstructorBody(IReadOnlyList().Create(clientOptionsParameter, perRetryPolicies)).Terminate()); + body.Add(PipelineProperty.Assign(This.ToApi().Create(clientOptionsParameter, perRetryPolicies)).Terminate()); + } foreach (var f in Fields) { diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs index 046d9d0e9c6..06b3e7934c7 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ClientSettingsProvider.cs @@ -96,12 +96,13 @@ protected override PropertyProvider[] BuildProperties() this)); } - if (_clientProvider.ClientOptions != null) + var clientOptions = _clientProvider.EffectiveClientOptions; + if (clientOptions != null) { properties.Add(new PropertyProvider( null, MethodSignatureModifiers.Public, - _clientProvider.ClientOptions.Type.WithNullable(true), + clientOptions.Type.WithNullable(true), "Options", new AutoPropertyBody(true), this)); @@ -126,9 +127,10 @@ protected override MethodProvider[] BuildMethods() AppendBindingForProperty(body, sectionParam, propName, param.Name.ToVariableName(), param.Type); } - if (_clientProvider.ClientOptions != null) + var clientOptions = _clientProvider.EffectiveClientOptions; + if (clientOptions != null) { - AppendComplexObjectBinding(body, sectionParam, "Options", "options", _clientProvider.ClientOptions.Type); + AppendComplexObjectBinding(body, sectionParam, "Options", "options", clientOptions.Type); } var bindCoreMethod = new MethodProvider( diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs index fc1d9cd87df..13e43ad6a70 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/ScmOutputLibrary.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Microsoft.TypeSpec.Generator.ClientModel.Providers; using Microsoft.TypeSpec.Generator.Input; +using Microsoft.TypeSpec.Generator.Primitives; using Microsoft.TypeSpec.Generator.Providers; namespace Microsoft.TypeSpec.Generator.ClientModel @@ -41,11 +42,13 @@ private static void BuildClient(InputClient inputClient, HashSet t if (clientOptions != null) { types.Add(clientOptions); - var clientSettings = client.ClientSettings; - if (clientSettings != null) - { - types.Add(clientSettings); - } + } + + // Emit the Settings class for any publicly constructible client (root or individually-initialized sub-client). + var clientSettings = client.ClientSettings; + if (clientSettings != null && client.DeclarationModifiers.HasFlag(TypeSignatureModifiers.Public)) + { + types.Add(clientSettings); } // We use the spec view methods so that we include collection definitions even if the user is customizing or suppressing diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs index d058de7cf6e..c7d924e8747 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderCustomizationTests.cs @@ -281,7 +281,7 @@ public async Task CanRenameSubClient() ]); var inputServiceMethod = InputFactory.BasicServiceMethod("test", inputOperation); var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - InputClient subClient = InputFactory.Client("custom", parent: inputClient); + InputClient subClient = InputFactory.Client("custom", parent: inputClient, initializedBy: InputClientInitializedBy.Parent); var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( clients: () => [inputClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); @@ -309,7 +309,7 @@ public async Task CanRemoveCachingField() ]); var inputServiceMethod = InputFactory.BasicServiceMethod("test", inputOperation); var inputClient = InputFactory.Client("TestClient", methods: [inputServiceMethod]); - InputClient subClient = InputFactory.Client("dog", methods: [], parameters: [], parent: inputClient); + InputClient subClient = InputFactory.Client("dog", methods: [], parameters: [], parent: inputClient, initializedBy: InputClientInitializedBy.Parent); var mockGenerator = await MockHelpers.LoadMockGeneratorAsync( clients: () => [inputClient], compilation: async () => await Helpers.GetCompilationFromDirectoryAsync()); diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs index 6de8507f420..2642f7e2798 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderSubClientTests.cs @@ -15,11 +15,11 @@ namespace Microsoft.TypeSpec.Generator.ClientModel.Tests.Providers.ClientProvide public class ClientProviderSubClientTests { private static readonly InputClient _testClient = InputFactory.Client("TestClient"); - private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient); - private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient); - private static readonly InputClient _catClient = InputFactory.Client("cat", doc: "CatClient description", parent: _animalClient); - private static readonly InputClient _hawkClient = InputFactory.Client("hawkClient", doc: "HawkClient description", parent: _animalClient); - private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _catClient = InputFactory.Client("cat", doc: "CatClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _hawkClient = InputFactory.Client("hawkClient", doc: "HawkClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient, initializedBy: InputClientInitializedBy.Parent); [SetUp] public void SetUp() diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs index f90957cdb1e..566fbb0fb65 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/ClientProviderTests.cs @@ -48,9 +48,9 @@ public bool ValidateIsLastNamespaceSegmentTheSame(string left, string right) private const string OnlyUnsupportedAuthCategory = "WithOnlyUnsupportedAuth"; private const string TestClientName = "TestClient"; private static readonly InputClient _testClient = InputFactory.Client(TestClientName); - private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient); - private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient); - private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient); + private static readonly InputClient _animalClient = InputFactory.Client("animal", doc: "AnimalClient description", parent: _testClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _dogClient = InputFactory.Client("dog", doc: "DogClient description", parent: _animalClient, initializedBy: InputClientInitializedBy.Parent); + private static readonly InputClient _huskyClient = InputFactory.Client("husky", doc: "HuskyClient description", parent: _dogClient, initializedBy: InputClientInitializedBy.Parent); private static readonly InputModelType _spreadModel = InputFactory.Model( "spreadModel", usage: InputModelTypeUsage.Spread, @@ -755,10 +755,17 @@ public void TestBuildConstructors_DeduplicatesConstructorParametersBySerializedN [Test] public void TestBuildConstructors_ForSubClient_InitializedByIndividually_HasPublicConstructors() { - var parentClient = InputFactory.Client("ParentClient"); + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParameter]); var subClient = InputFactory.Client( "SubClient", parent: parentClient, + parameters: [endpointParameter], initializedBy: InputClientInitializedBy.Individually); MockHelpers.LoadMockGenerator( @@ -776,23 +783,28 @@ public void TestBuildConstructors_ForSubClient_InitializedByIndividually_HasPubl c => c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToList(); Assert.IsTrue(publicConstructors.Count > 0, "SubClient with InitializedBy.Individually should have public constructors"); - // primary constructor should set the pipeline, options, and endpoint + // Primary public constructor should have auth credential param and chain to internal via this(...) var primaryConstructor = publicConstructors.FirstOrDefault( - c => c.Signature?.Initializer == null); - Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor"); - StringAssert.Contains( - "options ??= new global::Sample.ParentClientOptions();", - primaryConstructor!.BodyStatements!.ToDisplayString(), - "Primary constructor should null coalesce options parameter"); - StringAssert.Contains( - "Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.SubClient).Assembly) }, Array.Empty());", - primaryConstructor.BodyStatements!.ToDisplayString(), - "Primary constructor should set the Pipeline property"); - - // Should NOT have internal constructor since InitializedBy does not include Parent - var internalConstructor = constructors.FirstOrDefault( - c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal); - Assert.IsNull(internalConstructor, "SubClient with InitializedBy.Individually (without Parent) should not have internal constructor"); + c => c.Signature?.Parameters.Any(p => p.Name == "options") == true && c.Signature?.Initializer != null); + Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor with initializer"); + + // Should have a credential parameter (from the mock api key auth) + Assert.IsTrue(primaryConstructor!.Signature.Parameters.Any(p => p.Name == "credential"), + "SubClient with InitializedBy.Individually should have credential parameter in public constructor"); + + // Should have internal AuthenticationPolicy constructor + var internalConstructors = constructors.Where( + c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToList(); + Assert.IsTrue(internalConstructors.Count > 0, "SubClient with InitializedBy.Individually should have internal constructor"); + var authPolicyConstructor = internalConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Any(p => p.Type.Name == nameof(AuthenticationPolicy)) == true); + Assert.IsNotNull(authPolicyConstructor, "SubClient with InitializedBy.Individually should have internal AuthenticationPolicy constructor"); + + // Should have a Settings constructor + Assert.IsNotNull(clientProvider.ClientSettings, "SubClient with InitializedBy.Individually should have ClientSettings"); + var settingsConstructor = publicConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Count == 1 && c.Signature.Parameters[0].Name == "settings"); + Assert.IsNotNull(settingsConstructor, "SubClient with InitializedBy.Individually should have Settings constructor"); var mockingConstructor = constructors.FirstOrDefault( c => c.Signature?.Modifiers == MethodSignatureModifiers.Protected); @@ -835,10 +847,17 @@ public void TestBuildConstructors_ForSubClient_InitializedByParentOnly_HasOnlyIn [Test] public void TestBuildConstructors_ForSubClient_InitializedByBoth_HasBothConstructors() { - var parentClient = InputFactory.Client("ParentClient"); + var endpointParameter = InputFactory.EndpointParameter( + KnownParameters.Endpoint.Name, + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParameter]); var subClient = InputFactory.Client( "SubClient", parent: parentClient, + parameters: [endpointParameter], initializedBy: InputClientInitializedBy.Individually | InputClientInitializedBy.Parent); MockHelpers.LoadMockGenerator( @@ -856,23 +875,21 @@ public void TestBuildConstructors_ForSubClient_InitializedByBoth_HasBothConstruc c => c.Signature?.Modifiers == MethodSignatureModifiers.Public).ToList(); Assert.IsTrue(publicConstructors.Count > 0, "SubClient with InitializedBy.Individually | Parent should have public constructors"); - // primary constructor should set the pipeline, options, and endpoint + // Primary public constructor should have auth credential param and chain to internal via this(...) var primaryConstructor = publicConstructors.FirstOrDefault( - c => c.Signature?.Initializer == null); - Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor"); - StringAssert.Contains( - "options ??= new global::Sample.ParentClientOptions();", - primaryConstructor!.BodyStatements!.ToDisplayString(), - "Primary constructor should null coalesce options parameter"); - StringAssert.Contains( - "Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.SubClient).Assembly) }, Array.Empty());", - primaryConstructor.BodyStatements!.ToDisplayString(), - "Primary constructor should set the Pipeline property"); - - // Should also have internal constructor - var internalConstructor = constructors.FirstOrDefault( - c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal); - Assert.IsNotNull(internalConstructor, "SubClient with InitializedBy.Individually | Parent should have internal constructor"); + c => c.Signature?.Parameters.Any(p => p.Name == "options") == true && c.Signature?.Initializer != null); + Assert.IsNotNull(primaryConstructor, "SubClient with InitializedBy.Individually should have primary public constructor with initializer"); + + // Should also have internal constructors (sub-client internal + AuthenticationPolicy internal) + var internalConstructors = constructors.Where( + c => c.Signature?.Modifiers == MethodSignatureModifiers.Internal).ToList(); + Assert.IsTrue(internalConstructors.Count > 0, "SubClient with InitializedBy.Individually | Parent should have internal constructor"); + + // Should have a Settings constructor + Assert.IsNotNull(clientProvider.ClientSettings, "SubClient with InitializedBy.Individually | Parent should have ClientSettings"); + var settingsConstructor = publicConstructors.FirstOrDefault( + c => c.Signature?.Parameters.Count == 1 && c.Signature.Parameters[0].Name == "settings"); + Assert.IsNotNull(settingsConstructor, "SubClient with InitializedBy.Individually | Parent should have Settings constructor"); var mockingConstructor = constructors.FirstOrDefault( c => c.Signature?.Modifiers == MethodSignatureModifiers.Protected); @@ -1219,7 +1236,7 @@ public void TestGetClientOptions(bool isSubClient) parentClient = InputFactory.Client("parent"); } - var client = InputFactory.Client(TestClientName, parent: parentClient); + var client = InputFactory.Client(TestClientName, parent: parentClient, initializedBy: isSubClient ? InputClientInitializedBy.Parent : InputClientInitializedBy.Individually); var clientProvider = new ClientProvider(client); Assert.IsNotNull(clientProvider); @@ -1572,6 +1589,7 @@ public void ApiVersionFieldIsStoredOnRootClient() var subClient = InputFactory.Client( "SubClient", parent: rootClient, + initializedBy: InputClientInitializedBy.Parent, parameters: [ InputFactory.PathParameter("apiVersion", InputPrimitiveType.String, isRequired: true, scope: InputParameterScope.Client, isApiVersion: true), @@ -3327,8 +3345,8 @@ public void MultiServiceClient_GeneratesExpectedClient() scope: InputParameterScope.Client); var client = InputFactory.Client(TestClientName, parameters: [subscriptionIdParameter, apiVersionParameter], isMultiServiceClient: true); - var serviceAClient = InputFactory.Client("ServiceA", clientNamespace: "Sample.ServiceA", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var serviceBClient = InputFactory.Client("ServiceB", clientNamespace: "Sample.ServiceB", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); + var serviceAClient = InputFactory.Client("ServiceA", clientNamespace: "Sample.ServiceA", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var serviceBClient = InputFactory.Client("ServiceB", clientNamespace: "Sample.ServiceB", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); MockHelpers.LoadMockGenerator( apiVersions: () => [.. serviceAVersions, .. serviceBVersions], @@ -3387,9 +3405,9 @@ public void MultiServiceClient_WithThreeServices_GeneratesExpectedClient() scope: InputParameterScope.Client); var client = InputFactory.Client(TestClientName, parameters: [subscriptionIdParameter, apiVersionParameter], isMultiServiceClient: true); - var keyVaultClient = InputFactory.Client("KeyVault", clientNamespace: "Sample.KeyVault", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var storageClient = InputFactory.Client("Storage", clientNamespace: "Sample.Storage", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); - var computeClient = InputFactory.Client("Compute", clientNamespace: "Sample.Compute", parent: client, parameters: [apiVersionParameter, subscriptionIdParameter]); + var keyVaultClient = InputFactory.Client("KeyVault", clientNamespace: "Sample.KeyVault", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var storageClient = InputFactory.Client("Storage", clientNamespace: "Sample.Storage", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); + var computeClient = InputFactory.Client("Compute", clientNamespace: "Sample.Compute", parent: client, initializedBy: InputClientInitializedBy.Parent, parameters: [apiVersionParameter, subscriptionIdParameter]); MockHelpers.LoadMockGenerator( apiVersions: () => [.. keyVaultVersions, .. storageVersions, .. computeVersions], diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs index 3e82b811e69..7aa404c1406 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_GeneratesExpectedClient.cs @@ -36,7 +36,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a _endpoint = endpoint; _subscriptionId = subscriptionId; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceAApiVersion = options.ServiceAApiVersion; _serviceBApiVersion = options.ServiceBApiVersion; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs index 54206fc6ffb..def2e6d7a73 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceClient_WithThreeServices_GeneratesExpectedClient.cs @@ -39,7 +39,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a _endpoint = endpoint; _subscriptionId = subscriptionId; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceComputeApiVersion = options.ServiceComputeApiVersion; _serviceKeyVaultApiVersion = options.ServiceKeyVaultApiVersion; _serviceStorageApiVersion = options.ServiceStorageApiVersion; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs index 1bd204e71e8..56c1c6cf460 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_GeneratesExpectedClient.cs @@ -31,7 +31,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceAApiVersion = options.ServiceAApiVersion; _serviceBApiVersion = options.ServiceBApiVersion; } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs index a5520eb71c1..4096b627bc1 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/MultiServiceCombinedClient_WithThreeServices_GeneratesExpectedClient.cs @@ -32,7 +32,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } _serviceComputeApiVersion = options.ServiceComputeApiVersion; _serviceKeyVaultApiVersion = options.ServiceKeyVaultApiVersion; _serviceStorageApiVersion = options.ServiceStorageApiVersion; diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs index bc5bbc28eac..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,False,True,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithDefault,True,True,1).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs index bc5bbc28eac..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,False,True,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,False,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,0).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs index 579690c23a0..395de44a9d8 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/TestBuildConstructors_PrimaryConstructor(WithRequired,True,True,1).cs @@ -3,4 +3,11 @@ options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; -Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +if ((authenticationPolicy != null)) +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); +} +else +{ + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); +} diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs index 60e6d68058d..89829df5a76 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/ValidateConstructorsWhenUnsupportedAuth.cs @@ -20,7 +20,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a options ??= new global::Sample.TestClientOptions(); _endpoint = endpoint; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } } internal TestClient(global::System.Uri endpoint, global::Sample.TestClientOptions options) : this(null, endpoint, options) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs index 5e455f24f4c..7166e071f8c 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientProviders/TestData/ClientProviderTests/XmlDocsAreWritten.cs @@ -1,4 +1,4 @@ -// +// #nullable disable @@ -44,7 +44,14 @@ internal TestClient(global::System.ClientModel.Primitives.AuthenticationPolicy a _endpoint = endpoint; _queryParam = queryParam; - Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + if ((authenticationPolicy != null)) + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly), authenticationPolicy }, Array.Empty()); + } + else + { + Pipeline = global::System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty(), new global::System.ClientModel.Primitives.PipelinePolicy[] { new global::System.ClientModel.Primitives.UserAgentPolicy(typeof(global::Sample.TestClient).Assembly) }, Array.Empty()); + } } ///

Initializes a new instance of TestClient.

diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs index 9c9fc994075..c4f31a8a1a0 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/test/Providers/ClientSettingsProviderTests.cs @@ -617,5 +617,178 @@ public void TestNamespace() Assert.IsNotNull(settingsProvider); Assert.AreEqual(clientProvider.Type.Namespace, settingsProvider!.Type.Namespace); } + + // Sub-client settings tests + + [Test] + public void TestSubClient_IndividuallyInitialized_HasSettings() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider, "Individually-initialized sub-client should have ClientSettings"); + Assert.AreEqual("SubClientSettings", settingsProvider!.Name); + } + + [Test] + public void TestSubClient_ParentOnly_NoSettings() + { + var parentClient = InputFactory.Client("ParentClient"); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + initializedBy: InputClientInitializedBy.Parent); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + + Assert.IsNull(clientProvider.ClientSettings, "Parent-only sub-client should not have ClientSettings"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_HasEndpointProperty() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var endpointProp = settingsProvider!.Properties.FirstOrDefault( + p => p.Name == "Endpoint" && p.Type.Equals(new CSharpType(typeof(Uri), isNullable: true))); + Assert.IsNotNull(endpointProp, "Sub-client settings should have an Endpoint property"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_HasOptionsFromRootClient() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var optionsProp = settingsProvider!.Properties.FirstOrDefault(p => p.Name == "Options"); + Assert.IsNotNull(optionsProp, "Sub-client settings should have Options property from root client"); + + // The Options type should be the parent's ClientOptions type + var parentProvider = new ClientProvider(parentClient); + Assert.IsNotNull(parentProvider.ClientOptions); + Assert.AreEqual( + parentProvider.ClientOptions!.Type.WithNullable(true), + optionsProp!.Type, + "Sub-client settings Options type should match root client's ClientOptions type"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_BindCoreHasEndpointAndOptions() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + var bindCoreMethod = settingsProvider!.Methods.FirstOrDefault(m => m.Signature.Name == "BindCore"); + Assert.IsNotNull(bindCoreMethod, "Sub-client settings should have BindCore method"); + + var bodyString = bindCoreMethod!.BodyStatements!.ToDisplayString(); + Assert.IsTrue(bodyString.Contains("TryCreate"), "BindCore should bind the Endpoint via Uri.TryCreate"); + Assert.IsTrue(bodyString.Contains("GetSection") && bodyString.Contains("Options"), + "BindCore should bind the Options section"); + } + + [Test] + public void TestSubClient_IndividuallyInitialized_SettingsBaseType() + { + var endpointParam = InputFactory.EndpointParameter( + "endpoint", + InputPrimitiveType.String, + defaultValue: InputFactory.Constant.String("https://default.endpoint.io"), + scope: InputParameterScope.Client, + isEndpoint: true); + var parentClient = InputFactory.Client("ParentClient", parameters: [endpointParam]); + var subClient = InputFactory.Client( + "SubClient", + parent: parentClient, + parameters: [endpointParam], + initializedBy: InputClientInitializedBy.Individually); + + MockHelpers.LoadMockGenerator( + auth: () => new(new InputApiKeyAuth("mock", null), null), + clients: () => [parentClient]); + + var clientProvider = new ClientProvider(subClient); + var settingsProvider = clientProvider.ClientSettings; + + Assert.IsNotNull(settingsProvider); + Assert.AreEqual(ClientSettingsProvider.ClientSettingsType, settingsProvider!.Type.BaseType, + "Sub-client settings should inherit from ClientSettings"); + } } } diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs index 85632b4ee25..f23286ac277 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/common/InputFactory.cs @@ -709,7 +709,7 @@ public static InputServiceMethodResponse ServiceMethodResponse(InputType? type, private static readonly Dictionary> _childClientsCache = new(); - public static InputClient Client(string name, string clientNamespace = "Sample", string? doc = null, IEnumerable? methods = null, IEnumerable? parameters = null, InputClient? parent = null, string? crossLanguageDefinitionId = null, IEnumerable? apiVersions = null, InputClientInitializedBy initializedBy = InputClientInitializedBy.Default, bool? isMultiServiceClient = false) + public static InputClient Client(string name, string clientNamespace = "Sample", string? doc = null, IEnumerable? methods = null, IEnumerable? parameters = null, InputClient? parent = null, string? crossLanguageDefinitionId = null, IEnumerable? apiVersions = null, InputClientInitializedBy initializedBy = InputClientInitializedBy.Individually, bool? isMultiServiceClient = false) { // when this client has parent, we add the constructed client into the `children` list of the parent var clientChildren = new List(); diff --git a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs index 8e55488af08..dab61b07de2 100644 --- a/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs +++ b/packages/http-client-csharp/generator/TestProjects/Local/Sample-TypeSpec/src/Generated/Metrics.cs @@ -8,6 +8,8 @@ using System; using System.ClientModel; using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; @@ -17,6 +19,17 @@ namespace SampleTypeSpec public partial class Metrics { private readonly Uri _endpoint; + private const string AuthorizationHeader = "my-api-key"; + ///

The OAuth2 flows supported by the service.

+ private static readonly Dictionary[] _flows = new Dictionary[] + { + new Dictionary + { + { GetTokenOptions.ScopesPropertyName, new string[] { "read" } }, + { GetTokenOptions.AuthorizationUrlPropertyName, "https://api.example.com/oauth2/authorize" }, + { GetTokenOptions.RefreshUrlPropertyName, "https://api.example.com/oauth2/refresh" } + } + }; private readonly string _metricsNamespace; ///

Initializes a new instance of Metrics for mocking.

@@ -38,19 +51,29 @@ internal Metrics(ClientPipeline pipeline, Uri endpoint, string metricsNamespace) ///