The PR for tsp, update @azure-tools/cadl-ranch-specs to 0.33.2 (#2745)

* The 1st PR for tsp, update @azure-tools/cadl-ranch-specs to 0.332

* re-generate test code

* Fixed ci exception

* Fixed for #2745 (comment)

* Rollback source for #2745 (comment)

---------

Co-authored-by: actions-user <[email protected]>

Author: v-hongli1

typespec-tests/package.json

@@ -9,7 +9,7 @@
     "testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.32.0",
+    "@azure-tools/cadl-ranch-specs": "0.33.2",
     "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.15.tgz"
   },
   "devDependencies": {

…equestid/ClientRequestIdAsyncClient.java …estid/XmsClientRequestIdAsyncClient.javatypespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdAsyncClient.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdAsyncClient.java typespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdAsyncClient.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdAsyncClient.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.specialheaders.clientrequestid;
+package com.azure.specialheaders.xmsclientrequestid;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
@@ -15,37 +15,37 @@
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.FluxUtil;
-import com.specialheaders.clientrequestid.implementation.ClientRequestIdClientImpl;
+import com.azure.specialheaders.xmsclientrequestid.implementation.XmsClientRequestIdClientImpl;
 import reactor.core.publisher.Mono;
 
 /**
- * Initializes a new instance of the asynchronous ClientRequestIdClient type.
+ * Initializes a new instance of the asynchronous XmsClientRequestIdClient type.
  */
-@ServiceClient(builder = ClientRequestIdClientBuilder.class, isAsync = true)
-public final class ClientRequestIdAsyncClient {
+@ServiceClient(builder = XmsClientRequestIdClientBuilder.class, isAsync = true)
+public final class XmsClientRequestIdAsyncClient {
     @Generated
-    private final ClientRequestIdClientImpl serviceClient;
+    private final XmsClientRequestIdClientImpl serviceClient;
 
     /**
-     * Initializes an instance of ClientRequestIdAsyncClient class.
+     * Initializes an instance of XmsClientRequestIdAsyncClient class.
      * 
      * @param serviceClient the service client implementation.
      */
     @Generated
-    ClientRequestIdAsyncClient(ClientRequestIdClientImpl serviceClient) {
+    XmsClientRequestIdAsyncClient(XmsClientRequestIdClientImpl serviceClient) {
         this.serviceClient = serviceClient;
     }
 
     /**
-     * Get operation with azure client request id header.
+     * Get operation with azure `x-ms-client-request-id` header.
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return operation with azure client request id header along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return operation with azure `x-ms-client-request-id` header along with {@link Response} on successful completion
+     * of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -54,14 +54,14 @@ public Mono<Response<Void>> getWithResponse(RequestOptions requestOptions) {
     }
 
     /**
-     * Get operation with azure client request id header.
+     * Get operation with azure `x-ms-client-request-id` header.
      * 
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return operation with azure client request id header on successful completion of {@link Mono}.
+     * @return operation with azure `x-ms-client-request-id` header on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)

…ientrequestid/ClientRequestIdClient.java …trequestid/XmsClientRequestIdClient.javatypespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdClient.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClient.java typespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdClient.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClient.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.specialheaders.clientrequestid;
+package com.azure.specialheaders.xmsclientrequestid;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ReturnType;
@@ -14,35 +14,35 @@
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
-import com.specialheaders.clientrequestid.implementation.ClientRequestIdClientImpl;
+import com.azure.specialheaders.xmsclientrequestid.implementation.XmsClientRequestIdClientImpl;
 
 /**
- * Initializes a new instance of the synchronous ClientRequestIdClient type.
+ * Initializes a new instance of the synchronous XmsClientRequestIdClient type.
  */
-@ServiceClient(builder = ClientRequestIdClientBuilder.class)
-public final class ClientRequestIdClient {
+@ServiceClient(builder = XmsClientRequestIdClientBuilder.class)
+public final class XmsClientRequestIdClient {
     @Generated
-    private final ClientRequestIdClientImpl serviceClient;
+    private final XmsClientRequestIdClientImpl serviceClient;
 
     /**
-     * Initializes an instance of ClientRequestIdClient class.
+     * Initializes an instance of XmsClientRequestIdClient class.
      * 
      * @param serviceClient the service client implementation.
      */
     @Generated
-    ClientRequestIdClient(ClientRequestIdClientImpl serviceClient) {
+    XmsClientRequestIdClient(XmsClientRequestIdClientImpl serviceClient) {
         this.serviceClient = serviceClient;
     }
 
     /**
-     * Get operation with azure client request id header.
+     * Get operation with azure `x-ms-client-request-id` header.
      * 
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return operation with azure client request id header along with {@link Response}.
+     * @return operation with azure `x-ms-client-request-id` header along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -51,7 +51,7 @@ public Response<Void> getWithResponse(RequestOptions requestOptions) {
     }
 
     /**
-     * Get operation with azure client request id header.
+     * Get operation with azure `x-ms-client-request-id` header.
      * 
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.

…uestid/ClientRequestIdClientBuilder.java …tid/XmsClientRequestIdClientBuilder.javatypespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdClientBuilder.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClientBuilder.java typespec-tests/src/main/java/com/specialheaders/clientrequestid/ClientRequestIdClientBuilder.java renamed to typespec-tests/src/main/java/com/azure/specialheaders/xmsclientrequestid/XmsClientRequestIdClientBuilder.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.specialheaders.clientrequestid;
+package com.azure.specialheaders.xmsclientrequestid;
 
 import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ServiceClientBuilder;
@@ -31,18 +31,18 @@
 import com.azure.core.util.builder.ClientBuilderUtil;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.serializer.JacksonAdapter;
-import com.specialheaders.clientrequestid.implementation.ClientRequestIdClientImpl;
+import com.azure.specialheaders.xmsclientrequestid.implementation.XmsClientRequestIdClientImpl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 /**
- * A builder for creating a new instance of the ClientRequestIdClient type.
+ * A builder for creating a new instance of the XmsClientRequestIdClient type.
  */
-@ServiceClientBuilder(serviceClients = { ClientRequestIdClient.class, ClientRequestIdAsyncClient.class })
-public final class ClientRequestIdClientBuilder
-    implements HttpTrait<ClientRequestIdClientBuilder>, ConfigurationTrait<ClientRequestIdClientBuilder> {
+@ServiceClientBuilder(serviceClients = { XmsClientRequestIdClient.class, XmsClientRequestIdAsyncClient.class })
+public final class XmsClientRequestIdClientBuilder
+    implements HttpTrait<XmsClientRequestIdClientBuilder>, ConfigurationTrait<XmsClientRequestIdClientBuilder> {
     @Generated
     private static final String SDK_NAME = "name";
 
@@ -51,16 +51,16 @@ public final class ClientRequestIdClientBuilder
 
     @Generated
     private static final Map<String, String> PROPERTIES
-        = CoreUtils.getProperties("specialheaders-clientrequestid.properties");
+        = CoreUtils.getProperties("azure-specialheaders-xmsclientrequestid.properties");
 
     @Generated
     private final List<HttpPipelinePolicy> pipelinePolicies;
 
     /**
-     * Create an instance of the ClientRequestIdClientBuilder.
+     * Create an instance of the XmsClientRequestIdClientBuilder.
      */
     @Generated
-    public ClientRequestIdClientBuilder() {
+    public XmsClientRequestIdClientBuilder() {
         this.pipelinePolicies = new ArrayList<>();
     }
 
@@ -75,7 +75,7 @@ public ClientRequestIdClientBuilder() {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder pipeline(HttpPipeline pipeline) {
+    public XmsClientRequestIdClientBuilder pipeline(HttpPipeline pipeline) {
         if (this.pipeline != null && pipeline == null) {
             LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured.");
         }
@@ -94,7 +94,7 @@ public ClientRequestIdClientBuilder pipeline(HttpPipeline pipeline) {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder httpClient(HttpClient httpClient) {
+    public XmsClientRequestIdClientBuilder httpClient(HttpClient httpClient) {
         this.httpClient = httpClient;
         return this;
     }
@@ -110,7 +110,7 @@ public ClientRequestIdClientBuilder httpClient(HttpClient httpClient) {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
+    public XmsClientRequestIdClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
         this.httpLogOptions = httpLogOptions;
         return this;
     }
@@ -126,7 +126,7 @@ public ClientRequestIdClientBuilder httpLogOptions(HttpLogOptions httpLogOptions
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder clientOptions(ClientOptions clientOptions) {
+    public XmsClientRequestIdClientBuilder clientOptions(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
         return this;
     }
@@ -142,7 +142,7 @@ public ClientRequestIdClientBuilder clientOptions(ClientOptions clientOptions) {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder retryOptions(RetryOptions retryOptions) {
+    public XmsClientRequestIdClientBuilder retryOptions(RetryOptions retryOptions) {
         this.retryOptions = retryOptions;
         return this;
     }
@@ -152,7 +152,7 @@ public ClientRequestIdClientBuilder retryOptions(RetryOptions retryOptions) {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
+    public XmsClientRequestIdClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
         Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null.");
         pipelinePolicies.add(customPolicy);
         return this;
@@ -169,7 +169,7 @@ public ClientRequestIdClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
      */
     @Generated
     @Override
-    public ClientRequestIdClientBuilder configuration(Configuration configuration) {
+    public XmsClientRequestIdClientBuilder configuration(Configuration configuration) {
         this.configuration = configuration;
         return this;
     }
@@ -184,24 +184,24 @@ public ClientRequestIdClientBuilder configuration(Configuration configuration) {
      * Sets The retry policy that will attempt to retry failed requests, if applicable.
      * 
      * @param retryPolicy the retryPolicy value.
-     * @return the ClientRequestIdClientBuilder.
+     * @return the XmsClientRequestIdClientBuilder.
      */
     @Generated
-    public ClientRequestIdClientBuilder retryPolicy(RetryPolicy retryPolicy) {
+    public XmsClientRequestIdClientBuilder retryPolicy(RetryPolicy retryPolicy) {
         this.retryPolicy = retryPolicy;
         return this;
     }
 
     /**
-     * Builds an instance of ClientRequestIdClientImpl with the provided parameters.
+     * Builds an instance of XmsClientRequestIdClientImpl with the provided parameters.
      * 
-     * @return an instance of ClientRequestIdClientImpl.
+     * @return an instance of XmsClientRequestIdClientImpl.
      */
     @Generated
-    private ClientRequestIdClientImpl buildInnerClient() {
+    private XmsClientRequestIdClientImpl buildInnerClient() {
         HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline();
-        ClientRequestIdClientImpl client
-            = new ClientRequestIdClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter());
+        XmsClientRequestIdClientImpl client
+            = new XmsClientRequestIdClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter());
         return client;
     }
 
@@ -216,7 +216,7 @@ private HttpPipeline createHttpPipeline() {
         String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion");
         String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions);
         policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration));
-        policies.add(new RequestIdPolicy("client-request-id"));
+        policies.add(new RequestIdPolicy());
         policies.add(new AddHeadersFromContextPolicy());
         HttpHeaders headers = new HttpHeaders();
         localClientOptions.getHeaders()
@@ -243,24 +243,24 @@ private HttpPipeline createHttpPipeline() {
     }
 
     /**
-     * Builds an instance of ClientRequestIdAsyncClient class.
+     * Builds an instance of XmsClientRequestIdAsyncClient class.
      * 
-     * @return an instance of ClientRequestIdAsyncClient.
+     * @return an instance of XmsClientRequestIdAsyncClient.
      */
     @Generated
-    public ClientRequestIdAsyncClient buildAsyncClient() {
-        return new ClientRequestIdAsyncClient(buildInnerClient());
+    public XmsClientRequestIdAsyncClient buildAsyncClient() {
+        return new XmsClientRequestIdAsyncClient(buildInnerClient());
     }
 
     /**
-     * Builds an instance of ClientRequestIdClient class.
+     * Builds an instance of XmsClientRequestIdClient class.
      * 
-     * @return an instance of ClientRequestIdClient.
+     * @return an instance of XmsClientRequestIdClient.
      */
     @Generated
-    public ClientRequestIdClient buildClient() {
-        return new ClientRequestIdClient(buildInnerClient());
+    public XmsClientRequestIdClient buildClient() {
+        return new XmsClientRequestIdClient(buildInnerClient());
     }
 
-    private static final ClientLogger LOGGER = new ClientLogger(ClientRequestIdClientBuilder.class);
+    private static final ClientLogger LOGGER = new ClientLogger(XmsClientRequestIdClientBuilder.class);
 }