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 fd37045119..2a319b34b7 100644
--- a/packages/http-client-java/emitter/src/code-model-builder.ts
+++ b/packages/http-client-java/emitter/src/code-model-builder.ts
@@ -245,7 +245,9 @@ export class CodeModelBuilder {
       versioning: { previewStringRegex: /$/ },
     }); // include all versions and do the filter by ourselves
 
-    this.program.reportDiagnostics(this.sdkContext.diagnostics);
+    // TODO: reportDiagnostics from TCGC temporary disabled
+    // issue https://github.com/Azure/typespec-azure/issues/1675
+    // this.program.reportDiagnostics(this.sdkContext.diagnostics);
 
     // auth
     // TODO: it is not very likely, but different client could have different auth
diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
index 9edc0c24d9..db1dd58ac9 100644
--- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.52.0</version>
+      <version>1.53.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
index 3d7bb80cf0..dc7b90aa8e 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
@@ -56,12 +56,12 @@ public class Project {
     public enum Dependency {
         // azure
         AZURE_CLIENT_SDK_PARENT("com.azure", "azure-client-sdk-parent", "1.7.0"),
-        AZURE_CORE("com.azure", "azure-core", "1.52.0"),
-        AZURE_CORE_MANAGEMENT("com.azure", "azure-core-management", "1.15.3"),
-        AZURE_CORE_HTTP_NETTY("com.azure", "azure-core-http-netty", "1.15.4"),
-        AZURE_CORE_TEST("com.azure", "azure-core-test", "1.27.0-beta.1"),
-        AZURE_IDENTITY("com.azure", "azure-identity", "1.13.3"),
-        AZURE_CORE_EXPERIMENTAL("com.azure", "azure-core-experimental", "1.0.0-beta.53"),
+        AZURE_CORE("com.azure", "azure-core", "1.53.0"),
+        AZURE_CORE_MANAGEMENT("com.azure", "azure-core-management", "1.15.4"),
+        AZURE_CORE_HTTP_NETTY("com.azure", "azure-core-http-netty", "1.15.5"),
+        AZURE_CORE_TEST("com.azure", "azure-core-test", "1.27.0-beta.2"),
+        AZURE_IDENTITY("com.azure", "azure-identity", "1.14.0"),
+        AZURE_CORE_EXPERIMENTAL("com.azure", "azure-core-experimental", "1.0.0-beta.54"),
 
         CLIENTCORE("io.clientcore", "core", "1.0.0-beta.1"),
         CLIENTCORE_JSON("io.clientcore", "core-json", "1.0.0-beta.1");
diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
index 409800db14..48ca9d80a8 100644
--- a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.3</version>
+      <version>1.15.4</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
index ccb216b153..b77267bf5e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/package.json
+++ b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -12,7 +12,7 @@
     "testserver-stop": "npx cadl-ranch server stop"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.37.3",
+    "@azure-tools/cadl-ranch-specs": "0.37.6",
     "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
diff --git a/packages/http-client-java/generator/http-client-generator-test/pom.xml b/packages/http-client-java/generator/http-client-generator-test/pom.xml
index 19fd87e7e4..70dee69e55 100644
--- a/packages/http-client-java/generator/http-client-generator-test/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-test/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.52.0</version>
+      <version>1.53.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.27.0-beta.1</version>
+      <version>1.27.0-beta.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -50,12 +50,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.13.3</version>
+      <version>1.14.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.3</version>
+      <version>1.15.4</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedAsyncClient.java
deleted file mode 100644
index f3b849fa5f..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedAsyncClient.java
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceClient;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.exception.ClientAuthenticationException;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.exception.ResourceModifiedException;
-import com.azure.core.exception.ResourceNotFoundException;
-import com.azure.core.http.rest.RequestOptions;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.BinaryData;
-import com.azure.core.util.FluxUtil;
-import com.type.model.templated.implementation.TemplatedClientImpl;
-import com.type.model.templated.models.Float32ValuesType;
-import com.type.model.templated.models.Int32Type;
-import com.type.model.templated.models.Int32ValuesType;
-import reactor.core.publisher.Mono;
-
-/**
- * Initializes a new instance of the asynchronous TemplatedClient type.
- */
-@ServiceClient(builder = TemplatedClientBuilder.class, isAsync = true)
-public final class TemplatedAsyncClient {
-    @Generated
-    private final TemplatedClientImpl serviceClient;
-
-    /**
-     * Initializes an instance of TemplatedAsyncClient class.
-     * 
-     * @param serviceClient the service client implementation.
-     */
-    @Generated
-    TemplatedAsyncClient(TemplatedClientImpl serviceClient) {
-        this.serviceClient = serviceClient;
-    }
-
-    /**
-     * The numericType operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> numericTypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.numericTypeWithResponseAsync(input, requestOptions);
-    }
-
-    /**
-     * The float32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing float32 values type along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> float32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.float32TypeWithResponseAsync(input, requestOptions);
-    }
-
-    /**
-     * The int32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing int32 values type along with {@link Response} on successful completion
-     * of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> int32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.int32TypeWithResponseAsync(input, requestOptions);
-    }
-
-    /**
-     * The numericType operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 the response body on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Int32Type> numericType(Int32Type input) {
-        // Generated convenience method for numericTypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return numericTypeWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(Int32Type.class));
-    }
-
-    /**
-     * The float32Type operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 an instantiated type representing float32 values type on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Float32ValuesType> float32Type(Float32ValuesType input) {
-        // Generated convenience method for float32TypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return float32TypeWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(Float32ValuesType.class));
-    }
-
-    /**
-     * The int32Type operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 an instantiated type representing int32 values type on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Int32ValuesType> int32Type(Int32ValuesType input) {
-        // Generated convenience method for int32TypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return int32TypeWithResponse(BinaryData.fromObject(input), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(Int32ValuesType.class));
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClient.java
deleted file mode 100644
index b8142bd6b1..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClient.java
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceClient;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.exception.ClientAuthenticationException;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.exception.ResourceModifiedException;
-import com.azure.core.exception.ResourceNotFoundException;
-import com.azure.core.http.rest.RequestOptions;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.BinaryData;
-import com.type.model.templated.implementation.TemplatedClientImpl;
-import com.type.model.templated.models.Float32ValuesType;
-import com.type.model.templated.models.Int32Type;
-import com.type.model.templated.models.Int32ValuesType;
-
-/**
- * Initializes a new instance of the synchronous TemplatedClient type.
- */
-@ServiceClient(builder = TemplatedClientBuilder.class)
-public final class TemplatedClient {
-    @Generated
-    private final TemplatedClientImpl serviceClient;
-
-    /**
-     * Initializes an instance of TemplatedClient class.
-     * 
-     * @param serviceClient the service client implementation.
-     */
-    @Generated
-    TemplatedClient(TemplatedClientImpl serviceClient) {
-        this.serviceClient = serviceClient;
-    }
-
-    /**
-     * The numericType operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> numericTypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.numericTypeWithResponse(input, requestOptions);
-    }
-
-    /**
-     * The float32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing float32 values type along with {@link Response}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> float32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.float32TypeWithResponse(input, requestOptions);
-    }
-
-    /**
-     * The int32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing int32 values type along with {@link Response}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> int32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        return this.serviceClient.int32TypeWithResponse(input, requestOptions);
-    }
-
-    /**
-     * The numericType operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 the response.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Int32Type numericType(Int32Type input) {
-        // Generated convenience method for numericTypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return numericTypeWithResponse(BinaryData.fromObject(input), requestOptions).getValue()
-            .toObject(Int32Type.class);
-    }
-
-    /**
-     * The float32Type operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 an instantiated type representing float32 values type.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Float32ValuesType float32Type(Float32ValuesType input) {
-        // Generated convenience method for float32TypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return float32TypeWithResponse(BinaryData.fromObject(input), requestOptions).getValue()
-            .toObject(Float32ValuesType.class);
-    }
-
-    /**
-     * The int32Type operation.
-     * 
-     * @param input The input parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 an instantiated type representing int32 values type.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Int32ValuesType int32Type(Int32ValuesType input) {
-        // Generated convenience method for int32TypeWithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return int32TypeWithResponse(BinaryData.fromObject(input), requestOptions).getValue()
-            .toObject(Int32ValuesType.class);
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClientBuilder.java
deleted file mode 100644
index c8a4fdb24c..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/TemplatedClientBuilder.java
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.ServiceClientBuilder;
-import com.azure.core.client.traits.ConfigurationTrait;
-import com.azure.core.client.traits.EndpointTrait;
-import com.azure.core.client.traits.HttpTrait;
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.HttpPipelinePosition;
-import com.azure.core.http.policy.AddDatePolicy;
-import com.azure.core.http.policy.AddHeadersFromContextPolicy;
-import com.azure.core.http.policy.AddHeadersPolicy;
-import com.azure.core.http.policy.HttpLogOptions;
-import com.azure.core.http.policy.HttpLoggingPolicy;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.core.http.policy.HttpPolicyProviders;
-import com.azure.core.http.policy.RequestIdPolicy;
-import com.azure.core.http.policy.RetryOptions;
-import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.util.ClientOptions;
-import com.azure.core.util.Configuration;
-import com.azure.core.util.CoreUtils;
-import com.azure.core.util.builder.ClientBuilderUtil;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.core.util.serializer.JacksonAdapter;
-import com.type.model.templated.implementation.TemplatedClientImpl;
-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 TemplatedClient type.
- */
-@ServiceClientBuilder(serviceClients = { TemplatedClient.class, TemplatedAsyncClient.class })
-public final class TemplatedClientBuilder implements HttpTrait<TemplatedClientBuilder>,
-    ConfigurationTrait<TemplatedClientBuilder>, EndpointTrait<TemplatedClientBuilder> {
-    @Generated
-    private static final String SDK_NAME = "name";
-
-    @Generated
-    private static final String SDK_VERSION = "version";
-
-    @Generated
-    private static final Map<String, String> PROPERTIES = CoreUtils.getProperties("type-model-templated.properties");
-
-    @Generated
-    private final List<HttpPipelinePolicy> pipelinePolicies;
-
-    /**
-     * Create an instance of the TemplatedClientBuilder.
-     */
-    @Generated
-    public TemplatedClientBuilder() {
-        this.pipelinePolicies = new ArrayList<>();
-    }
-
-    /*
-     * The HTTP pipeline to send requests through.
-     */
-    @Generated
-    private HttpPipeline pipeline;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder pipeline(HttpPipeline pipeline) {
-        if (this.pipeline != null && pipeline == null) {
-            LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured.");
-        }
-        this.pipeline = pipeline;
-        return this;
-    }
-
-    /*
-     * The HTTP client used to send the request.
-     */
-    @Generated
-    private HttpClient httpClient;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder httpClient(HttpClient httpClient) {
-        this.httpClient = httpClient;
-        return this;
-    }
-
-    /*
-     * The logging configuration for HTTP requests and responses.
-     */
-    @Generated
-    private HttpLogOptions httpLogOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
-        this.httpLogOptions = httpLogOptions;
-        return this;
-    }
-
-    /*
-     * The client options such as application ID and custom headers to set on a request.
-     */
-    @Generated
-    private ClientOptions clientOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder clientOptions(ClientOptions clientOptions) {
-        this.clientOptions = clientOptions;
-        return this;
-    }
-
-    /*
-     * The retry options to configure retry policy for failed requests.
-     */
-    @Generated
-    private RetryOptions retryOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder retryOptions(RetryOptions retryOptions) {
-        this.retryOptions = retryOptions;
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
-        Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null.");
-        pipelinePolicies.add(customPolicy);
-        return this;
-    }
-
-    /*
-     * The configuration store that is used during construction of the service client.
-     */
-    @Generated
-    private Configuration configuration;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder configuration(Configuration configuration) {
-        this.configuration = configuration;
-        return this;
-    }
-
-    /*
-     * The service endpoint
-     */
-    @Generated
-    private String endpoint;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public TemplatedClientBuilder endpoint(String endpoint) {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    /*
-     * The retry policy that will attempt to retry failed requests, if applicable.
-     */
-    @Generated
-    private RetryPolicy retryPolicy;
-
-    /**
-     * Sets The retry policy that will attempt to retry failed requests, if applicable.
-     * 
-     * @param retryPolicy the retryPolicy value.
-     * @return the TemplatedClientBuilder.
-     */
-    @Generated
-    public TemplatedClientBuilder retryPolicy(RetryPolicy retryPolicy) {
-        this.retryPolicy = retryPolicy;
-        return this;
-    }
-
-    /**
-     * Builds an instance of TemplatedClientImpl with the provided parameters.
-     * 
-     * @return an instance of TemplatedClientImpl.
-     */
-    @Generated
-    private TemplatedClientImpl buildInnerClient() {
-        this.validateClient();
-        HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline();
-        String localEndpoint = (endpoint != null) ? endpoint : "http://localhost:3000";
-        TemplatedClientImpl client
-            = new TemplatedClientImpl(localPipeline, JacksonAdapter.createDefaultSerializerAdapter(), localEndpoint);
-        return client;
-    }
-
-    @Generated
-    private void validateClient() {
-        // This method is invoked from 'buildInnerClient'/'buildClient' method.
-        // Developer can customize this method, to validate that the necessary conditions are met for the new client.
-    }
-
-    @Generated
-    private HttpPipeline createHttpPipeline() {
-        Configuration buildConfiguration
-            = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration;
-        HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions;
-        ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions;
-        List<HttpPipelinePolicy> policies = new ArrayList<>();
-        String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName");
-        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());
-        policies.add(new AddHeadersFromContextPolicy());
-        HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions);
-        if (headers != null) {
-            policies.add(new AddHeadersPolicy(headers));
-        }
-        this.pipelinePolicies.stream()
-            .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
-            .forEach(p -> policies.add(p));
-        HttpPolicyProviders.addBeforeRetryPolicies(policies);
-        policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy()));
-        policies.add(new AddDatePolicy());
-        this.pipelinePolicies.stream()
-            .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
-            .forEach(p -> policies.add(p));
-        HttpPolicyProviders.addAfterRetryPolicies(policies);
-        policies.add(new HttpLoggingPolicy(localHttpLogOptions));
-        HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
-            .httpClient(httpClient)
-            .clientOptions(localClientOptions)
-            .build();
-        return httpPipeline;
-    }
-
-    /**
-     * Builds an instance of TemplatedAsyncClient class.
-     * 
-     * @return an instance of TemplatedAsyncClient.
-     */
-    @Generated
-    public TemplatedAsyncClient buildAsyncClient() {
-        return new TemplatedAsyncClient(buildInnerClient());
-    }
-
-    /**
-     * Builds an instance of TemplatedClient class.
-     * 
-     * @return an instance of TemplatedClient.
-     */
-    @Generated
-    public TemplatedClient buildClient() {
-        return new TemplatedClient(buildInnerClient());
-    }
-
-    private static final ClientLogger LOGGER = new ClientLogger(TemplatedClientBuilder.class);
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/TemplatedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/TemplatedClientImpl.java
deleted file mode 100644
index bd64dfaf8e..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/TemplatedClientImpl.java
+++ /dev/null
@@ -1,458 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.implementation;
-
-import com.azure.core.annotation.BodyParam;
-import com.azure.core.annotation.ExpectedResponses;
-import com.azure.core.annotation.HeaderParam;
-import com.azure.core.annotation.Host;
-import com.azure.core.annotation.HostParam;
-import com.azure.core.annotation.Put;
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceInterface;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.annotation.UnexpectedResponseExceptionType;
-import com.azure.core.exception.ClientAuthenticationException;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.exception.ResourceModifiedException;
-import com.azure.core.exception.ResourceNotFoundException;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.http.rest.RequestOptions;
-import com.azure.core.http.rest.Response;
-import com.azure.core.http.rest.RestProxy;
-import com.azure.core.util.BinaryData;
-import com.azure.core.util.Context;
-import com.azure.core.util.FluxUtil;
-import com.azure.core.util.serializer.JacksonAdapter;
-import com.azure.core.util.serializer.SerializerAdapter;
-import reactor.core.publisher.Mono;
-
-/**
- * Initializes a new instance of the TemplatedClient type.
- */
-public final class TemplatedClientImpl {
-    /**
-     * The proxy service used to perform REST calls.
-     */
-    private final TemplatedClientService service;
-
-    /**
-     * Service host.
-     */
-    private final String endpoint;
-
-    /**
-     * Gets Service host.
-     * 
-     * @return the endpoint value.
-     */
-    public String getEndpoint() {
-        return this.endpoint;
-    }
-
-    /**
-     * The HTTP pipeline to send requests through.
-     */
-    private final HttpPipeline httpPipeline;
-
-    /**
-     * Gets The HTTP pipeline to send requests through.
-     * 
-     * @return the httpPipeline value.
-     */
-    public HttpPipeline getHttpPipeline() {
-        return this.httpPipeline;
-    }
-
-    /**
-     * The serializer to serialize an object into a string.
-     */
-    private final SerializerAdapter serializerAdapter;
-
-    /**
-     * Gets The serializer to serialize an object into a string.
-     * 
-     * @return the serializerAdapter value.
-     */
-    public SerializerAdapter getSerializerAdapter() {
-        return this.serializerAdapter;
-    }
-
-    /**
-     * Initializes an instance of TemplatedClient client.
-     * 
-     * @param endpoint Service host.
-     */
-    public TemplatedClientImpl(String endpoint) {
-        this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(),
-            JacksonAdapter.createDefaultSerializerAdapter(), endpoint);
-    }
-
-    /**
-     * Initializes an instance of TemplatedClient client.
-     * 
-     * @param httpPipeline The HTTP pipeline to send requests through.
-     * @param endpoint Service host.
-     */
-    public TemplatedClientImpl(HttpPipeline httpPipeline, String endpoint) {
-        this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint);
-    }
-
-    /**
-     * Initializes an instance of TemplatedClient client.
-     * 
-     * @param httpPipeline The HTTP pipeline to send requests through.
-     * @param serializerAdapter The serializer to serialize an object into a string.
-     * @param endpoint Service host.
-     */
-    public TemplatedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint) {
-        this.httpPipeline = httpPipeline;
-        this.serializerAdapter = serializerAdapter;
-        this.endpoint = endpoint;
-        this.service = RestProxy.create(TemplatedClientService.class, this.httpPipeline, this.getSerializerAdapter());
-    }
-
-    /**
-     * The interface defining all the services for TemplatedClient to be used by the proxy service to perform REST
-     * calls.
-     */
-    @Host("{endpoint}")
-    @ServiceInterface(name = "TemplatedClient")
-    public interface TemplatedClientService {
-        @Put("/type/model/templated/numericType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> numericType(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-
-        @Put("/type/model/templated/numericType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> numericTypeSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-
-        @Put("/type/model/templated/float32ValuesType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> float32Type(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-
-        @Put("/type/model/templated/float32ValuesType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> float32TypeSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-
-        @Put("/type/model/templated/int32ValuesType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> int32Type(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-
-        @Put("/type/model/templated/int32ValuesType")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> int32TypeSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData input, RequestOptions requestOptions, Context context);
-    }
-
-    /**
-     * The numericType operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> numericTypeWithResponseAsync(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.numericType(this.getEndpoint(), contentType, accept, input, requestOptions, context));
-    }
-
-    /**
-     * The numericType operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> numericTypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return service.numericTypeSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE);
-    }
-
-    /**
-     * The float32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing float32 values type along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> float32TypeWithResponseAsync(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.float32Type(this.getEndpoint(), contentType, accept, input, requestOptions, context));
-    }
-
-    /**
-     * The float32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         double (Required)
-     *     ]
-     *     value: double (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing float32 values type along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> float32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return service.float32TypeSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE);
-    }
-
-    /**
-     * The int32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing int32 values type along with {@link Response} on successful completion
-     * of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> int32TypeWithResponseAsync(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.int32Type(this.getEndpoint(), contentType, accept, input, requestOptions, context));
-    }
-
-    /**
-     * The int32Type operation.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     values (Required): [
-     *         int (Required)
-     *     ]
-     *     value: int (Required)
-     *     kind: String (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param input The input parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return an instantiated type representing int32 values type along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> int32TypeWithResponse(BinaryData input, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return service.int32TypeSync(this.getEndpoint(), contentType, accept, input, requestOptions, Context.NONE);
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/package-info.java
deleted file mode 100644
index e728236cff..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/implementation/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-/**
- * <!-- start generated doc -->
- * Package containing the implementations for Templated.
- * Illustrates the model templated cases. There is a base templated type and an instantiated type extending from it.
- * <!-- end generated doc -->
- */
-package com.type.model.templated.implementation;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32Type.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32Type.java
deleted file mode 100644
index 15a07cf4f7..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32Type.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * The Float32Type model.
- */
-@Immutable
-public class Float32Type implements JsonSerializable<Float32Type> {
-    /*
-     * An array of numeric values.
-     */
-    @Generated
-    private final List<Double> values;
-
-    /*
-     * The value property.
-     */
-    @Generated
-    private final double value;
-
-    /**
-     * Creates an instance of Float32Type class.
-     * 
-     * @param values the values value to set.
-     * @param value the value value to set.
-     */
-    @Generated
-    public Float32Type(List<Double> values, double value) {
-        this.values = values;
-        this.value = value;
-    }
-
-    /**
-     * Get the values property: An array of numeric values.
-     * 
-     * @return the values value.
-     */
-    @Generated
-    public List<Double> getValues() {
-        return this.values;
-    }
-
-    /**
-     * Get the value property: The value property.
-     * 
-     * @return the value value.
-     */
-    @Generated
-    public double getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("values", this.values, (writer, element) -> writer.writeDouble(element));
-        jsonWriter.writeDoubleField("value", this.value);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Float32Type from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Float32Type 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 Float32Type.
-     */
-    @Generated
-    public static Float32Type fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            List<Double> values = null;
-            double value = 0.0;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("values".equals(fieldName)) {
-                    values = reader.readArray(reader1 -> reader1.getDouble());
-                } else if ("value".equals(fieldName)) {
-                    value = reader.getDouble();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            return new Float32Type(values, value);
-        });
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32ValuesType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32ValuesType.java
deleted file mode 100644
index 081db94173..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Float32ValuesType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * An instantiated type representing float32 values type.
- */
-@Immutable
-public final class Float32ValuesType extends Float32Type {
-    /*
-     * The Kind of the Float32ValuesType.
-     */
-    @Generated
-    private final String kind = "Float32Values";
-
-    /**
-     * Creates an instance of Float32ValuesType class.
-     * 
-     * @param values the values value to set.
-     * @param value the value value to set.
-     */
-    @Generated
-    public Float32ValuesType(List<Double> values, double value) {
-        super(values, value);
-    }
-
-    /**
-     * Get the kind property: The Kind of the Float32ValuesType.
-     * 
-     * @return the kind value.
-     */
-    @Generated
-    public String getKind() {
-        return this.kind;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("values", getValues(), (writer, element) -> writer.writeDouble(element));
-        jsonWriter.writeDoubleField("value", getValue());
-        jsonWriter.writeStringField("kind", this.kind);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Float32ValuesType from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Float32ValuesType 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 Float32ValuesType.
-     */
-    @Generated
-    public static Float32ValuesType fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            List<Double> values = null;
-            double value = 0.0;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("values".equals(fieldName)) {
-                    values = reader.readArray(reader1 -> reader1.getDouble());
-                } else if ("value".equals(fieldName)) {
-                    value = reader.getDouble();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            return new Float32ValuesType(values, value);
-        });
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32Type.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32Type.java
deleted file mode 100644
index 9aa1f8c4ec..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32Type.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * The Int32Type model.
- */
-@Immutable
-public class Int32Type implements JsonSerializable<Int32Type> {
-    /*
-     * An array of numeric values.
-     */
-    @Generated
-    private final List<Integer> values;
-
-    /*
-     * The value property.
-     */
-    @Generated
-    private final int value;
-
-    /**
-     * Creates an instance of Int32Type class.
-     * 
-     * @param values the values value to set.
-     * @param value the value value to set.
-     */
-    @Generated
-    public Int32Type(List<Integer> values, int value) {
-        this.values = values;
-        this.value = value;
-    }
-
-    /**
-     * Get the values property: An array of numeric values.
-     * 
-     * @return the values value.
-     */
-    @Generated
-    public List<Integer> getValues() {
-        return this.values;
-    }
-
-    /**
-     * Get the value property: The value property.
-     * 
-     * @return the value value.
-     */
-    @Generated
-    public int getValue() {
-        return this.value;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("values", this.values, (writer, element) -> writer.writeInt(element));
-        jsonWriter.writeIntField("value", this.value);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Int32Type from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Int32Type 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 Int32Type.
-     */
-    @Generated
-    public static Int32Type fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            List<Integer> values = null;
-            int value = 0;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("values".equals(fieldName)) {
-                    values = reader.readArray(reader1 -> reader1.getInt());
-                } else if ("value".equals(fieldName)) {
-                    value = reader.getInt();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            return new Int32Type(values, value);
-        });
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32ValuesType.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32ValuesType.java
deleted file mode 100644
index 109a8e95de..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/Int32ValuesType.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * An instantiated type representing int32 values type.
- */
-@Immutable
-public final class Int32ValuesType extends Int32Type {
-    /*
-     * The Kind of the Int32ValuesType.
-     */
-    @Generated
-    private final String kind = "Int32Values";
-
-    /**
-     * Creates an instance of Int32ValuesType class.
-     * 
-     * @param values the values value to set.
-     * @param value the value value to set.
-     */
-    @Generated
-    public Int32ValuesType(List<Integer> values, int value) {
-        super(values, value);
-    }
-
-    /**
-     * Get the kind property: The Kind of the Int32ValuesType.
-     * 
-     * @return the kind value.
-     */
-    @Generated
-    public String getKind() {
-        return this.kind;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("values", getValues(), (writer, element) -> writer.writeInt(element));
-        jsonWriter.writeIntField("value", getValue());
-        jsonWriter.writeStringField("kind", this.kind);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Int32ValuesType from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Int32ValuesType 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 Int32ValuesType.
-     */
-    @Generated
-    public static Int32ValuesType fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            List<Integer> values = null;
-            int value = 0;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("values".equals(fieldName)) {
-                    values = reader.readArray(reader1 -> reader1.getInt());
-                } else if ("value".equals(fieldName)) {
-                    value = reader.getInt();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            return new Int32ValuesType(values, value);
-        });
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/package-info.java
deleted file mode 100644
index 962335aa7c..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/models/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-/**
- * <!-- start generated doc -->
- * Package containing the data models for Templated.
- * Illustrates the model templated cases. There is a base templated type and an instantiated type extending from it.
- * <!-- end generated doc -->
- */
-package com.type.model.templated.models;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/package-info.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/package-info.java
deleted file mode 100644
index 08c2791e13..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/type/model/templated/package-info.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-/**
- * <!-- start generated doc -->
- * Package containing the classes for Templated.
- * Illustrates the model templated cases. There is a base templated type and an instantiated type extending from it.
- * <!-- end generated doc -->
- */
-package com.type.model.templated;
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedAsyncClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedAsyncClient.java
index 3a45002fdc..28b2bf4a4b 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedAsyncClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedAsyncClient.java
@@ -18,7 +18,6 @@
 import com.azure.core.util.FluxUtil;
 import com.versioning.removed.implementation.RemovedClientImpl;
 import com.versioning.removed.models.ModelV2;
-import com.versioning.removed.models.ModelV3;
 import reactor.core.publisher.Mono;
 
 /**
@@ -79,45 +78,6 @@ public Mono<Response<BinaryData>> v2WithResponse(BinaryData body, RequestOptions
         return this.serviceClient.v2WithResponseAsync(body, requestOptions);
     }
 
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param body The body parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> modelV3WithResponse(BinaryData body, RequestOptions requestOptions) {
-        return this.serviceClient.modelV3WithResponseAsync(body, requestOptions);
-    }
-
     /**
      * The v2 operation.
      * 
@@ -138,26 +98,4 @@ public Mono<ModelV2> v2(ModelV2 body) {
         return v2WithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono)
             .map(protocolMethodData -> protocolMethodData.toObject(ModelV2.class));
     }
-
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * 
-     * @param body The body parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 the response body on successful completion of {@link Mono}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ModelV3> modelV3(ModelV3 body) {
-        // Generated convenience method for modelV3WithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return modelV3WithResponse(BinaryData.fromObject(body), requestOptions).flatMap(FluxUtil::toMono)
-            .map(protocolMethodData -> protocolMethodData.toObject(ModelV3.class));
-    }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClient.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClient.java
index 26fdb314d6..165a8158b4 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClient.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClient.java
@@ -17,7 +17,6 @@
 import com.azure.core.util.BinaryData;
 import com.versioning.removed.implementation.RemovedClientImpl;
 import com.versioning.removed.models.ModelV2;
-import com.versioning.removed.models.ModelV3;
 
 /**
  * Initializes a new instance of the synchronous RemovedClient type.
@@ -77,45 +76,6 @@ public Response<BinaryData> v2WithResponse(BinaryData body, RequestOptions reque
         return this.serviceClient.v2WithResponse(body, requestOptions);
     }
 
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param body The body parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response}.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> modelV3WithResponse(BinaryData body, RequestOptions requestOptions) {
-        return this.serviceClient.modelV3WithResponse(body, requestOptions);
-    }
-
     /**
      * The v2 operation.
      * 
@@ -135,25 +95,4 @@ public ModelV2 v2(ModelV2 body) {
         RequestOptions requestOptions = new RequestOptions();
         return v2WithResponse(BinaryData.fromObject(body), requestOptions).getValue().toObject(ModelV2.class);
     }
-
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * 
-     * @param body The body parameter.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @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 the response.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public ModelV3 modelV3(ModelV3 body) {
-        // Generated convenience method for modelV3WithResponse
-        RequestOptions requestOptions = new RequestOptions();
-        return modelV3WithResponse(BinaryData.fromObject(body), requestOptions).getValue().toObject(ModelV3.class);
-    }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java
index 9e6249b27a..2a4f31bbcd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedClientBuilder.java
@@ -190,13 +190,13 @@ public RemovedClientBuilder endpoint(String endpoint) {
     }
 
     /*
-     * Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * Need to be set as 'v1' or 'v2' in client.
      */
     @Generated
     private String version;
 
     /**
-     * Sets Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * Sets Need to be set as 'v1' or 'v2' in client.
      * 
      * @param version the version value.
      * @return the RemovedClientBuilder.
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedServiceVersion.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedServiceVersion.java
index 35ca3398c2..4e2371c643 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedServiceVersion.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/RemovedServiceVersion.java
@@ -15,11 +15,6 @@ public enum RemovedServiceVersion implements ServiceVersion {
      */
     V1("v1"),
 
-    /**
-     * Enum value v2preview.
-     */
-    V2PREVIEW("v2preview"),
-
     /**
      * Enum value v2.
      */
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java
index f109614140..98b2a519bd 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/implementation/RemovedClientImpl.java
@@ -57,12 +57,12 @@ public String getEndpoint() {
     }
 
     /**
-     * Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * Need to be set as 'v1' or 'v2' in client.
      */
     private final String version;
 
     /**
-     * Gets Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * Gets Need to be set as 'v1' or 'v2' in client.
      * 
      * @return the version value.
      */
@@ -116,7 +116,7 @@ public SerializerAdapter getSerializerAdapter() {
      * Initializes an instance of RemovedClient client.
      * 
      * @param endpoint Need to be set as 'http://localhost:3000' in client.
-     * @param version Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * @param version Need to be set as 'v1' or 'v2' in client.
      * @param serviceVersion Service version.
      */
     public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion serviceVersion) {
@@ -129,7 +129,7 @@ public RemovedClientImpl(String endpoint, String version, RemovedServiceVersion
      * 
      * @param httpPipeline The HTTP pipeline to send requests through.
      * @param endpoint Need to be set as 'http://localhost:3000' in client.
-     * @param version Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * @param version Need to be set as 'v1' or 'v2' in client.
      * @param serviceVersion Service version.
      */
     public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String version,
@@ -143,7 +143,7 @@ public RemovedClientImpl(HttpPipeline httpPipeline, String endpoint, String vers
      * @param httpPipeline The HTTP pipeline to send requests through.
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param endpoint Need to be set as 'http://localhost:3000' in client.
-     * @param version Need to be set as 'v1', 'v2preview' or 'v2' in client.
+     * @param version Need to be set as 'v1' or 'v2' in client.
      * @param serviceVersion Service version.
      */
     public RemovedClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint,
@@ -181,26 +181,6 @@ Mono<Response<BinaryData>> v2(@HostParam("endpoint") String endpoint, @HostParam
         Response<BinaryData> v2Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version,
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
-
-        @Post("/v3")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<BinaryData>> modelV3(@HostParam("endpoint") String endpoint, @HostParam("version") String version,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
-
-        @Post("/v3")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ClientAuthenticationException.class, code = { 401 })
-        @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
-        @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response<BinaryData> modelV3Sync(@HostParam("endpoint") String endpoint, @HostParam("version") String version,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -286,86 +266,4 @@ public Response<BinaryData> v2WithResponse(BinaryData body, RequestOptions reque
         return service.v2Sync(this.getEndpoint(), this.getVersion(), contentType, accept, body, requestOptions,
             Context.NONE);
     }
-
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param body The body parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<BinaryData>> modelV3WithResponseAsync(BinaryData body, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.modelV3(this.getEndpoint(), this.getVersion(), contentType,
-            accept, body, requestOptions, context));
-    }
-
-    /**
-     * This operation should be generated with the signatures of both the latest and the original versions, rather than
-     * preview version.
-     * <p><strong>Request Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * <p><strong>Response Body Schema</strong></p>
-     * 
-     * <pre>
-     * {@code
-     * {
-     *     id: String (Required)
-     *     enumProp: String(enumMemberV1/enumMemberV2Preview) (Required)
-     * }
-     * }
-     * </pre>
-     * 
-     * @param body The body parameter.
-     * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the response body along with {@link Response}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<BinaryData> modelV3WithResponse(BinaryData body, RequestOptions requestOptions) {
-        final String contentType = "application/json";
-        final String accept = "application/json";
-        return service.modelV3Sync(this.getEndpoint(), this.getVersion(), contentType, accept, body, requestOptions,
-            Context.NONE);
-    }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/EnumV3.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/EnumV3.java
deleted file mode 100644
index a928ae4f50..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/EnumV3.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.versioning.removed.models;
-
-/**
- * Defines values for EnumV3.
- */
-public enum EnumV3 {
-    /**
-     * Enum value enumMemberV1.
-     */
-    ENUM_MEMBER_V1("enumMemberV1"),
-
-    /**
-     * Enum value enumMemberV2Preview.
-     */
-    ENUM_MEMBER_V2PREVIEW("enumMemberV2Preview");
-
-    /**
-     * The actual serialized value for a EnumV3 instance.
-     */
-    private final String value;
-
-    EnumV3(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Parses a serialized value to a EnumV3 instance.
-     * 
-     * @param value the serialized value to parse.
-     * @return the parsed EnumV3 object, or null if unable to parse.
-     */
-    public static EnumV3 fromString(String value) {
-        if (value == null) {
-            return null;
-        }
-        EnumV3[] items = EnumV3.values();
-        for (EnumV3 item : items) {
-            if (item.toString().equalsIgnoreCase(value)) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return this.value;
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/ModelV3.java b/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/ModelV3.java
deleted file mode 100644
index f1fe10c8b2..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/java/com/versioning/removed/models/ModelV3.java
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.versioning.removed.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * The ModelV3 model.
- */
-@Immutable
-public final class ModelV3 implements JsonSerializable<ModelV3> {
-    /*
-     * The id property.
-     */
-    @Generated
-    private final String id;
-
-    /*
-     * The enumProp property.
-     */
-    @Generated
-    private final EnumV3 enumProp;
-
-    /**
-     * Creates an instance of ModelV3 class.
-     * 
-     * @param id the id value to set.
-     * @param enumProp the enumProp value to set.
-     */
-    @Generated
-    public ModelV3(String id, EnumV3 enumProp) {
-        this.id = id;
-        this.enumProp = enumProp;
-    }
-
-    /**
-     * Get the id property: The id property.
-     * 
-     * @return the id value.
-     */
-    @Generated
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the enumProp property: The enumProp property.
-     * 
-     * @return the enumProp value.
-     */
-    @Generated
-    public EnumV3 getEnumProp() {
-        return this.enumProp;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", this.id);
-        jsonWriter.writeStringField("enumProp", this.enumProp == null ? null : this.enumProp.toString());
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ModelV3 from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ModelV3 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 ModelV3.
-     */
-    @Generated
-    public static ModelV3 fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            String id = null;
-            EnumV3 enumProp = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("id".equals(fieldName)) {
-                    id = reader.getString();
-                } else if ("enumProp".equals(fieldName)) {
-                    enumProp = EnumV3.fromString(reader.getString());
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            return new ModelV3(id, enumProp);
-        });
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-templated_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-templated_apiview_properties.json
deleted file mode 100644
index 2c94155a6c..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/type-model-templated_apiview_properties.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "flavor": "Azure", 
-  "CrossLanguageDefinitionId": {
-    "com.type.model.templated.TemplatedAsyncClient": "Type.Model.Templated",
-    "com.type.model.templated.TemplatedAsyncClient.float32Type": "Type.Model.Templated.float32Type",
-    "com.type.model.templated.TemplatedAsyncClient.float32TypeWithResponse": "Type.Model.Templated.float32Type",
-    "com.type.model.templated.TemplatedAsyncClient.int32Type": "Type.Model.Templated.int32Type",
-    "com.type.model.templated.TemplatedAsyncClient.int32TypeWithResponse": "Type.Model.Templated.int32Type",
-    "com.type.model.templated.TemplatedAsyncClient.numericType": "Type.Model.Templated.numericType",
-    "com.type.model.templated.TemplatedAsyncClient.numericTypeWithResponse": "Type.Model.Templated.numericType",
-    "com.type.model.templated.TemplatedClient": "Type.Model.Templated",
-    "com.type.model.templated.TemplatedClient.float32Type": "Type.Model.Templated.float32Type",
-    "com.type.model.templated.TemplatedClient.float32TypeWithResponse": "Type.Model.Templated.float32Type",
-    "com.type.model.templated.TemplatedClient.int32Type": "Type.Model.Templated.int32Type",
-    "com.type.model.templated.TemplatedClient.int32TypeWithResponse": "Type.Model.Templated.int32Type",
-    "com.type.model.templated.TemplatedClient.numericType": "Type.Model.Templated.numericType",
-    "com.type.model.templated.TemplatedClient.numericTypeWithResponse": "Type.Model.Templated.numericType",
-    "com.type.model.templated.TemplatedClientBuilder": "Type.Model.Templated",
-    "com.type.model.templated.models.Float32Type": "Type.Model.Templated.NumericType",
-    "com.type.model.templated.models.Float32ValuesType": "Type.Model.Templated.Float32ValuesType",
-    "com.type.model.templated.models.Int32Type": "Type.Model.Templated.NumericType",
-    "com.type.model.templated.models.Int32ValuesType": "Type.Model.Templated.Int32ValuesType"
-  }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json
index 6e33a6ea16..c6688917d0 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json
+++ b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/META-INF/versioning-removed_apiview_properties.json
@@ -2,19 +2,13 @@
   "flavor": "Azure", 
   "CrossLanguageDefinitionId": {
     "com.versioning.removed.RemovedAsyncClient": "Versioning.Removed",
-    "com.versioning.removed.RemovedAsyncClient.modelV3": "Versioning.Removed.modelV3",
-    "com.versioning.removed.RemovedAsyncClient.modelV3WithResponse": "Versioning.Removed.modelV3",
     "com.versioning.removed.RemovedAsyncClient.v2": "Versioning.Removed.v2",
     "com.versioning.removed.RemovedAsyncClient.v2WithResponse": "Versioning.Removed.v2",
     "com.versioning.removed.RemovedClient": "Versioning.Removed",
-    "com.versioning.removed.RemovedClient.modelV3": "Versioning.Removed.modelV3",
-    "com.versioning.removed.RemovedClient.modelV3WithResponse": "Versioning.Removed.modelV3",
     "com.versioning.removed.RemovedClient.v2": "Versioning.Removed.v2",
     "com.versioning.removed.RemovedClient.v2WithResponse": "Versioning.Removed.v2",
     "com.versioning.removed.RemovedClientBuilder": "Versioning.Removed",
     "com.versioning.removed.models.EnumV2": "Versioning.Removed.EnumV2",
-    "com.versioning.removed.models.EnumV3": "Versioning.Removed.EnumV3",
-    "com.versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2",
-    "com.versioning.removed.models.ModelV3": "Versioning.Removed.ModelV3"
+    "com.versioning.removed.models.ModelV2": "Versioning.Removed.ModelV2"
   }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-model-templated.properties b/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-model-templated.properties
deleted file mode 100644
index ca812989b4..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/main/resources/type-model-templated.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-name=${project.artifactId}
-version=${project.version}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/RouteTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/RouteTests.java
index 1450629b0f..69e74b19cb 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/RouteTests.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/routes/RouteTests.java
@@ -4,6 +4,10 @@
 package com.routes;
 
 import java.util.List;
+import java.util.Set;
+
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.http.policy.HttpLogOptions;
 import org.junit.jupiter.api.Test;
 
 public class RouteTests {
@@ -70,15 +74,18 @@ public void testQueryExpansionExplode() {
 
         client.primitive("a");
 
-//    client.array(List.of("a", "b"));
+//        client.array(List.of("a", "b"));
     }
 
     @Test
     public void buildQueryParametersQueryContinuationExplode() {
-        var client = new RoutesClientBuilder().buildQueryParametersQueryContinuationExplodeClient();
+        var client = new RoutesClientBuilder().httpLogOptions(new HttpLogOptions()
+                .setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS)
+                .setAllowedQueryParamNames(Set.of("fixed", "param"))
+        ).buildQueryParametersQueryContinuationExplodeClient();
 
         client.primitive("a");
 
-//    client.array(List.of("a", "b"));
+//        client.array(List.of("a", "b"));
     }
 }
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/TemplatedTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/TemplatedTests.java
deleted file mode 100644
index e4cd15cc11..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/TemplatedTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.type.model.templated;
-
-import com.type.model.templated.models.Float32ValuesType;
-import com.type.model.templated.models.Int32ValuesType;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-
-public class TemplatedTests {
-
-    private final TemplatedClient client = new TemplatedClientBuilder().buildClient();
-
-    @Test
-    public void testTemplated() {
-        client.float32Type(new Float32ValuesType(List.of(0.5), 0.5));
-
-        client.int32Type(new Int32ValuesType(List.of(1234), 1234));
-
-        // bug
-        // client.numericType(new Int32Type(List.of(1234), 1234));
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/generated/TemplatedClientTestBase.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/generated/TemplatedClientTestBase.java
deleted file mode 100644
index 05f2252875..0000000000
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/type/model/templated/generated/TemplatedClientTestBase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.type.model.templated.generated;
-
-// The Java test files under 'generated' package are generated for your reference.
-// If you wish to modify these files, please copy them out of the 'generated' package, and modify there.
-// See https://aka.ms/azsdk/dpg/java/tests for guide on adding a test.
-
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.policy.HttpLogOptions;
-import com.azure.core.test.TestMode;
-import com.azure.core.test.TestProxyTestBase;
-import com.azure.core.util.Configuration;
-import com.type.model.templated.TemplatedClient;
-import com.type.model.templated.TemplatedClientBuilder;
-
-class TemplatedClientTestBase extends TestProxyTestBase {
-    protected TemplatedClient templatedClient;
-
-    @Override
-    protected void beforeTest() {
-        TemplatedClientBuilder templatedClientbuilder = new TemplatedClientBuilder()
-            .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "http://localhost:3000"))
-            .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null)))
-            .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC));
-        if (getTestMode() == TestMode.RECORD) {
-            templatedClientbuilder.addPolicy(interceptorManager.getRecordPolicy());
-        }
-        templatedClient = templatedClientbuilder.buildClient();
-
-    }
-}
diff --git a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java
index 7a8b1d87a4..6c7dc98d17 100644
--- a/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java
+++ b/packages/http-client-java/generator/http-client-generator-test/src/test/java/com/versioning/removed/RemovedClientTests.java
@@ -3,13 +3,9 @@
 
 package com.versioning.removed;
 
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.util.BinaryData;
 import com.versioning.removed.models.EnumV2;
-import com.versioning.removed.models.EnumV3;
 import com.versioning.removed.models.ModelV2;
-import com.versioning.removed.models.ModelV3;
 import org.junit.jupiter.api.Test;
 
 public class RemovedClientTests {
@@ -20,18 +16,8 @@ public class RemovedClientTests {
     private final RemovedClient removedClientV2
         = new RemovedClientBuilder().endpoint("http://localhost:3000").version("v2").buildClient();
 
-    private final RemovedClient removedClientV2Preview = new RemovedClientBuilder().endpoint("http://localhost:3000")
-        .version("v2preview")
-        .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BODY_AND_HEADERS))
-        .buildClient();
-
     @Test
     public void tesRemovedClient() {
         removedClientV2.v2(new ModelV2("foo", EnumV2.ENUM_MEMBER_V2, BinaryData.fromObject("bar")));
-
-        removedClientV1.modelV3(new ModelV3("123", EnumV3.ENUM_MEMBER_V1));
-        removedClientV2.modelV3(new ModelV3("123", EnumV3.ENUM_MEMBER_V1));
-        // bug
-        // removedClientV2Preview.modelV3(new ModelV3("123", EnumV3.ENUM_MEMBER_V2PREVIEW));
     }
 }
diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json
index cf9609ae29..e1251d84ba 100644
--- a/packages/http-client-java/package-lock.json
+++ b/packages/http-client-java/package-lock.json
@@ -20,22 +20,22 @@
         "@azure-tools/typespec-azure-resource-manager": "0.47.0",
         "@azure-tools/typespec-azure-rulesets": "0.47.0",
         "@azure-tools/typespec-client-generator-core": "0.47.1",
-        "@microsoft/api-extractor": "^7.47.8",
-        "@microsoft/api-extractor-model": "^7.29.7",
+        "@microsoft/api-extractor": "^7.47.9",
+        "@microsoft/api-extractor-model": "^7.29.8",
         "@types/js-yaml": "~4.0.9",
-        "@types/lodash": "~4.17.7",
-        "@types/node": "~22.5.4",
-        "@typespec/compiler": "0.61.0",
+        "@types/lodash": "~4.17.10",
+        "@types/node": "~22.7.5",
+        "@typespec/compiler": "0.61.2",
         "@typespec/http": "0.61.0",
         "@typespec/openapi": "0.61.0",
         "@typespec/rest": "0.61.0",
         "@typespec/versioning": "0.61.0",
-        "@vitest/coverage-v8": "^2.0.5",
-        "@vitest/ui": "^2.0.5",
+        "@vitest/coverage-v8": "^2.1.2",
+        "@vitest/ui": "^2.1.2",
         "c8": "~10.1.2",
         "rimraf": "~6.0.1",
-        "typescript": "~5.6.2",
-        "vitest": "^2.0.5"
+        "typescript": "~5.6.3",
+        "vitest": "^2.1.2"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -805,18 +805,18 @@
       }
     },
     "node_modules/@microsoft/api-extractor": {
-      "version": "7.47.8",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.47.8.tgz",
-      "integrity": "sha512-oUGCoTIoJvfBycmIcRD3T/vCDu57xHMqHuoL/7N7g35PUjPfBdsYujyoYNNNlKUR6C/TKXjFvHG2G0O+0Lq4JQ==",
+      "version": "7.47.9",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.47.9.tgz",
+      "integrity": "sha512-TTq30M1rikVsO5wZVToQT/dGyJY7UXJmjiRtkHPLb74Prx3Etw8+bX7Bv7iLuby6ysb7fuu1NFWqma+csym8Jw==",
       "dev": true,
       "dependencies": {
-        "@microsoft/api-extractor-model": "7.29.7",
+        "@microsoft/api-extractor-model": "7.29.8",
         "@microsoft/tsdoc": "~0.15.0",
         "@microsoft/tsdoc-config": "~0.17.0",
-        "@rushstack/node-core-library": "5.8.0",
+        "@rushstack/node-core-library": "5.9.0",
         "@rushstack/rig-package": "0.5.3",
-        "@rushstack/terminal": "0.14.1",
-        "@rushstack/ts-command-line": "4.22.7",
+        "@rushstack/terminal": "0.14.2",
+        "@rushstack/ts-command-line": "4.22.8",
         "lodash": "~4.17.15",
         "minimatch": "~3.0.3",
         "resolve": "~1.22.1",
@@ -829,14 +829,14 @@
       }
     },
     "node_modules/@microsoft/api-extractor-model": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.29.7.tgz",
-      "integrity": "sha512-wibEw0xIVARSDvPZU4clLjMhIuUCBGBOsMylBCwTi9d57RTQ5fzWaiVDfk12kW+RSF3VGy8490y8Gz4LVrV41Q==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.29.8.tgz",
+      "integrity": "sha512-t3Z/xcO6TRbMcnKGVMs4uMzv/gd5j0NhMiJIGjD4cJMeFJ1Hf8wnLSx37vxlRlL0GWlGJhnFgxvnaL6JlS+73g==",
       "dev": true,
       "dependencies": {
         "@microsoft/tsdoc": "~0.15.0",
         "@microsoft/tsdoc-config": "~0.17.0",
-        "@rushstack/node-core-library": "5.8.0"
+        "@rushstack/node-core-library": "5.9.0"
       }
     },
     "node_modules/@microsoft/api-extractor/node_modules/brace-expansion": {
@@ -962,15 +962,15 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+      "version": "1.0.0-next.28",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+      "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
-      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -981,9 +981,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -994,9 +994,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
-      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -1007,9 +1007,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
-      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -1020,9 +1020,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
-      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -1033,9 +1033,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
-      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -1046,9 +1046,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
-      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -1059,9 +1059,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
-      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -1072,9 +1072,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
-      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -1085,9 +1085,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
-      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -1098,9 +1098,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
-      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -1111,9 +1111,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
-      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -1124,9 +1124,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
-      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -1137,9 +1137,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
-      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -1150,9 +1150,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
-      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -1163,9 +1163,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
-      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -1176,9 +1176,9 @@
       ]
     },
     "node_modules/@rushstack/node-core-library": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.8.0.tgz",
-      "integrity": "sha512-ByXOkTKlGDrOBVJoNz5D3pgSqU8QOjacYJm8PwtGWofATL/d4R1zYdkZcSXWXRTI7SbP2SjLaAq6sbMlP2ZHXw==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.9.0.tgz",
+      "integrity": "sha512-MMsshEWkTbXqxqFxD4gcIUWQOCeBChlGczdZbHfqmNZQFLHB3yWxDFSMHFUdu2/OB9NUk7Awn5qRL+rws4HQNg==",
       "dev": true,
       "dependencies": {
         "ajv": "~8.13.0",
@@ -1253,12 +1253,12 @@
       }
     },
     "node_modules/@rushstack/terminal": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.14.1.tgz",
-      "integrity": "sha512-pvFzzrBumJBEl0XpW+D44l4QMghEMQiUYWv/Fn68WoQIkcGKv8pid/yKhFEblbzVmolGlR4DMBm1PGCvRV6qFg==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.14.2.tgz",
+      "integrity": "sha512-2fC1wqu1VCExKC0/L+0noVcFQEXEnoBOtCIex1TOjBzEDWcw8KzJjjj7aTP6mLxepG0XIyn9OufeFb6SFsa+sg==",
       "dev": true,
       "dependencies": {
-        "@rushstack/node-core-library": "5.8.0",
+        "@rushstack/node-core-library": "5.9.0",
         "supports-color": "~8.1.1"
       },
       "peerDependencies": {
@@ -1295,12 +1295,12 @@
       }
     },
     "node_modules/@rushstack/ts-command-line": {
-      "version": "4.22.7",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.7.tgz",
-      "integrity": "sha512-kgb8hjEzKucH200xiUecU/VeA/Wzk4BBMRWP2ZLH2XGC/PEYzPih5IyYFtK1QCYboeRYTxoNYwSG6UQlstBaLg==",
+      "version": "4.22.8",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.8.tgz",
+      "integrity": "sha512-XbFjOoV7qZHJnSuFUHv0pKaFA4ixyCuki+xMjsMfDwfvQjs5MYG0IK5COal3tRnG7KCDe2l/G+9LrzYE/RJhgg==",
       "dev": true,
       "dependencies": {
-        "@rushstack/terminal": "0.14.1",
+        "@rushstack/terminal": "0.14.2",
         "@types/argparse": "1.0.38",
         "argparse": "~1.0.9",
         "string-argv": "~0.3.1"
@@ -1333,9 +1333,9 @@
       "dev": true
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true
     },
     "node_modules/@types/istanbul-lib-coverage": {
@@ -1351,24 +1351,24 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.7",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
-      "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==",
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
       "dev": true,
       "dependencies": {
         "undici-types": "~6.19.2"
       }
     },
     "node_modules/@typespec/compiler": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.0.tgz",
-      "integrity": "sha512-sVS8oa6aWAsb2Dy2c4HGn5VOxoYy05bveMn6GRnBA8ZP/wPD3nvJgqWy94AUPezofKoGOfg0Pp/BrrkVyDzCuw==",
+      "version": "0.61.2",
+      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.2.tgz",
+      "integrity": "sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==",
       "dependencies": {
         "@babel/code-frame": "~7.24.7",
         "ajv": "~8.17.1",
@@ -1522,19 +1522,19 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.0.5.tgz",
-      "integrity": "sha512-qeFcySCg5FLO2bHHSa0tAZAOnAUbp4L6/A5JDuj9+bt53JREl8hpLjLHEWF0e/gWc8INVpJaqA7+Ene2rclpZg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.2.tgz",
+      "integrity": "sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^0.2.3",
-        "debug": "^4.3.5",
+        "debug": "^4.3.6",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.1.7",
-        "magic-string": "^0.30.10",
+        "magic-string": "^0.30.11",
         "magicast": "^0.3.4",
         "std-env": "^3.7.0",
         "test-exclude": "^7.0.1",
@@ -1544,17 +1544,23 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.0.5"
+        "@vitest/browser": "2.1.2",
+        "vitest": "2.1.2"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.5.tgz",
-      "integrity": "sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.2.tgz",
+      "integrity": "sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "2.0.5",
-        "@vitest/utils": "2.0.5",
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
         "chai": "^5.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -1562,10 +1568,37 @@
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/@vitest/mocker": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.2.tgz",
+      "integrity": "sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/spy": "^2.1.0-beta.1",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.11"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/spy": "2.1.2",
+        "msw": "^2.3.5",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz",
-      "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.2.tgz",
+      "integrity": "sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==",
       "dev": true,
       "dependencies": {
         "tinyrainbow": "^1.2.0"
@@ -1575,12 +1608,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.5.tgz",
-      "integrity": "sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.2.tgz",
+      "integrity": "sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "2.0.5",
+        "@vitest/utils": "2.1.2",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -1588,13 +1621,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
-      "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.2.tgz",
+      "integrity": "sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==",
       "dev": true,
       "dependencies": {
-        "@vitest/pretty-format": "2.0.5",
-        "magic-string": "^0.30.10",
+        "@vitest/pretty-format": "2.1.2",
+        "magic-string": "^0.30.11",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -1602,9 +1635,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.5.tgz",
-      "integrity": "sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.2.tgz",
+      "integrity": "sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^3.0.0"
@@ -1614,34 +1647,33 @@
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.0.5.tgz",
-      "integrity": "sha512-m+ZpVt/PVi/nbeRKEjdiYeoh0aOfI9zr3Ria9LO7V2PlMETtAXJS3uETEZkc8Be2oOl8mhd7Ew+5SRBXRYncNw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-2.1.2.tgz",
+      "integrity": "sha512-92gcNzkDnmxOxyHzQrQYRsoV9Q0Aay0r4QMLnV+B+lbqlUWa8nDg9ivyLV5mMVTtGirHsYUGGh/zbIA55gBZqA==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "2.0.5",
-        "fast-glob": "^3.3.2",
+        "@vitest/utils": "2.1.2",
         "fflate": "^0.8.2",
         "flatted": "^3.3.1",
         "pathe": "^1.1.2",
         "sirv": "^2.0.4",
+        "tinyglobby": "^0.2.6",
         "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.0.5"
+        "vitest": "2.1.2"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.5.tgz",
-      "integrity": "sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.2.tgz",
+      "integrity": "sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/pretty-format": "2.0.5",
-        "estree-walker": "^3.0.3",
+        "@vitest/pretty-format": "2.1.2",
         "loupe": "^3.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -1893,12 +1925,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1992,29 +2024,6 @@
         "@types/estree": "^1.0.0"
       }
     },
-    "node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2159,27 +2168,6 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/glob": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
@@ -2234,15 +2222,6 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true
     },
-    "node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
     "node_modules/ignore": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
@@ -2310,18 +2289,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -2477,13 +2444,10 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/loupe": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
-      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
+      "dev": true
     },
     "node_modules/lru-cache": {
       "version": "11.0.0",
@@ -2495,9 +2459,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0"
@@ -2529,12 +2493,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -2555,18 +2513,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/minimatch": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
@@ -2601,9 +2547,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/mustache": {
@@ -2632,48 +2578,6 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -2791,9 +2695,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.45",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-      "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
       "funding": [
         {
@@ -2811,8 +2715,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -2954,12 +2858,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -2969,22 +2873,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.2",
-        "@rollup/rollup-android-arm64": "4.21.2",
-        "@rollup/rollup-darwin-arm64": "4.21.2",
-        "@rollup/rollup-darwin-x64": "4.21.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
-        "@rollup/rollup-linux-arm64-musl": "4.21.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-musl": "4.21.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
-        "@rollup/rollup-win32-x64-msvc": "4.21.2",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -3089,9 +2993,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -3176,18 +3080,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -3328,6 +3220,51 @@
       "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
       "dev": true
     },
+    "node_modules/tinyexec": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz",
+      "integrity": "sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==",
+      "dev": true
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.9.tgz",
+      "integrity": "sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==",
+      "dev": true,
+      "dependencies": {
+        "fdir": "^6.4.0",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/tinyglobby/node_modules/fdir": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.0.tgz",
+      "integrity": "sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==",
+      "dev": true,
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tinyglobby/node_modules/picomatch": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/tinypool": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.1.tgz",
@@ -3385,9 +3322,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -3447,9 +3384,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.4.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",
-      "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==",
+      "version": "5.4.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
+      "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.21.3",
@@ -3506,15 +3443,14 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.5.tgz",
-      "integrity": "sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.2.tgz",
+      "integrity": "sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.5",
+        "debug": "^4.3.6",
         "pathe": "^1.1.2",
-        "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0"
       },
       "bin": {
@@ -3528,29 +3464,29 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.5.tgz",
-      "integrity": "sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.2.tgz",
+      "integrity": "sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==",
       "dev": true,
       "dependencies": {
-        "@ampproject/remapping": "^2.3.0",
-        "@vitest/expect": "2.0.5",
-        "@vitest/pretty-format": "^2.0.5",
-        "@vitest/runner": "2.0.5",
-        "@vitest/snapshot": "2.0.5",
-        "@vitest/spy": "2.0.5",
-        "@vitest/utils": "2.0.5",
+        "@vitest/expect": "2.1.2",
+        "@vitest/mocker": "2.1.2",
+        "@vitest/pretty-format": "^2.1.2",
+        "@vitest/runner": "2.1.2",
+        "@vitest/snapshot": "2.1.2",
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
         "chai": "^5.1.1",
-        "debug": "^4.3.5",
-        "execa": "^8.0.1",
-        "magic-string": "^0.30.10",
+        "debug": "^4.3.6",
+        "magic-string": "^0.30.11",
         "pathe": "^1.1.2",
         "std-env": "^3.7.0",
-        "tinybench": "^2.8.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.0",
         "tinypool": "^1.0.0",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.0.5",
+        "vite-node": "2.1.2",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -3565,8 +3501,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.0.5",
-        "@vitest/ui": "2.0.5",
+        "@vitest/browser": "2.1.2",
+        "@vitest/ui": "2.1.2",
         "happy-dom": "*",
         "jsdom": "*"
       },
diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json
index 22bca2b19a..0cd0980a1f 100644
--- a/packages/http-client-java/package.json
+++ b/packages/http-client-java/package.json
@@ -64,21 +64,21 @@
     "@azure-tools/typespec-azure-resource-manager": "0.47.0",
     "@azure-tools/typespec-azure-rulesets": "0.47.0",
     "@azure-tools/typespec-client-generator-core": "0.47.1",
-    "@microsoft/api-extractor": "^7.47.8",
-    "@microsoft/api-extractor-model": "^7.29.7",
+    "@microsoft/api-extractor": "^7.47.9",
+    "@microsoft/api-extractor-model": "^7.29.8",
     "@types/js-yaml": "~4.0.9",
-    "@types/lodash": "~4.17.7",
-    "@types/node": "~22.5.4",
-    "@typespec/compiler": "0.61.0",
+    "@types/lodash": "~4.17.10",
+    "@types/node": "~22.7.5",
+    "@typespec/compiler": "0.61.2",
     "@typespec/http": "0.61.0",
     "@typespec/openapi": "0.61.0",
     "@typespec/rest": "0.61.0",
     "@typespec/versioning": "0.61.0",
-    "@vitest/coverage-v8": "^2.0.5",
-    "@vitest/ui": "^2.0.5",
+    "@vitest/coverage-v8": "^2.1.2",
+    "@vitest/ui": "^2.1.2",
     "c8": "~10.1.2",
     "rimraf": "~6.0.1",
-    "typescript": "~5.6.2",
-    "vitest": "^2.0.5"
+    "typescript": "~5.6.3",
+    "vitest": "^2.1.2"
   }
 }