From 32f175b3425673296e13ba8e6f55cf5659e62a56 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Fri, 16 Jan 2026 21:11:01 +0800 Subject: [PATCH] http-client-java, lro final result as array --- .../model/codemodel/LongRunningMetadata.java | 12 ++++++------ .../generator/core/mapper/PollingMetadata.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/LongRunningMetadata.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/LongRunningMetadata.java index 2d2869c2c26..ac2d944537d 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/LongRunningMetadata.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/extension/model/codemodel/LongRunningMetadata.java @@ -7,8 +7,8 @@ * Represents the metadata for long-running operations. */ public class LongRunningMetadata { - private ObjectSchema pollResultType; - private ObjectSchema finalResultType; + private Schema pollResultType; + private Schema finalResultType; private Metadata pollingStrategy; private String finalResultPropertySerializedName; @@ -23,7 +23,7 @@ public LongRunningMetadata() { * * @return The poll result type. */ - public ObjectSchema getPollResultType() { + public Schema getPollResultType() { return pollResultType; } @@ -32,7 +32,7 @@ public ObjectSchema getPollResultType() { * * @param pollResultType The poll result type. */ - public void setPollResultType(ObjectSchema pollResultType) { + public void setPollResultType(Schema pollResultType) { this.pollResultType = pollResultType; } @@ -41,7 +41,7 @@ public void setPollResultType(ObjectSchema pollResultType) { * * @return The final result type. */ - public ObjectSchema getFinalResultType() { + public Schema getFinalResultType() { return finalResultType; } @@ -50,7 +50,7 @@ public ObjectSchema getFinalResultType() { * * @param finalResultType The final result type. */ - public void setFinalResultType(ObjectSchema finalResultType) { + public void setFinalResultType(Schema finalResultType) { this.finalResultType = finalResultType; } diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PollingMetadata.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PollingMetadata.java index 619dc31cb84..ac1d3b7692b 100644 --- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PollingMetadata.java +++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/mapper/PollingMetadata.java @@ -188,13 +188,13 @@ private static PollingMetadata create(LongRunningMetadata lroMetadata, PollingSe // Step_1: Resolve LRO poll and final result types. // - final ObjectMapper objectMapper = Mappers.getObjectMapper(); + final SchemaMapper schemaMapper = Mappers.getSchemaMapper(); final IType pollResultType; if (pollingSettings.getPollResultType() != null) { // For result types, the 'PollingSettings' would take precedence over 'LongRunningMetadata' pollResultType = createTypeFromModelName(pollingSettings.getPollResultType()); } else { - pollResultType = objectMapper.map(lroMetadata.getPollResultType()); + pollResultType = schemaMapper.map(lroMetadata.getPollResultType()); } final IType finalResultType; @@ -204,7 +204,7 @@ private static PollingMetadata create(LongRunningMetadata lroMetadata, PollingSe if (lroMetadata.getFinalResultType() == null) { finalResultType = PrimitiveType.VOID; } else { - finalResultType = objectMapper.map(lroMetadata.getFinalResultType()); + finalResultType = schemaMapper.map(lroMetadata.getFinalResultType()); } }