allow clientName on header in response (#3201)

weidongxu-microsoft · web-flow · commit 4d3c26f86607 · 2025-09-17T17:33:11.000+08:00
diff --git a/core b/core
@@ -1 +1 @@
-Subproject commit c36699676972bae3cbf712f9498acb1474809301
+Subproject commit 3ad02b5bae5984b727f65181e3fad705e97a4544
diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 0.33.3 (2025-09-17)
+
+Compatible with compiler 1.4.0.
+
+- Patch release: bump package version and small fixes.
+
 ## 0.33.2 (2025-09-16)
 
 Compatible with compiler 1.4.0.
diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json
diff --git a/typespec-extension/package.json b/typespec-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
@@ -51,7 +51,7 @@
     "@azure-tools/typespec-azure-core": ">=0.60.0 <1.0.0",
     "@azure-tools/typespec-azure-resource-manager": ">=0.60.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.60.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.60.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.60.1 <1.0.0",
     "@azure-tools/typespec-liftr-base": ">=0.8.0 <1.0.0",
     "@typespec/compiler": "^1.4.0",
     "@typespec/http": "^1.4.0",
@@ -70,24 +70,24 @@
     "@azure-tools/typespec-azure-core": "0.60.0",
     "@azure-tools/typespec-azure-resource-manager": "0.60.0",
     "@azure-tools/typespec-azure-rulesets": "0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.60.0",
+    "@azure-tools/typespec-client-generator-core": "0.60.1",
     "@azure-tools/typespec-liftr-base": "0.8.0",
+    "@microsoft/api-extractor": "^7.52.13",
     "@types/js-yaml": "~4.0.9",
     "@types/lodash": "~4.17.20",
-    "@types/node": "~24.5.0",
+    "@types/node": "~24.5.1",
     "@typescript-eslint/eslint-plugin": "~8.44.0",
     "@typescript-eslint/parser": "~8.44.0",
     "@typespec/compiler": "1.4.0",
+    "@typespec/events": "0.74.0",
     "@typespec/http": "1.4.0",
     "@typespec/openapi": "1.4.0",
     "@typespec/rest": "0.74.0",
-    "@typespec/versioning": "0.74.0",
-    "@typespec/xml": "0.74.0",
-    "@typespec/events": "0.74.0",
     "@typespec/sse": "0.74.0",
     "@typespec/streams": "0.74.0",
     "@typespec/tspd": "0.73.0",
-    "@microsoft/api-extractor": "^7.52.13",
+    "@typespec/versioning": "0.74.0",
+    "@typespec/xml": "0.74.0",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "c8": "~10.1.3",
diff --git a/typespec-tests/package.json b/typespec-tests/package.json
@@ -13,7 +13,7 @@
     "@typespec/spector": "0.1.0-alpha.18",
     "@typespec/http-specs": "0.1.0-alpha.26",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.29",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.33.2.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.33.3.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "^1.4.0",
@@ -31,7 +31,7 @@
     "@typespec/sse": "0.74.0",
     "@typespec/streams": "0.74.0",
     "@azure-tools/typespec-azure-core": "0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.60.0",
+    "@azure-tools/typespec-client-generator-core": "0.60.1",
     "@azure-tools/typespec-azure-resource-manager": "0.60.0",
     "@azure-tools/typespec-autorest": "0.60.0"
   },
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/fluent/FunctionsClient.java
@@ -6,9 +6,9 @@
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import tsptest.armstreamstyleserialization.fluent.models.FunctionInner;
+import tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionResponse;
 
 /**
  * An instance of this class provides access to all the operations defined in FunctionsClient.
@@ -22,10 +22,10 @@ public interface FunctionsClient {
      * @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}.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<FunctionInner> createFunctionWithResponse(FunctionInner function, Context context);
+    FunctionsCreateFunctionResponse createFunctionWithResponse(FunctionInner function, Context context);
 
     /**
      * The createFunction operation.
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsClientImpl.java
@@ -14,7 +14,6 @@
 import com.azure.core.annotation.ServiceInterface;
 import com.azure.core.annotation.ServiceMethod;
 import com.azure.core.annotation.UnexpectedResponseExceptionType;
-import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
@@ -23,6 +22,7 @@
 import reactor.core.publisher.Mono;
 import tsptest.armstreamstyleserialization.fluent.FunctionsClient;
 import tsptest.armstreamstyleserialization.fluent.models.FunctionInner;
+import tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionResponse;
 
 /**
  * An instance of this class provides access to all the operations defined in FunctionsClient.
@@ -59,14 +59,14 @@ public interface FunctionsService {
         @Put("/function")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<FunctionInner>> createFunction(@HostParam("endpoint") String endpoint,
+        Mono<FunctionsCreateFunctionResponse> createFunction(@HostParam("endpoint") String endpoint,
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") FunctionInner function, Context context);
 
         @Put("/function")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Response<FunctionInner> createFunctionSync(@HostParam("endpoint") String endpoint,
+        FunctionsCreateFunctionResponse createFunctionSync(@HostParam("endpoint") String endpoint,
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") FunctionInner function, Context context);
     }
@@ -78,10 +78,10 @@ Response<FunctionInner> createFunctionSync(@HostParam("endpoint") String endpoin
      * @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} on successful completion of {@link Mono}.
+     * @return the response body on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<FunctionInner>> createFunctionWithResponseAsync(FunctionInner function) {
+    private Mono<FunctionsCreateFunctionResponse> createFunctionWithResponseAsync(FunctionInner function) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -121,10 +121,10 @@ private Mono<FunctionInner> createFunctionAsync(FunctionInner function) {
      * @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}.
+     * @return the response.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<FunctionInner> createFunctionWithResponse(FunctionInner function, Context context) {
+    public FunctionsCreateFunctionResponse createFunctionWithResponse(FunctionInner function, Context context) {
         if (this.client.getEndpoint() == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException(
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/implementation/FunctionsImpl.java
@@ -12,6 +12,7 @@
 import tsptest.armstreamstyleserialization.fluent.models.FunctionInner;
 import tsptest.armstreamstyleserialization.models.Function;
 import tsptest.armstreamstyleserialization.models.Functions;
+import tsptest.armstreamstyleserialization.models.FunctionsCreateFunctionResponse;
 
 public final class FunctionsImpl implements Functions {
     private static final ClientLogger LOGGER = new ClientLogger(FunctionsImpl.class);
@@ -27,7 +28,7 @@ public FunctionsImpl(FunctionsClient innerClient,
     }
 
     public Response<Function> createFunctionWithResponse(FunctionInner function, Context context) {
-        Response<FunctionInner> inner = this.serviceClient().createFunctionWithResponse(function, context);
+        FunctionsCreateFunctionResponse inner = this.serviceClient().createFunctionWithResponse(function, context);
         if (inner != null) {
             return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
                 new FunctionImpl(inner.getValue(), this.manager()));
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Functions.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/Functions.java
@@ -20,7 +20,7 @@ public interface Functions {
      * @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}.
+     * @return the response.
      */
     Response<Function> createFunctionWithResponse(FunctionInner function, Context context);
 
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionHeaders.java
@@ -0,0 +1,47 @@
+// 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.http.HttpHeaderName;
+import com.azure.core.http.HttpHeaders;
+
+/**
+ * The FunctionsCreateFunctionHeaders model.
+ */
+@Immutable
+public final class FunctionsCreateFunctionHeaders {
+    /*
+     * The ETag property.
+     */
+    private final String etag;
+
+    // HttpHeaders containing the raw property values.
+    /**
+     * Creates an instance of FunctionsCreateFunctionHeaders class.
+     * 
+     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
+     */
+    public FunctionsCreateFunctionHeaders(HttpHeaders rawHeaders) {
+        this.etag = rawHeaders.getValue(HttpHeaderName.ETAG);
+    }
+
+    /**
+     * Get the etag property: The ETag property.
+     * 
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+}
diff --git a/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java b/typespec-tests/src/main/java/tsptest/armstreamstyleserialization/models/FunctionsCreateFunctionResponse.java
@@ -0,0 +1,39 @@
+// 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.http.HttpHeaders;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.rest.ResponseBase;
+import tsptest.armstreamstyleserialization.fluent.models.FunctionInner;
+
+/**
+ * Contains all response data for the createFunction operation.
+ */
+public final class FunctionsCreateFunctionResponse extends ResponseBase<FunctionsCreateFunctionHeaders, FunctionInner> {
+    /**
+     * Creates an instance of FunctionsCreateFunctionResponse.
+     * 
+     * @param request the request which resulted in this FunctionsCreateFunctionResponse.
+     * @param statusCode the status code of the HTTP response.
+     * @param rawHeaders the raw headers of the HTTP response.
+     * @param value the deserialized value of the HTTP response.
+     * @param headers the deserialized headers of the HTTP response.
+     */
+    public FunctionsCreateFunctionResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
+        FunctionInner value, FunctionsCreateFunctionHeaders headers) {
+        super(request, statusCode, rawHeaders, value, headers);
+    }
+
+    /**
+     * Gets the deserialized response body.
+     * 
+     * @return the deserialized response body.
+     */
+    @Override
+    public FunctionInner getValue() {
+        return super.getValue();
+    }
+}
diff --git a/typespec-tests/tsp/arm-stream-style-serialization.tsp b/typespec-tests/tsp/arm-stream-style-serialization.tsp
@@ -241,7 +241,11 @@ interface Functions {
   createFunction(
     @header `x-ms-authorization-auxiliary`?: string,
     @body function: Function,
-  ): Function;
+  ): Function & {
+    @header("ETag")
+    @clientName("etag")
+    eTag: string;
+  };
 }
 
 @route("/priority")
