diff --git a/Build-AutoRest.ps1 b/Build-AutoRest.ps1 index d21d32e6e7..ca21c2ca92 100644 --- a/Build-AutoRest.ps1 +++ b/Build-AutoRest.ps1 @@ -6,7 +6,7 @@ Write-Host "Apply diff to core" Push-Location ./core try { git checkout . - git apply ../core.diff --ignore-whitespace + git apply ../core.patch --ignore-whitespace } finally { Pop-Location } diff --git a/Build-TypeSpec.ps1 b/Build-TypeSpec.ps1 index 4eddc1cc7a..fd924c127b 100644 --- a/Build-TypeSpec.ps1 +++ b/Build-TypeSpec.ps1 @@ -6,7 +6,7 @@ Write-Host "Apply diff to core" Push-Location ./core try { git checkout . - git apply ../core.diff --ignore-whitespace + git apply ../core.patch --ignore-whitespace } finally { Pop-Location } diff --git a/core.diff b/core.patch similarity index 100% rename from core.diff rename to core.patch diff --git a/eng/pipelines/jobs/build-autorest-mgmt.yml b/eng/pipelines/jobs/build-autorest-mgmt.yml index d5a4b6efa3..894d6ed29a 100644 --- a/eng/pipelines/jobs/build-autorest-mgmt.yml +++ b/eng/pipelines/jobs/build-autorest-mgmt.yml @@ -28,7 +28,7 @@ jobs: - script: | git checkout . - git apply ../core.diff --ignore-whitespace + git apply ../core.patch --ignore-whitespace displayName: 'Patch core' workingDirectory: ./core diff --git a/eng/pipelines/jobs/build-autorest.yml b/eng/pipelines/jobs/build-autorest.yml index 0c3a2c7f51..1327f7e92c 100644 --- a/eng/pipelines/jobs/build-autorest.yml +++ b/eng/pipelines/jobs/build-autorest.yml @@ -28,7 +28,7 @@ jobs: - script: | git checkout . - git apply ../core.diff --ignore-whitespace + git apply ../core.patch --ignore-whitespace displayName: 'Patch core' workingDirectory: ./core diff --git a/eng/pipelines/publish-autorest-java.yaml b/eng/pipelines/publish-autorest-java.yaml index 75d71c65d4..b8ea7df738 100644 --- a/eng/pipelines/publish-autorest-java.yaml +++ b/eng/pipelines/publish-autorest-java.yaml @@ -27,7 +27,7 @@ extends: - script: | git checkout . - git apply ../core.diff --ignore-whitespace + git apply ../core.patch --ignore-whitespace displayName: 'Patch core' workingDirectory: ./core diff --git a/eng/sdk/patches/0001-revert-impl-in-batch.patch b/eng/sdk/patches/0001-revert-impl-in-batch.patch new file mode 100644 index 0000000000..f1f1c37d6a --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-batch.patch @@ -0,0 +1,2009 @@ +From 0c42d779a7065394e10a48d3985e81702eb754b3 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 13:58:56 +0800 +Subject: [PATCH] revert impl in batch + +--- + .../batch/implementation/BatchClientImpl.java | 566 +++++++++++------- + 1 file changed, 349 insertions(+), 217 deletions(-) + +diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java +index f035b5a0d26..54023a45502 100644 +--- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java ++++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java +@@ -227,8 +227,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> createPool(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, ++ RequestOptions requestOptions, Context context); + + @Post("/pools") + @ExpectedResponses({ 201 }) +@@ -238,8 +238,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createPoolSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, ++ RequestOptions requestOptions, Context context); + + @Get("/pools") + @ExpectedResponses({ 200 }) +@@ -269,7 +269,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deletePool(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/pools/{poolId}") + @ExpectedResponses({ 202 }) +@@ -279,7 +279,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deletePoolSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Head("/pools/{poolId}") + @ExpectedResponses({ 200, 404 }) +@@ -288,7 +288,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> poolExists(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Head("/pools/{poolId}") + @ExpectedResponses({ 200, 404 }) +@@ -297,7 +297,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response poolExistsSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/pools/{poolId}") + @ExpectedResponses({ 200 }) +@@ -327,8 +327,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> updatePool(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, +- RequestOptions requestOptions, Context context); ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, ++ Context context); + + @Patch("/pools/{poolId}") + @ExpectedResponses({ 200 }) +@@ -338,8 +339,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response updatePoolSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, +- RequestOptions requestOptions, Context context); ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/disableautoscale") + @ExpectedResponses({ 200 }) +@@ -349,7 +351,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> disablePoolAutoScale(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/pools/{poolId}/disableautoscale") + @ExpectedResponses({ 200 }) +@@ -359,7 +361,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response disablePoolAutoScaleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/pools/{poolId}/enableautoscale") + @ExpectedResponses({ 200 }) +@@ -369,7 +371,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enablePoolAutoScale(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -381,7 +383,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enablePoolAutoScaleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -417,7 +419,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> resizePool(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -429,7 +431,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response resizePoolSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -441,7 +443,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> stopPoolResize(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/pools/{poolId}/stopresize") + @ExpectedResponses({ 202 }) +@@ -451,7 +453,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response stopPoolResizeSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/pools/{poolId}/updateproperties") + @ExpectedResponses({ 204 }) +@@ -461,8 +463,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> replacePoolProperties(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, +- RequestOptions requestOptions, Context context); ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/updateproperties") + @ExpectedResponses({ 204 }) +@@ -472,8 +475,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response replacePoolPropertiesSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, +- RequestOptions requestOptions, Context context); ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/removenodes") + @ExpectedResponses({ 202 }) +@@ -483,7 +487,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> removeNodes(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -495,7 +499,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response removeNodesSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("poolId") String poolId, ++ @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -547,7 +551,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/jobs/{jobId}") + @ExpectedResponses({ 202 }) +@@ -557,7 +561,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/jobs/{jobId}") + @ExpectedResponses({ 200 }) +@@ -587,8 +591,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> updateJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, ++ Context context); + + @Patch("/jobs/{jobId}") + @ExpectedResponses({ 200 }) +@@ -598,8 +603,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response updateJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, ++ Context context); + + @Put("/jobs/{jobId}") + @ExpectedResponses({ 200 }) +@@ -609,8 +615,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> replaceJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, ++ Context context); + + @Put("/jobs/{jobId}") + @ExpectedResponses({ 200 }) +@@ -620,8 +627,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response replaceJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/disable") + @ExpectedResponses({ 202 }) +@@ -631,8 +639,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> disableJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData content, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/disable") + @ExpectedResponses({ 202 }) +@@ -642,8 +651,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response disableJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData content, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/enable") + @ExpectedResponses({ 202 }) +@@ -653,7 +663,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enableJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobs/{jobId}/enable") + @ExpectedResponses({ 202 }) +@@ -663,7 +673,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enableJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobs/{jobId}/terminate") + @ExpectedResponses({ 202 }) +@@ -673,7 +683,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> terminateJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobs/{jobId}/terminate") + @ExpectedResponses({ 202 }) +@@ -683,7 +693,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response terminateJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobs") + @ExpectedResponses({ 201 }) +@@ -693,8 +703,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> createJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, ++ RequestOptions requestOptions, Context context); + + @Post("/jobs") + @ExpectedResponses({ 201 }) +@@ -704,8 +714,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job, ++ RequestOptions requestOptions, Context context); + + @Get("/jobs") + @ExpectedResponses({ 200 }) +@@ -795,6 +805,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> createCertificate(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, ++ @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData certificate, RequestOptions requestOptions, + Context context); + +@@ -806,6 +817,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createCertificateSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, ++ @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData certificate, RequestOptions requestOptions, + Context context); + +@@ -837,7 +849,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> cancelCertificateDeletion(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("thumbprintAlgorithm") String thumbprintAlgorithm, +- @PathParam("thumbprint") String thumbprint, RequestOptions requestOptions, Context context); ++ @PathParam("thumbprint") String thumbprint, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Post("/certificates(thumbprintAlgorithm={thumbprintAlgorithm},thumbprint={thumbprint})/canceldelete") + @ExpectedResponses({ 204 }) +@@ -847,7 +860,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response cancelCertificateDeletionSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("thumbprintAlgorithm") String thumbprintAlgorithm, +- @PathParam("thumbprint") String thumbprint, RequestOptions requestOptions, Context context); ++ @PathParam("thumbprint") String thumbprint, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Delete("/certificates(thumbprintAlgorithm={thumbprintAlgorithm},thumbprint={thumbprint})") + @ExpectedResponses({ 202 }) +@@ -857,7 +871,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteCertificate(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("thumbprintAlgorithm") String thumbprintAlgorithm, +- @PathParam("thumbprint") String thumbprint, RequestOptions requestOptions, Context context); ++ @PathParam("thumbprint") String thumbprint, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Delete("/certificates(thumbprintAlgorithm={thumbprintAlgorithm},thumbprint={thumbprint})") + @ExpectedResponses({ 202 }) +@@ -867,7 +882,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteCertificateSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("thumbprintAlgorithm") String thumbprintAlgorithm, +- @PathParam("thumbprint") String thumbprint, RequestOptions requestOptions, Context context); ++ @PathParam("thumbprint") String thumbprint, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Get("/certificates(thumbprintAlgorithm={thumbprintAlgorithm},thumbprint={thumbprint})") + @ExpectedResponses({ 200 }) +@@ -898,7 +914,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> jobScheduleExists(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Head("/jobschedules/{jobScheduleId}") + @ExpectedResponses({ 200, 404 }) +@@ -907,7 +923,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response jobScheduleExistsSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/jobschedules/{jobScheduleId}") + @ExpectedResponses({ 202 }) +@@ -917,7 +933,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/jobschedules/{jobScheduleId}") + @ExpectedResponses({ 202 }) +@@ -927,7 +943,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/jobschedules/{jobScheduleId}") + @ExpectedResponses({ 200 }) +@@ -957,7 +973,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> updateJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobScheduleId") String jobScheduleId, ++ @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -969,7 +985,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response updateJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobScheduleId") String jobScheduleId, ++ @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -981,7 +997,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> replaceJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobScheduleId") String jobScheduleId, ++ @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -993,7 +1009,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response replaceJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobScheduleId") String jobScheduleId, ++ @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -1005,7 +1021,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> disableJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules/{jobScheduleId}/disable") + @ExpectedResponses({ 204 }) +@@ -1015,7 +1031,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response disableJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules/{jobScheduleId}/enable") + @ExpectedResponses({ 204 }) +@@ -1025,7 +1041,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enableJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules/{jobScheduleId}/enable") + @ExpectedResponses({ 204 }) +@@ -1035,7 +1051,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enableJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules/{jobScheduleId}/terminate") + @ExpectedResponses({ 202 }) +@@ -1045,7 +1061,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> terminateJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules/{jobScheduleId}/terminate") + @ExpectedResponses({ 202 }) +@@ -1055,7 +1071,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response terminateJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/jobschedules") + @ExpectedResponses({ 201 }) +@@ -1065,6 +1081,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> createJobSchedule(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, ++ @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -1076,6 +1093,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createJobScheduleSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, ++ @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions, + Context context); + +@@ -1107,8 +1125,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> createTask(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData task, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/tasks") + @ExpectedResponses({ 201 }) +@@ -1118,8 +1137,9 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response createTaskSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @BodyParam("application/json; odata=minimalmetadata") BinaryData task, +- RequestOptions requestOptions, Context context); ++ @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions, ++ Context context); + + @Get("/jobs/{jobId}/tasks") + @ExpectedResponses({ 200 }) +@@ -1173,7 +1193,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTask(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/jobs/{jobId}/tasks/{taskId}") + @ExpectedResponses({ 200 }) +@@ -1183,7 +1204,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTaskSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Get("/jobs/{jobId}/tasks/{taskId}") + @ExpectedResponses({ 200 }) +@@ -1215,7 +1237,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> replaceTask(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, ++ @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions, + Context context); + +@@ -1227,7 +1249,7 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response replaceTaskSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, +- @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, ++ @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions, + Context context); + +@@ -1261,7 +1283,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> terminateTask(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/tasks/{taskId}/terminate") + @ExpectedResponses({ 204 }) +@@ -1271,7 +1294,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response terminateTaskSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/tasks/{taskId}/reactivate") + @ExpectedResponses({ 204 }) +@@ -1281,7 +1305,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> reactivateTask(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/jobs/{jobId}/tasks/{taskId}/reactivate") + @ExpectedResponses({ 204 }) +@@ -1291,7 +1316,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response reactivateTaskSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, RequestOptions requestOptions, Context context); ++ @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/jobs/{jobId}/tasks/{taskId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1301,8 +1327,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTaskFile(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/jobs/{jobId}/tasks/{taskId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1312,8 +1338,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTaskFileSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/jobs/{jobId}/tasks/{taskId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1345,8 +1371,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getTaskFileProperties(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Head("/jobs/{jobId}/tasks/{taskId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1356,8 +1382,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getTaskFilePropertiesSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("taskId") String taskId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/jobs/{jobId}/tasks/{taskId}/files") + @ExpectedResponses({ 200 }) +@@ -1390,8 +1416,8 @@ public final class BatchClientImpl { + Mono> createNodeUser(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, + @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData user, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user, ++ RequestOptions requestOptions, Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/users") + @ExpectedResponses({ 201 }) +@@ -1402,8 +1428,8 @@ public final class BatchClientImpl { + Response createNodeUserSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, + @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId, +- @BodyParam("application/json; odata=minimalmetadata") BinaryData user, RequestOptions requestOptions, +- Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user, ++ RequestOptions requestOptions, Context context); + + @Delete("/pools/{poolId}/nodes/{nodeId}/users/{userName}") + @ExpectedResponses({ 200 }) +@@ -1413,8 +1439,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteNodeUser(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("userName") String userName, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("userName") String userName, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/pools/{poolId}/nodes/{nodeId}/users/{userName}") + @ExpectedResponses({ 200 }) +@@ -1424,8 +1450,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteNodeUserSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("userName") String userName, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("userName") String userName, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Put("/pools/{poolId}/nodes/{nodeId}/users/{userName}") + @ExpectedResponses({ 200 }) +@@ -1436,7 +1462,7 @@ public final class BatchClientImpl { + Mono> replaceNodeUser(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, + @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId, +- @PathParam("userName") String userName, ++ @PathParam("userName") String userName, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -1449,7 +1475,7 @@ public final class BatchClientImpl { + Response replaceNodeUserSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType, + @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId, +- @PathParam("userName") String userName, ++ @PathParam("userName") String userName, @HeaderParam("Accept") String accept, + @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions, + Context context); + +@@ -1483,7 +1509,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> rebootNode(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/reboot") + @ExpectedResponses({ 202 }) +@@ -1493,7 +1520,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response rebootNodeSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/start") + @ExpectedResponses({ 202 }) +@@ -1503,7 +1531,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> startNode(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/start") + @ExpectedResponses({ 202 }) +@@ -1513,7 +1542,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response startNodeSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/reimage") + @ExpectedResponses({ 202 }) +@@ -1523,7 +1553,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> reimageNode(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/reimage") + @ExpectedResponses({ 202 }) +@@ -1533,7 +1564,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response reimageNodeSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/deallocate") + @ExpectedResponses({ 202 }) +@@ -1543,7 +1575,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deallocateNode(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/deallocate") + @ExpectedResponses({ 202 }) +@@ -1553,7 +1586,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deallocateNodeSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/disablescheduling") + @ExpectedResponses({ 200 }) +@@ -1563,7 +1597,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> disableNodeScheduling(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/disablescheduling") + @ExpectedResponses({ 200 }) +@@ -1573,7 +1608,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response disableNodeSchedulingSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/enablescheduling") + @ExpectedResponses({ 200 }) +@@ -1583,7 +1619,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> enableNodeScheduling(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/pools/{poolId}/nodes/{nodeId}/enablescheduling") + @ExpectedResponses({ 200 }) +@@ -1593,7 +1630,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response enableNodeSchedulingSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, RequestOptions requestOptions, Context context); ++ @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Get("/pools/{poolId}/nodes/{nodeId}/remoteloginsettings") + @ExpectedResponses({ 200 }) +@@ -1715,8 +1753,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteNodeFile(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/pools/{poolId}/nodes/{nodeId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1726,8 +1764,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteNodeFileSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/pools/{poolId}/nodes/{nodeId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1759,8 +1797,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> getNodeFileProperties(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Head("/pools/{poolId}/nodes/{nodeId}/files/{filePath}") + @ExpectedResponses({ 200 }) +@@ -1770,8 +1808,8 @@ public final class BatchClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response getNodeFilePropertiesSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId, +- @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, RequestOptions requestOptions, +- Context context); ++ @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath, ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/pools/{poolId}/nodes/{nodeId}/files") + @ExpectedResponses({ 200 }) +@@ -3062,8 +3100,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> createPoolWithResponseAsync(BinaryData pool, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createPool(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, pool, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, pool, requestOptions, context)); + } + + /** +@@ -3373,8 +3412,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createPoolWithResponse(BinaryData pool, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; +- return service.createPoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, pool, +- requestOptions, Context.NONE); ++ final String accept = "application/json"; ++ return service.createPoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept, ++ pool, requestOptions, Context.NONE); + } + + /** +@@ -5024,8 +5064,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deletePoolWithResponseAsync(String poolId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deletePool(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, accept, requestOptions, context)); + } + + /** +@@ -5085,8 +5126,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deletePoolWithResponse(String poolId, RequestOptions requestOptions) { +- return service.deletePoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.deletePoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -5139,8 +5181,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> poolExistsWithResponseAsync(String poolId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.poolExists(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, accept, requestOptions, context)); + } + + /** +@@ -5193,8 +5236,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response poolExistsWithResponse(String poolId, RequestOptions requestOptions) { +- return service.poolExistsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.poolExistsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -6326,8 +6370,9 @@ public final class BatchClientImpl { + public Mono> updatePoolWithResponseAsync(String poolId, BinaryData pool, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.updatePool(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, pool, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, accept, pool, requestOptions, context)); + } + + /** +@@ -6653,8 +6698,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response updatePoolWithResponse(String poolId, BinaryData pool, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.updatePoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, poolId, +- pool, requestOptions, Context.NONE); ++ accept, pool, requestOptions, Context.NONE); + } + + /** +@@ -6679,8 +6725,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> disablePoolAutoScaleWithResponseAsync(String poolId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.disablePoolAutoScale(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, accept, requestOptions, context)); + } + + /** +@@ -6705,8 +6752,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response disablePoolAutoScaleWithResponse(String poolId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.disablePoolAutoScaleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -6773,8 +6821,9 @@ public final class BatchClientImpl { + public Mono> enablePoolAutoScaleWithResponseAsync(String poolId, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enablePoolAutoScale(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, content, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, accept, content, requestOptions, context)); + } + + /** +@@ -6841,8 +6890,9 @@ public final class BatchClientImpl { + public Response enablePoolAutoScaleWithResponse(String poolId, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.enablePoolAutoScaleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- poolId, content, requestOptions, Context.NONE); ++ poolId, accept, content, requestOptions, Context.NONE); + } + + /** +@@ -7047,8 +7097,9 @@ public final class BatchClientImpl { + public Mono> resizePoolWithResponseAsync(String poolId, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.resizePool(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, content, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, accept, content, requestOptions, context)); + } + + /** +@@ -7117,8 +7168,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response resizePoolWithResponse(String poolId, BinaryData content, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.resizePoolSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, poolId, +- content, requestOptions, Context.NONE); ++ accept, content, requestOptions, Context.NONE); + } + + /** +@@ -7173,8 +7225,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> stopPoolResizeWithResponseAsync(String poolId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.stopPoolResize(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, accept, requestOptions, context)); + } + + /** +@@ -7229,7 +7282,8 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response stopPoolResizeWithResponse(String poolId, RequestOptions requestOptions) { +- return service.stopPoolResizeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, ++ final String accept = "application/json"; ++ return service.stopPoolResizeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, accept, + requestOptions, Context.NONE); + } + +@@ -7342,8 +7396,9 @@ public final class BatchClientImpl { + public Mono> replacePoolPropertiesWithResponseAsync(String poolId, BinaryData pool, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.replacePoolProperties(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, pool, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, accept, pool, requestOptions, context)); + } + + /** +@@ -7455,8 +7510,9 @@ public final class BatchClientImpl { + public Response replacePoolPropertiesWithResponse(String poolId, BinaryData pool, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.replacePoolPropertiesSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- poolId, pool, requestOptions, Context.NONE); ++ poolId, accept, pool, requestOptions, Context.NONE); + } + + /** +@@ -7523,8 +7579,9 @@ public final class BatchClientImpl { + public Mono> removeNodesWithResponseAsync(String poolId, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.removeNodes(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, content, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, accept, content, requestOptions, context)); + } + + /** +@@ -7590,8 +7647,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response removeNodesWithResponse(String poolId, BinaryData content, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.removeNodesSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, poolId, +- content, requestOptions, Context.NONE); ++ accept, content, requestOptions, Context.NONE); + } + + /** +@@ -8231,8 +8289,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteJobWithResponseAsync(String jobId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, accept, requestOptions, context)); + } + + /** +@@ -8290,8 +8349,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteJobWithResponse(String jobId, RequestOptions requestOptions) { +- return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -9613,8 +9673,9 @@ public final class BatchClientImpl { + public Mono> updateJobWithResponseAsync(String jobId, BinaryData job, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.updateJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobId, job, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, jobId, accept, job, requestOptions, context)); + } + + /** +@@ -9969,8 +10030,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response updateJobWithResponse(String jobId, BinaryData job, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; +- return service.updateJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, job, +- requestOptions, Context.NONE); ++ final String accept = "application/json"; ++ return service.updateJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, ++ accept, job, requestOptions, Context.NONE); + } + + /** +@@ -10454,8 +10516,9 @@ public final class BatchClientImpl { + public Mono> replaceJobWithResponseAsync(String jobId, BinaryData job, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.replaceJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobId, job, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, jobId, accept, job, requestOptions, context)); + } + + /** +@@ -10938,8 +11001,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response replaceJobWithResponse(String jobId, BinaryData job, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.replaceJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, +- job, requestOptions, Context.NONE); ++ accept, job, requestOptions, Context.NONE); + } + + /** +@@ -11007,8 +11071,9 @@ public final class BatchClientImpl { + public Mono> disableJobWithResponseAsync(String jobId, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.disableJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobId, content, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, jobId, accept, content, requestOptions, context)); + } + + /** +@@ -11075,8 +11140,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response disableJobWithResponse(String jobId, BinaryData content, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.disableJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, +- content, requestOptions, Context.NONE); ++ accept, content, requestOptions, Context.NONE); + } + + /** +@@ -11130,8 +11196,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enableJobWithResponseAsync(String jobId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enableJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, accept, requestOptions, context)); + } + + /** +@@ -11185,8 +11252,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enableJobWithResponse(String jobId, RequestOptions requestOptions) { +- return service.enableJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.enableJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -11253,6 +11321,7 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> terminateJobWithResponseAsync(String jobId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -11260,7 +11329,7 @@ public final class BatchClientImpl { + } + }); + return FluxUtil.withContext(context -> service.terminateJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, requestOptionsLocal, context)); ++ this.getServiceVersion().getVersion(), jobId, accept, requestOptionsLocal, context)); + } + + /** +@@ -11327,13 +11396,14 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response terminateJobWithResponse(String jobId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { + requestLocal.getHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/json; odata=minimalmetadata"); + } + }); +- return service.terminateJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, ++ return service.terminateJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, accept, + requestOptionsLocal, Context.NONE); + } + +@@ -11759,8 +11829,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> createJobWithResponseAsync(BinaryData job, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, job, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, job, requestOptions, context)); + } + + /** +@@ -12185,8 +12256,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createJobWithResponse(BinaryData job, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; +- return service.createJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, job, +- requestOptions, Context.NONE); ++ final String accept = "application/json"; ++ return service.createJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept, ++ job, requestOptions, Context.NONE); + } + + /** +@@ -16616,8 +16688,9 @@ public final class BatchClientImpl { + public Mono> createCertificateWithResponseAsync(BinaryData certificate, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createCertificate(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, certificate, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, certificate, requestOptions, context)); + } + + /** +@@ -16672,8 +16745,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createCertificateWithResponse(BinaryData certificate, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.createCertificateSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- certificate, requestOptions, Context.NONE); ++ accept, certificate, requestOptions, Context.NONE); + } + + /** +@@ -17010,8 +17084,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> cancelCertificateDeletionWithResponseAsync(String thumbprintAlgorithm, + String thumbprint, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.cancelCertificateDeletion(this.getEndpoint(), +- this.getServiceVersion().getVersion(), thumbprintAlgorithm, thumbprint, requestOptions, context)); ++ this.getServiceVersion().getVersion(), thumbprintAlgorithm, thumbprint, accept, requestOptions, context)); + } + + /** +@@ -17046,8 +17121,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response cancelCertificateDeletionWithResponse(String thumbprintAlgorithm, String thumbprint, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.cancelCertificateDeletionSync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- thumbprintAlgorithm, thumbprint, requestOptions, Context.NONE); ++ thumbprintAlgorithm, thumbprint, accept, requestOptions, Context.NONE); + } + + /** +@@ -17084,8 +17160,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteCertificateWithResponseAsync(String thumbprintAlgorithm, String thumbprint, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteCertificate(this.getEndpoint(), +- this.getServiceVersion().getVersion(), thumbprintAlgorithm, thumbprint, requestOptions, context)); ++ this.getServiceVersion().getVersion(), thumbprintAlgorithm, thumbprint, accept, requestOptions, context)); + } + + /** +@@ -17122,8 +17199,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteCertificateWithResponse(String thumbprintAlgorithm, String thumbprint, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteCertificateSync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- thumbprintAlgorithm, thumbprint, requestOptions, Context.NONE); ++ thumbprintAlgorithm, thumbprint, accept, requestOptions, Context.NONE); + } + + /** +@@ -17298,8 +17376,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> jobScheduleExistsWithResponseAsync(String jobScheduleId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.jobScheduleExists(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobScheduleId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobScheduleId, accept, requestOptions, context)); + } + + /** +@@ -17352,8 +17431,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response jobScheduleExistsWithResponse(String jobScheduleId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.jobScheduleExistsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobScheduleId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -17409,8 +17489,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteJobScheduleWithResponseAsync(String jobScheduleId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobScheduleId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobScheduleId, accept, requestOptions, context)); + } + + /** +@@ -17465,8 +17546,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteJobScheduleWithResponse(String jobScheduleId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobScheduleId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -18895,8 +18977,10 @@ public final class BatchClientImpl { + public Mono> updateJobScheduleWithResponseAsync(String jobScheduleId, BinaryData jobSchedule, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; +- return FluxUtil.withContext(context -> service.updateJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobScheduleId, jobSchedule, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil ++ .withContext(context -> service.updateJobSchedule(this.getEndpoint(), this.getServiceVersion().getVersion(), ++ contentType, jobScheduleId, accept, jobSchedule, requestOptions, context)); + } + + /** +@@ -19351,8 +19435,9 @@ public final class BatchClientImpl { + public Response updateJobScheduleWithResponse(String jobScheduleId, BinaryData jobSchedule, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.updateJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- jobScheduleId, jobSchedule, requestOptions, Context.NONE); ++ jobScheduleId, accept, jobSchedule, requestOptions, Context.NONE); + } + + /** +@@ -19841,8 +19926,10 @@ public final class BatchClientImpl { + public Mono> replaceJobScheduleWithResponseAsync(String jobScheduleId, BinaryData jobSchedule, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; +- return FluxUtil.withContext(context -> service.replaceJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobScheduleId, jobSchedule, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil.withContext( ++ context -> service.replaceJobSchedule(this.getEndpoint(), this.getServiceVersion().getVersion(), ++ contentType, jobScheduleId, accept, jobSchedule, requestOptions, context)); + } + + /** +@@ -20331,8 +20418,9 @@ public final class BatchClientImpl { + public Response replaceJobScheduleWithResponse(String jobScheduleId, BinaryData jobSchedule, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.replaceJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- jobScheduleId, jobSchedule, requestOptions, Context.NONE); ++ jobScheduleId, accept, jobSchedule, requestOptions, Context.NONE); + } + + /** +@@ -20382,8 +20470,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> disableJobScheduleWithResponseAsync(String jobScheduleId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.disableJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobScheduleId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobScheduleId, accept, requestOptions, context)); + } + + /** +@@ -20432,8 +20521,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response disableJobScheduleWithResponse(String jobScheduleId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.disableJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobScheduleId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -20481,8 +20571,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enableJobScheduleWithResponseAsync(String jobScheduleId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enableJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobScheduleId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobScheduleId, accept, requestOptions, context)); + } + + /** +@@ -20529,8 +20620,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enableJobScheduleWithResponse(String jobScheduleId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.enableJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobScheduleId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -20580,8 +20672,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> terminateJobScheduleWithResponseAsync(String jobScheduleId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.terminateJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobScheduleId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobScheduleId, accept, requestOptions, context)); + } + + /** +@@ -20630,8 +20723,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response terminateJobScheduleWithResponse(String jobScheduleId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.terminateJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- jobScheduleId, requestOptions, Context.NONE); ++ jobScheduleId, accept, requestOptions, Context.NONE); + } + + /** +@@ -21059,8 +21153,9 @@ public final class BatchClientImpl { + public Mono> createJobScheduleWithResponseAsync(BinaryData jobSchedule, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createJobSchedule(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobSchedule, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, jobSchedule, requestOptions, context)); + } + + /** +@@ -21487,8 +21582,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createJobScheduleWithResponse(BinaryData jobSchedule, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.createJobScheduleSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- jobSchedule, requestOptions, Context.NONE); ++ accept, jobSchedule, requestOptions, Context.NONE); + } + + /** +@@ -23580,8 +23676,9 @@ public final class BatchClientImpl { + public Mono> createTaskWithResponseAsync(String jobId, BinaryData task, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createTask(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobId, task, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, jobId, accept, task, requestOptions, context)); + } + + /** +@@ -23746,8 +23843,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response createTaskWithResponse(String jobId, BinaryData task, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.createTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, +- task, requestOptions, Context.NONE); ++ accept, task, requestOptions, Context.NONE); + } + + /** +@@ -25202,8 +25300,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTaskWithResponseAsync(String jobId, String taskId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTask(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, taskId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, taskId, accept, requestOptions, context)); + } + + /** +@@ -25257,7 +25356,8 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTaskWithResponse(String jobId, String taskId, RequestOptions requestOptions) { +- return service.deleteTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId, ++ final String accept = "application/json"; ++ return service.deleteTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId, accept, + requestOptions, Context.NONE); + } + +@@ -25999,8 +26099,9 @@ public final class BatchClientImpl { + public Mono> replaceTaskWithResponseAsync(String jobId, String taskId, BinaryData task, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.replaceTask(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, jobId, taskId, task, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, jobId, taskId, accept, task, requestOptions, context)); + } + + /** +@@ -26240,8 +26341,9 @@ public final class BatchClientImpl { + public Response replaceTaskWithResponse(String jobId, String taskId, BinaryData task, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.replaceTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, jobId, +- taskId, task, requestOptions, Context.NONE); ++ taskId, accept, task, requestOptions, Context.NONE); + } + + /** +@@ -26602,8 +26704,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> terminateTaskWithResponseAsync(String jobId, String taskId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.terminateTask(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, taskId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, taskId, accept, requestOptions, context)); + } + + /** +@@ -26655,8 +26758,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response terminateTaskWithResponse(String jobId, String taskId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.terminateTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -26714,8 +26818,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> reactivateTaskWithResponseAsync(String jobId, String taskId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.reactivateTask(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, taskId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, taskId, accept, requestOptions, context)); + } + + /** +@@ -26772,8 +26877,9 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response reactivateTaskWithResponse(String jobId, String taskId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.reactivateTaskSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -26806,8 +26912,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTaskFileWithResponseAsync(String jobId, String taskId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTaskFile(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, taskId, filePath, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, taskId, filePath, accept, requestOptions, context)); + } + + /** +@@ -26840,8 +26947,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTaskFileWithResponse(String jobId, String taskId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteTaskFileSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId, +- filePath, requestOptions, Context.NONE); ++ filePath, accept, requestOptions, Context.NONE); + } + + /** +@@ -26992,8 +27100,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getTaskFilePropertiesWithResponseAsync(String jobId, String taskId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.getTaskFileProperties(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, taskId, filePath, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, taskId, filePath, accept, requestOptions, context)); + } + + /** +@@ -27035,8 +27144,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getTaskFilePropertiesWithResponse(String jobId, String taskId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.getTaskFilePropertiesSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, +- taskId, filePath, requestOptions, Context.NONE); ++ taskId, filePath, accept, requestOptions, Context.NONE); + } + + /** +@@ -27356,8 +27466,9 @@ public final class BatchClientImpl { + public Mono> createNodeUserWithResponseAsync(String poolId, String nodeId, BinaryData user, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.createNodeUser(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, poolId, nodeId, user, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, poolId, nodeId, accept, user, requestOptions, context)); + } + + /** +@@ -27402,8 +27513,9 @@ public final class BatchClientImpl { + public Response createNodeUserWithResponse(String poolId, String nodeId, BinaryData user, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.createNodeUserSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- poolId, nodeId, user, requestOptions, Context.NONE); ++ poolId, nodeId, accept, user, requestOptions, Context.NONE); + } + + /** +@@ -27434,8 +27546,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteNodeUserWithResponseAsync(String poolId, String nodeId, String userName, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteNodeUser(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, userName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, userName, accept, requestOptions, context)); + } + + /** +@@ -27466,8 +27579,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteNodeUserWithResponse(String poolId, String nodeId, String userName, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteNodeUserSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, +- userName, requestOptions, Context.NONE); ++ userName, accept, requestOptions, Context.NONE); + } + + /** +@@ -27513,9 +27627,10 @@ public final class BatchClientImpl { + public Mono> replaceNodeUserWithResponseAsync(String poolId, String nodeId, String userName, + BinaryData content, RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.replaceNodeUser(this.getEndpoint(), this.getServiceVersion().getVersion(), +- contentType, poolId, nodeId, userName, content, requestOptions, context)); ++ contentType, poolId, nodeId, userName, accept, content, requestOptions, context)); + } + + /** +@@ -27561,8 +27676,9 @@ public final class BatchClientImpl { + public Response replaceNodeUserWithResponse(String poolId, String nodeId, String userName, BinaryData content, + RequestOptions requestOptions) { + final String contentType = "application/json; odata=minimalmetadata"; ++ final String accept = "application/json"; + return service.replaceNodeUserSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- poolId, nodeId, userName, content, requestOptions, Context.NONE); ++ poolId, nodeId, userName, accept, content, requestOptions, Context.NONE); + } + + /** +@@ -28002,6 +28118,7 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> rebootNodeWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28009,7 +28126,7 @@ public final class BatchClientImpl { + } + }); + return FluxUtil.withContext(context -> service.rebootNode(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptionsLocal, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context)); + } + + /** +@@ -28054,13 +28171,14 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response rebootNodeWithResponse(String poolId, String nodeId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { + requestLocal.getHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/json; odata=minimalmetadata"); + } + }); +- return service.rebootNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, ++ return service.rebootNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, accept, + requestOptionsLocal, Context.NONE); + } + +@@ -28090,8 +28208,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> startNodeWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.startNode(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptions, context)); + } + + /** +@@ -28119,7 +28238,8 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response startNodeWithResponse(String poolId, String nodeId, RequestOptions requestOptions) { +- return service.startNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, ++ final String accept = "application/json"; ++ return service.startNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, accept, + requestOptions, Context.NONE); + } + +@@ -28168,6 +28288,7 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> reimageNodeWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28175,7 +28296,7 @@ public final class BatchClientImpl { + } + }); + return FluxUtil.withContext(context -> service.reimageNode(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptionsLocal, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context)); + } + + /** +@@ -28222,6 +28343,7 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response reimageNodeWithResponse(String poolId, String nodeId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28229,7 +28351,7 @@ public final class BatchClientImpl { + } + }); + return service.reimageNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, +- requestOptionsLocal, Context.NONE); ++ accept, requestOptionsLocal, Context.NONE); + } + + /** +@@ -28275,6 +28397,7 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deallocateNodeWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28282,7 +28405,7 @@ public final class BatchClientImpl { + } + }); + return FluxUtil.withContext(context -> service.deallocateNode(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptionsLocal, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context)); + } + + /** +@@ -28327,6 +28450,7 @@ public final class BatchClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deallocateNodeWithResponse(String poolId, String nodeId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28334,7 +28458,7 @@ public final class BatchClientImpl { + } + }); + return service.deallocateNodeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, +- requestOptionsLocal, Context.NONE); ++ accept, requestOptionsLocal, Context.NONE); + } + + /** +@@ -28381,6 +28505,7 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> disableNodeSchedulingWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28388,7 +28513,7 @@ public final class BatchClientImpl { + } + }); + return FluxUtil.withContext(context -> service.disableNodeScheduling(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptionsLocal, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context)); + } + + /** +@@ -28435,6 +28560,7 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response disableNodeSchedulingWithResponse(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions; + requestOptionsLocal.addRequestCallback(requestLocal -> { + if (requestLocal.getBody() != null && requestLocal.getHeaders().get(HttpHeaderName.CONTENT_TYPE) == null) { +@@ -28442,7 +28568,7 @@ public final class BatchClientImpl { + } + }); + return service.disableNodeSchedulingSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, +- nodeId, requestOptionsLocal, Context.NONE); ++ nodeId, accept, requestOptionsLocal, Context.NONE); + } + + /** +@@ -28472,8 +28598,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> enableNodeSchedulingWithResponseAsync(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.enableNodeScheduling(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptions, context)); + } + + /** +@@ -28503,8 +28630,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response enableNodeSchedulingWithResponse(String poolId, String nodeId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.enableNodeSchedulingSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, +- nodeId, requestOptions, Context.NONE); ++ nodeId, accept, requestOptions, Context.NONE); + } + + /** +@@ -30106,8 +30234,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteNodeFileWithResponseAsync(String poolId, String nodeId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteNodeFile(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, filePath, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, filePath, accept, requestOptions, context)); + } + + /** +@@ -30140,8 +30269,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteNodeFileWithResponse(String poolId, String nodeId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteNodeFileSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId, +- filePath, requestOptions, Context.NONE); ++ filePath, accept, requestOptions, Context.NONE); + } + + /** +@@ -30292,8 +30422,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> getNodeFilePropertiesWithResponseAsync(String poolId, String nodeId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.getNodeFileProperties(this.getEndpoint(), +- this.getServiceVersion().getVersion(), poolId, nodeId, filePath, requestOptions, context)); ++ this.getServiceVersion().getVersion(), poolId, nodeId, filePath, accept, requestOptions, context)); + } + + /** +@@ -30335,8 +30466,9 @@ public final class BatchClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response getNodeFilePropertiesWithResponse(String poolId, String nodeId, String filePath, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.getNodeFilePropertiesSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, +- nodeId, filePath, requestOptions, Context.NONE); ++ nodeId, filePath, accept, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-communication.patch b/eng/sdk/patches/0001-revert-impl-in-communication.patch new file mode 100644 index 0000000000..767d5d08bb --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-communication.patch @@ -0,0 +1,268 @@ +From 46e470e80eeb94ef3da2346bce9e6368792ad4ae Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 14:13:06 +0800 +Subject: [PATCH] revert impl in communication + +--- + .../JobRouterAdministrationClientImpl.java | 48 +++++++++++-------- + .../implementation/JobRouterClientImpl.java | 22 +++++---- + 2 files changed, 41 insertions(+), 29 deletions(-) + +diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java +index 78b69849b85..3a598fb5a4e 100644 +--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java ++++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java +@@ -234,8 +234,8 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteDistributionPolicy(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, +- @PathParam("distributionPolicyId") String distributionPolicyId, RequestOptions requestOptions, +- Context context); ++ @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Delete("/routing/distributionPolicies/{distributionPolicyId}") + @ExpectedResponses({ 204 }) +@@ -245,8 +245,8 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteDistributionPolicySync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, +- @PathParam("distributionPolicyId") String distributionPolicyId, RequestOptions requestOptions, +- Context context); ++ @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Patch("/routing/classificationPolicies/{classificationPolicyId}") + @ExpectedResponses({ 200, 201 }) +@@ -324,8 +324,8 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteClassificationPolicy(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, +- @PathParam("classificationPolicyId") String classificationPolicyId, RequestOptions requestOptions, +- Context context); ++ @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Delete("/routing/classificationPolicies/{classificationPolicyId}") + @ExpectedResponses({ 204 }) +@@ -335,8 +335,8 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteClassificationPolicySync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, +- @PathParam("classificationPolicyId") String classificationPolicyId, RequestOptions requestOptions, +- Context context); ++ @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept, ++ RequestOptions requestOptions, Context context); + + @Patch("/routing/exceptionPolicies/{exceptionPolicyId}") + @ExpectedResponses({ 200, 201 }) +@@ -410,7 +410,7 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteExceptionPolicy(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/routing/exceptionPolicies/{exceptionPolicyId}") + @ExpectedResponses({ 204 }) +@@ -420,7 +420,7 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteExceptionPolicySync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Patch("/routing/queues/{queueId}") + @ExpectedResponses({ 200, 201 }) +@@ -494,7 +494,7 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteQueue(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/routing/queues/{queueId}") + @ExpectedResponses({ 204 }) +@@ -504,7 +504,7 @@ public final class JobRouterAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteQueueSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) +@@ -1032,8 +1032,9 @@ public final class JobRouterAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteDistributionPolicyWithResponseAsync(String distributionPolicyId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteDistributionPolicy(this.getEndpoint(), +- this.getServiceVersion().getVersion(), distributionPolicyId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), distributionPolicyId, accept, requestOptions, context)); + } + + /** +@@ -1050,8 +1051,9 @@ public final class JobRouterAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteDistributionPolicyWithResponse(String distributionPolicyId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteDistributionPolicySync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- distributionPolicyId, requestOptions, Context.NONE); ++ distributionPolicyId, accept, requestOptions, Context.NONE); + } + + /** +@@ -1569,8 +1571,9 @@ public final class JobRouterAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteClassificationPolicyWithResponseAsync(String classificationPolicyId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteClassificationPolicy(this.getEndpoint(), +- this.getServiceVersion().getVersion(), classificationPolicyId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), classificationPolicyId, accept, requestOptions, context)); + } + + /** +@@ -1587,8 +1590,9 @@ public final class JobRouterAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteClassificationPolicyWithResponse(String classificationPolicyId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteClassificationPolicySync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- classificationPolicyId, requestOptions, Context.NONE); ++ classificationPolicyId, accept, requestOptions, Context.NONE); + } + + /** +@@ -2106,8 +2110,9 @@ public final class JobRouterAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteExceptionPolicyWithResponseAsync(String exceptionPolicyId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteExceptionPolicy(this.getEndpoint(), +- this.getServiceVersion().getVersion(), exceptionPolicyId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), exceptionPolicyId, accept, requestOptions, context)); + } + + /** +@@ -2123,8 +2128,9 @@ public final class JobRouterAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteExceptionPolicyWithResponse(String exceptionPolicyId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteExceptionPolicySync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- exceptionPolicyId, requestOptions, Context.NONE); ++ exceptionPolicyId, accept, requestOptions, Context.NONE); + } + + /** +@@ -2548,8 +2554,9 @@ public final class JobRouterAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteQueueWithResponseAsync(String queueId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteQueue(this.getEndpoint(), +- this.getServiceVersion().getVersion(), queueId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), queueId, accept, requestOptions, context)); + } + + /** +@@ -2565,7 +2572,8 @@ public final class JobRouterAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteQueueWithResponse(String queueId, RequestOptions requestOptions) { +- return service.deleteQueueSync(this.getEndpoint(), this.getServiceVersion().getVersion(), queueId, ++ final String accept = "application/json"; ++ return service.deleteQueueSync(this.getEndpoint(), this.getServiceVersion().getVersion(), queueId, accept, + requestOptions, Context.NONE); + } + +diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java +index 1ab1634dd63..e0d6dc7f6e7 100644 +--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java ++++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java +@@ -210,7 +210,7 @@ public final class JobRouterClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/routing/jobs/{jobId}") + @ExpectedResponses({ 204 }) +@@ -220,7 +220,7 @@ public final class JobRouterClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/routing/jobs/{jobId}:reclassify") + @ExpectedResponses({ 200 }) +@@ -484,7 +484,7 @@ public final class JobRouterClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteWorker(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/routing/workers/{workerId}") + @ExpectedResponses({ 204 }) +@@ -494,7 +494,7 @@ public final class JobRouterClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteWorkerSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/routing/workers") + @ExpectedResponses({ 200 }) +@@ -1012,8 +1012,9 @@ public final class JobRouterClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteJobWithResponseAsync(String jobId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobId, accept, requestOptions, context)); + } + + /** +@@ -1029,8 +1030,9 @@ public final class JobRouterClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteJobWithResponse(String jobId, RequestOptions requestOptions) { +- return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -2671,8 +2673,9 @@ public final class JobRouterClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteWorkerWithResponseAsync(String workerId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteWorker(this.getEndpoint(), +- this.getServiceVersion().getVersion(), workerId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), workerId, accept, requestOptions, context)); + } + + /** +@@ -2688,7 +2691,8 @@ public final class JobRouterClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteWorkerWithResponse(String workerId, RequestOptions requestOptions) { +- return service.deleteWorkerSync(this.getEndpoint(), this.getServiceVersion().getVersion(), workerId, ++ final String accept = "application/json"; ++ return service.deleteWorkerSync(this.getEndpoint(), this.getServiceVersion().getVersion(), workerId, accept, + requestOptions, Context.NONE); + } + +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-contentsafety.patch b/eng/sdk/patches/0001-revert-impl-in-contentsafety.patch new file mode 100644 index 0000000000..9bace5b40d --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-contentsafety.patch @@ -0,0 +1,99 @@ +From 1185f9ded7e644d6b64c955c2faa9422765eea24 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 14:28:55 +0800 +Subject: [PATCH] revert impl in contentsafety + +--- + .../implementation/BlocklistClientImpl.java | 24 +++++++++++-------- + 1 file changed, 14 insertions(+), 10 deletions(-) + +diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java +index e7e96b52ccf..727d27c5547 100644 +--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java ++++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java +@@ -216,7 +216,7 @@ public final class BlocklistClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTextBlocklist(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/text/blocklists/{blocklistName}") + @ExpectedResponses({ 204 }) +@@ -226,7 +226,7 @@ public final class BlocklistClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTextBlocklistSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/text/blocklists/{blocklistName}") + @ExpectedResponses({ 200 }) +@@ -318,8 +318,8 @@ public final class BlocklistClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> removeBlocklistItems(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData options, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context); + + @Post("/text/blocklists/{blocklistName}:removeBlocklistItems") + @ExpectedResponses({ 204 }) +@@ -329,8 +329,8 @@ public final class BlocklistClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response removeBlocklistItemsSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData options, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) +@@ -587,8 +587,9 @@ public final class BlocklistClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTextBlocklistWithResponseAsync(String name, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTextBlocklist(this.getEndpoint(), +- this.getServiceVersion().getVersion(), name, requestOptions, context)); ++ this.getServiceVersion().getVersion(), name, accept, requestOptions, context)); + } + + /** +@@ -606,7 +607,8 @@ public final class BlocklistClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTextBlocklistWithResponse(String name, RequestOptions requestOptions) { +- return service.deleteTextBlocklistSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, ++ final String accept = "application/json"; ++ return service.deleteTextBlocklistSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, accept, + requestOptions, Context.NONE); + } + +@@ -1126,8 +1128,9 @@ public final class BlocklistClientImpl { + public Mono> removeBlocklistItemsWithResponseAsync(String name, BinaryData options, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.removeBlocklistItems(this.getEndpoint(), +- this.getServiceVersion().getVersion(), name, contentType, options, requestOptions, context)); ++ this.getServiceVersion().getVersion(), name, contentType, accept, options, requestOptions, context)); + } + + /** +@@ -1159,8 +1162,9 @@ public final class BlocklistClientImpl { + public Response removeBlocklistItemsWithResponse(String name, BinaryData options, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.removeBlocklistItemsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, +- contentType, options, requestOptions, Context.NONE); ++ contentType, accept, options, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-documentintelligence.patch b/eng/sdk/patches/0001-revert-impl-in-documentintelligence.patch new file mode 100644 index 0000000000..a43942ea8d --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-documentintelligence.patch @@ -0,0 +1,534 @@ +From 3efa4c0cb7a78e09ff941b751092948faa74e70a Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 12:28:19 +0800 +Subject: [PATCH] revert impl in documentintelligence + +--- + ...tIntelligenceAdministrationClientImpl.java | 90 ++++++++++++------- + .../DocumentIntelligenceClientImpl.java | 68 ++++++++------ + 2 files changed, 98 insertions(+), 60 deletions(-) + +diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java +index edb1f567ca1..54d0a403774 100644 +--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java ++++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java +@@ -178,7 +178,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> buildDocumentModel(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentModels:build") + @ExpectedResponses({ 202 }) +@@ -188,7 +189,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response buildDocumentModelSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentModels:compose") + @ExpectedResponses({ 202 }) +@@ -198,7 +200,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> composeModel(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData composeRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData composeRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentModels:compose") + @ExpectedResponses({ 202 }) +@@ -208,7 +211,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response composeModelSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData composeRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData composeRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentModels:authorizeCopy") + @ExpectedResponses({ 200 }) +@@ -240,8 +244,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> copyModelTo(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData copyToRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context); + + @Post("/documentModels/{modelId}:copyTo") + @ExpectedResponses({ 202 }) +@@ -251,8 +255,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response copyModelToSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData copyToRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context); + + @Get("/documentModels/{modelId}") + @ExpectedResponses({ 200 }) +@@ -302,7 +306,7 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteModel(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/documentModels/{modelId}") + @ExpectedResponses({ 204 }) +@@ -312,7 +316,7 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteModelSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/info") + @ExpectedResponses({ 200 }) +@@ -382,7 +386,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> buildClassifier(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentClassifiers:build") + @ExpectedResponses({ 202 }) +@@ -392,7 +397,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response buildClassifierSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest, ++ RequestOptions requestOptions, Context context); + + @Post("/documentClassifiers:authorizeCopy") + @ExpectedResponses({ 200 }) +@@ -424,8 +430,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> copyClassifierTo(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData copyToRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context); + + @Post("/documentClassifiers/{classifierId}:copyTo") + @ExpectedResponses({ 202 }) +@@ -435,8 +441,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response copyClassifierToSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData copyToRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context); + + @Get("/documentClassifiers/{classifierId}") + @ExpectedResponses({ 200 }) +@@ -486,7 +492,7 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteClassifier(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/documentClassifiers/{classifierId}") + @ExpectedResponses({ 204 }) +@@ -496,7 +502,7 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteClassifierSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) +@@ -598,8 +604,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Mono> buildDocumentModelWithResponseAsync(BinaryData buildRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.buildDocumentModel(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, buildRequest, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, buildRequest, requestOptions, context)); + } + + /** +@@ -640,8 +647,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + private Response buildDocumentModelWithResponse(BinaryData buildRequest, RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.buildDocumentModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- buildRequest, requestOptions, Context.NONE); ++ accept, buildRequest, requestOptions, Context.NONE); + } + + /** +@@ -909,8 +917,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Mono> composeModelWithResponseAsync(BinaryData composeRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.composeModel(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, composeRequest, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, composeRequest, requestOptions, context)); + } + + /** +@@ -971,7 +980,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + private Response composeModelWithResponse(BinaryData composeRequest, RequestOptions requestOptions) { + final String contentType = "application/json"; +- return service.composeModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, ++ final String accept = "application/json"; ++ return service.composeModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept, + composeRequest, requestOptions, Context.NONE); + } + +@@ -1391,8 +1401,10 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Mono> copyModelToWithResponseAsync(String modelId, BinaryData copyToRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; +- return FluxUtil.withContext(context -> service.copyModelTo(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, contentType, copyToRequest, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil ++ .withContext(context -> service.copyModelTo(this.getEndpoint(), this.getServiceVersion().getVersion(), ++ modelId, contentType, accept, copyToRequest, requestOptions, context)); + } + + /** +@@ -1425,8 +1437,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Response copyModelToWithResponse(String modelId, BinaryData copyToRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.copyModelToSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, contentType, +- copyToRequest, requestOptions, Context.NONE); ++ accept, copyToRequest, requestOptions, Context.NONE); + } + + /** +@@ -2116,8 +2129,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteModelWithResponseAsync(String modelId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteModel(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), modelId, accept, requestOptions, context)); + } + + /** +@@ -2133,7 +2147,8 @@ public final class DocumentIntelligenceAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteModelWithResponse(String modelId, RequestOptions requestOptions) { +- return service.deleteModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, ++ final String accept = "application/json"; ++ return service.deleteModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, accept, + requestOptions, Context.NONE); + } + +@@ -2544,8 +2559,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Mono> buildClassifierWithResponseAsync(BinaryData buildRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.buildClassifier(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, buildRequest, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, buildRequest, requestOptions, context)); + } + + /** +@@ -2587,8 +2603,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + private Response buildClassifierWithResponse(BinaryData buildRequest, RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.buildClassifierSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, +- buildRequest, requestOptions, Context.NONE); ++ accept, buildRequest, requestOptions, Context.NONE); + } + + /** +@@ -2931,8 +2948,10 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Mono> copyClassifierToWithResponseAsync(String classifierId, BinaryData copyToRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; +- return FluxUtil.withContext(context -> service.copyClassifierTo(this.getEndpoint(), +- this.getServiceVersion().getVersion(), classifierId, contentType, copyToRequest, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil ++ .withContext(context -> service.copyClassifierTo(this.getEndpoint(), this.getServiceVersion().getVersion(), ++ classifierId, contentType, accept, copyToRequest, requestOptions, context)); + } + + /** +@@ -2965,8 +2984,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + private Response copyClassifierToWithResponse(String classifierId, BinaryData copyToRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.copyClassifierToSync(this.getEndpoint(), this.getServiceVersion().getVersion(), classifierId, +- contentType, copyToRequest, requestOptions, Context.NONE); ++ contentType, accept, copyToRequest, requestOptions, Context.NONE); + } + + /** +@@ -3479,8 +3499,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteClassifierWithResponseAsync(String classifierId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteClassifier(this.getEndpoint(), +- this.getServiceVersion().getVersion(), classifierId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), classifierId, accept, requestOptions, context)); + } + + /** +@@ -3496,8 +3517,9 @@ public final class DocumentIntelligenceAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteClassifierWithResponse(String classifierId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteClassifierSync(this.getEndpoint(), this.getServiceVersion().getVersion(), classifierId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java +index 35d46b5d152..f1ad7faf330 100644 +--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java ++++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java +@@ -174,8 +174,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> analyzeDocument(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("content-type") String contentType, @BodyParam("application/json") BinaryData analyzeRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData analyzeRequest, RequestOptions requestOptions, Context context); + + @Post("/documentModels/{modelId}:analyze") + @ExpectedResponses({ 202 }) +@@ -185,8 +185,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response analyzeDocumentSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("content-type") String contentType, @BodyParam("application/json") BinaryData analyzeRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData analyzeRequest, RequestOptions requestOptions, Context context); + + @Get("/documentModels/{modelId}/analyzeResults/{resultId}/pdf") + @ExpectedResponses({ 200 }) +@@ -240,7 +240,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteAnalyzeResult(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @PathParam("resultId") String resultId, RequestOptions requestOptions, Context context); ++ @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/documentModels/{modelId}/analyzeResults/{resultId}") + @ExpectedResponses({ 204 }) +@@ -250,7 +251,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteAnalyzeResultSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @PathParam("resultId") String resultId, RequestOptions requestOptions, Context context); ++ @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Post("/documentModels/{modelId}:analyzeBatch") + @ExpectedResponses({ 202 }) +@@ -260,7 +262,7 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> analyzeBatchDocuments(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("content-type") String contentType, ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData analyzeBatchRequest, RequestOptions requestOptions, + Context context); + +@@ -272,7 +274,7 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response analyzeBatchDocumentsSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @HeaderParam("content-type") String contentType, ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") BinaryData analyzeBatchRequest, RequestOptions requestOptions, + Context context); + +@@ -304,7 +306,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteAnalyzeBatchResult(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @PathParam("resultId") String resultId, RequestOptions requestOptions, Context context); ++ @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/documentModels/{modelId}/analyzeBatchResults/{resultId}") + @ExpectedResponses({ 204 }) +@@ -314,7 +317,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteAnalyzeBatchResultSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId, +- @PathParam("resultId") String resultId, RequestOptions requestOptions, Context context); ++ @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Get("/documentModels/{modelId}/analyzeBatchResults/{resultId}") + @ExpectedResponses({ 200 }) +@@ -346,8 +350,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> classifyDocument(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- @HeaderParam("content-type") String contentType, @BodyParam("application/json") BinaryData classifyRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData classifyRequest, RequestOptions requestOptions, Context context); + + @Post("/documentClassifiers/{classifierId}:analyze") + @ExpectedResponses({ 202 }) +@@ -357,8 +361,8 @@ public final class DocumentIntelligenceClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response classifyDocumentSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId, +- @HeaderParam("content-type") String contentType, @BodyParam("application/json") BinaryData classifyRequest, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData classifyRequest, RequestOptions requestOptions, Context context); + + @Get("{nextLink}") + @ExpectedResponses({ 200 }) +@@ -427,8 +431,10 @@ public final class DocumentIntelligenceClientImpl { + private Mono> analyzeDocumentWithResponseAsync(String modelId, BinaryData analyzeRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; +- return FluxUtil.withContext(context -> service.analyzeDocument(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, contentType, analyzeRequest, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil ++ .withContext(context -> service.analyzeDocument(this.getEndpoint(), this.getServiceVersion().getVersion(), ++ modelId, contentType, accept, analyzeRequest, requestOptions, context)); + } + + /** +@@ -477,8 +483,9 @@ public final class DocumentIntelligenceClientImpl { + private Response analyzeDocumentWithResponse(String modelId, BinaryData analyzeRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.analyzeDocumentSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, +- contentType, analyzeRequest, requestOptions, Context.NONE); ++ contentType, accept, analyzeRequest, requestOptions, Context.NONE); + } + + /** +@@ -842,8 +849,9 @@ public final class DocumentIntelligenceClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteAnalyzeResultWithResponseAsync(String modelId, String resultId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteAnalyzeResult(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, resultId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), modelId, resultId, accept, requestOptions, context)); + } + + /** +@@ -861,8 +869,9 @@ public final class DocumentIntelligenceClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteAnalyzeResultWithResponse(String modelId, String resultId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteAnalyzeResultSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, +- resultId, requestOptions, Context.NONE); ++ resultId, accept, requestOptions, Context.NONE); + } + + /** +@@ -920,8 +929,10 @@ public final class DocumentIntelligenceClientImpl { + private Mono> analyzeBatchDocumentsWithResponseAsync(String modelId, BinaryData analyzeBatchRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; +- return FluxUtil.withContext(context -> service.analyzeBatchDocuments(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, contentType, analyzeBatchRequest, requestOptions, context)); ++ final String accept = "application/json"; ++ return FluxUtil.withContext( ++ context -> service.analyzeBatchDocuments(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, ++ contentType, accept, analyzeBatchRequest, requestOptions, context)); + } + + /** +@@ -979,8 +990,9 @@ public final class DocumentIntelligenceClientImpl { + private Response analyzeBatchDocumentsWithResponse(String modelId, BinaryData analyzeBatchRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.analyzeBatchDocumentsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, +- contentType, analyzeBatchRequest, requestOptions, Context.NONE); ++ contentType, accept, analyzeBatchRequest, requestOptions, Context.NONE); + } + + /** +@@ -1507,8 +1519,9 @@ public final class DocumentIntelligenceClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteAnalyzeBatchResultWithResponseAsync(String modelId, String resultId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteAnalyzeBatchResult(this.getEndpoint(), +- this.getServiceVersion().getVersion(), modelId, resultId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), modelId, resultId, accept, requestOptions, context)); + } + + /** +@@ -1526,8 +1539,9 @@ public final class DocumentIntelligenceClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteAnalyzeBatchResultWithResponse(String modelId, String resultId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteAnalyzeBatchResultSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, +- resultId, requestOptions, Context.NONE); ++ resultId, accept, requestOptions, Context.NONE); + } + + /** +@@ -1686,9 +1700,10 @@ public final class DocumentIntelligenceClientImpl { + private Mono> classifyDocumentWithResponseAsync(String classifierId, BinaryData classifyRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.classifyDocument(this.getEndpoint(), this.getServiceVersion().getVersion(), +- classifierId, contentType, classifyRequest, requestOptions, context)); ++ classifierId, contentType, accept, classifyRequest, requestOptions, context)); + } + + /** +@@ -1728,8 +1743,9 @@ public final class DocumentIntelligenceClientImpl { + private Response classifyDocumentWithResponse(String classifierId, BinaryData classifyRequest, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.classifyDocumentSync(this.getEndpoint(), this.getServiceVersion().getVersion(), classifierId, +- contentType, classifyRequest, requestOptions, Context.NONE); ++ contentType, accept, classifyRequest, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-easm.patch b/eng/sdk/patches/0001-revert-impl-in-easm.patch new file mode 100644 index 0000000000..0ff7844e6d --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-easm.patch @@ -0,0 +1,135 @@ +From ee9efb32a58711f5bcb4667e4ae9bea70be2e138 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 13:47:27 +0800 +Subject: [PATCH] revert impl in easm + +--- + .../easm/implementation/EasmClientImpl.java | 30 +++++++++++-------- + 1 file changed, 18 insertions(+), 12 deletions(-) + +diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java +index 74965f145fd..cd574da24ef 100644 +--- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java ++++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java +@@ -315,7 +315,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteDataConnection(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/dataConnections/{dataConnectionName}") + @ExpectedResponses({ 204 }) +@@ -325,7 +325,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteDataConnectionSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/discoGroups") + @ExpectedResponses({ 200 }) +@@ -419,7 +419,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> runDiscoGroup(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/discoGroups/{groupName}:run") + @ExpectedResponses({ 204 }) +@@ -429,7 +429,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response runDiscoGroupSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/discoGroups/{groupName}/runs") + @ExpectedResponses({ 200 }) +@@ -625,7 +625,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteSavedFilter(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/savedFilters/{filterName}") + @ExpectedResponses({ 204 }) +@@ -635,7 +635,7 @@ public final class EasmClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteSavedFilterSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/tasks") + @ExpectedResponses({ 200 }) +@@ -1886,8 +1886,9 @@ public final class EasmClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteDataConnectionWithResponseAsync(String dataConnectionName, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteDataConnection(this.getEndpoint(), +- this.getServiceVersion().getVersion(), dataConnectionName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), dataConnectionName, accept, requestOptions, context)); + } + + /** +@@ -1903,8 +1904,9 @@ public final class EasmClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteDataConnectionWithResponse(String dataConnectionName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteDataConnectionSync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- dataConnectionName, requestOptions, Context.NONE); ++ dataConnectionName, accept, requestOptions, Context.NONE); + } + + /** +@@ -2696,8 +2698,9 @@ public final class EasmClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> runDiscoGroupWithResponseAsync(String groupName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.runDiscoGroup(this.getEndpoint(), +- this.getServiceVersion().getVersion(), groupName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), groupName, accept, requestOptions, context)); + } + + /** +@@ -2713,7 +2716,8 @@ public final class EasmClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response runDiscoGroupWithResponse(String groupName, RequestOptions requestOptions) { +- return service.runDiscoGroupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), groupName, ++ final String accept = "application/json"; ++ return service.runDiscoGroupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), groupName, accept, + requestOptions, Context.NONE); + } + +@@ -4053,8 +4057,9 @@ public final class EasmClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteSavedFilterWithResponseAsync(String filterName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteSavedFilter(this.getEndpoint(), +- this.getServiceVersion().getVersion(), filterName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), filterName, accept, requestOptions, context)); + } + + /** +@@ -4070,8 +4075,9 @@ public final class EasmClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteSavedFilterWithResponse(String filterName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteSavedFilterSync(this.getEndpoint(), this.getServiceVersion().getVersion(), filterName, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-healthdataaiservices-azure-health-dei.patch b/eng/sdk/patches/0001-revert-impl-in-healthdataaiservices-azure-health-dei.patch new file mode 100644 index 0000000000..3dac7ff701 --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-healthdataaiservices-azure-health-dei.patch @@ -0,0 +1,58 @@ +From b120345b0fdbdb49b3f02da90806d991ca217099 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 14:15:25 +0800 +Subject: [PATCH] revert impl in + healthdataaiservices/azure-health-deidentification + +--- + .../implementation/DeidentificationClientImpl.java | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java +index 981b020ca26..a8eefef1a49 100644 +--- a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java ++++ b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java +@@ -275,7 +275,7 @@ public final class DeidentificationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteJob(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("name") String jobName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/jobs/{name}") + @ExpectedResponses({ 204 }) +@@ -285,7 +285,7 @@ public final class DeidentificationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteJobSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("name") String jobName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/deid") + @ExpectedResponses({ 200 }) +@@ -2041,8 +2041,9 @@ public final class DeidentificationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteJobWithResponseAsync(String jobName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteJob(this.getEndpoint(), +- this.getServiceVersion().getVersion(), jobName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), jobName, accept, requestOptions, context)); + } + + /** +@@ -2060,8 +2061,9 @@ public final class DeidentificationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteJobWithResponse(String jobName, RequestOptions requestOptions) { +- return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobName, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.deleteJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobName, accept, ++ requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-keyvault.patch b/eng/sdk/patches/0001-revert-impl-in-keyvault.patch new file mode 100644 index 0000000000..57b2704f2d --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-keyvault.patch @@ -0,0 +1,146 @@ +From 3bb4437a6b964156f53b2e8ed22265e14f056a31 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 11:36:55 +0800 +Subject: [PATCH] revert impl in keyvault + +--- + .../implementation/CertificateClientImpl.java | 10 ++++++---- + .../keyvault/keys/implementation/KeyClientImpl.java | 10 ++++++---- + .../secrets/implementation/SecretClientImpl.java | 10 ++++++---- + 3 files changed, 18 insertions(+), 12 deletions(-) + +diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/implementation/CertificateClientImpl.java b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/implementation/CertificateClientImpl.java +index b69446036ab..a6ac254483a 100644 +--- a/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/implementation/CertificateClientImpl.java ++++ b/sdk/keyvault/azure-security-keyvault-certificates/src/main/java/com/azure/security/keyvault/certificates/implementation/CertificateClientImpl.java +@@ -693,7 +693,7 @@ public final class CertificateClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> purgeDeletedCertificate(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("certificate-name") String certificateName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/deletedcertificates/{certificate-name}") + @ExpectedResponses({ 204 }) +@@ -703,7 +703,7 @@ public final class CertificateClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response purgeDeletedCertificateSync(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("certificate-name") String certificateName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/deletedcertificates/{certificate-name}/recover") + @ExpectedResponses({ 200 }) +@@ -5401,8 +5401,9 @@ public final class CertificateClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> purgeDeletedCertificateWithResponseAsync(String certificateName, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.purgeDeletedCertificate(this.getVaultBaseUrl(), +- this.getServiceVersion().getVersion(), certificateName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), certificateName, accept, requestOptions, context)); + } + + /** +@@ -5422,8 +5423,9 @@ public final class CertificateClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response purgeDeletedCertificateWithResponse(String certificateName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.purgeDeletedCertificateSync(this.getVaultBaseUrl(), this.getServiceVersion().getVersion(), +- certificateName, requestOptions, Context.NONE); ++ certificateName, accept, requestOptions, Context.NONE); + } + + /** +diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyClientImpl.java b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyClientImpl.java +index e8f3f1f2712..559c4022523 100644 +--- a/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyClientImpl.java ++++ b/sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/implementation/KeyClientImpl.java +@@ -583,7 +583,7 @@ public final class KeyClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> purgeDeletedKey(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("key-name") String keyName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/deletedkeys/{key-name}") + @ExpectedResponses({ 204 }) +@@ -593,7 +593,7 @@ public final class KeyClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response purgeDeletedKeySync(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("key-name") String keyName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/deletedkeys/{key-name}/recover") + @ExpectedResponses({ 200 }) +@@ -3921,8 +3921,9 @@ public final class KeyClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> purgeDeletedKeyWithResponseAsync(String keyName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.purgeDeletedKey(this.getVaultBaseUrl(), +- this.getServiceVersion().getVersion(), keyName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), keyName, accept, requestOptions, context)); + } + + /** +@@ -3942,8 +3943,9 @@ public final class KeyClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response purgeDeletedKeyWithResponse(String keyName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.purgeDeletedKeySync(this.getVaultBaseUrl(), this.getServiceVersion().getVersion(), keyName, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretClientImpl.java b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretClientImpl.java +index eaae7c22e04..1563bba24bb 100644 +--- a/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretClientImpl.java ++++ b/sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/SecretClientImpl.java +@@ -331,7 +331,7 @@ public final class SecretClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> purgeDeletedSecret(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("secret-name") String secretName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/deletedsecrets/{secret-name}") + @ExpectedResponses({ 204 }) +@@ -341,7 +341,7 @@ public final class SecretClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response purgeDeletedSecretSync(@HostParam("vaultBaseUrl") String vaultBaseUrl, + @QueryParam("api-version") String apiVersion, @PathParam("secret-name") String secretName, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Post("/deletedsecrets/{secret-name}/recover") + @ExpectedResponses({ 200 }) +@@ -1747,8 +1747,9 @@ public final class SecretClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> purgeDeletedSecretWithResponseAsync(String secretName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.purgeDeletedSecret(this.getVaultBaseUrl(), +- this.getServiceVersion().getVersion(), secretName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), secretName, accept, requestOptions, context)); + } + + /** +@@ -1768,8 +1769,9 @@ public final class SecretClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response purgeDeletedSecretWithResponse(String secretName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.purgeDeletedSecretSync(this.getVaultBaseUrl(), this.getServiceVersion().getVersion(), secretName, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-loadtesting.patch b/eng/sdk/patches/0001-revert-impl-in-loadtesting.patch new file mode 100644 index 0000000000..aeface5fb8 --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-loadtesting.patch @@ -0,0 +1,223 @@ +From c8fd94a2e03f6402b90557f58768384a460f61f3 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 13:31:11 +0800 +Subject: [PATCH] revert impl in loadtesting + +--- + .../LoadTestAdministrationClientImpl.java | 34 ++++++++++++------- + .../implementation/LoadTestRunClientImpl.java | 20 ++++++----- + 2 files changed, 33 insertions(+), 21 deletions(-) + +diff --git a/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestAdministrationClientImpl.java b/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestAdministrationClientImpl.java +index 297869a5e79..255296fc444 100644 +--- a/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestAdministrationClientImpl.java ++++ b/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestAdministrationClientImpl.java +@@ -378,7 +378,8 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTestFile(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testId") String testId, +- @PathParam("fileName") String fileName, RequestOptions requestOptions, Context context); ++ @PathParam("fileName") String fileName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/tests/{testId}/files/{fileName}") + @ExpectedResponses({ 204 }) +@@ -388,7 +389,8 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTestFileSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testId") String testId, +- @PathParam("fileName") String fileName, RequestOptions requestOptions, Context context); ++ @PathParam("fileName") String fileName, @HeaderParam("Accept") String accept, RequestOptions requestOptions, ++ Context context); + + @Delete("/tests/{testId}") + @ExpectedResponses({ 204 }) +@@ -398,7 +400,7 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTest(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testId") String testId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/tests/{testId}") + @ExpectedResponses({ 204 }) +@@ -408,7 +410,7 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTestSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testId") String testId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Patch("/test-profiles/{testProfileId}") + @ExpectedResponses({ 200, 201 }) +@@ -440,7 +442,7 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTestProfile(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testProfileId") String testProfileId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/test-profiles/{testProfileId}") + @ExpectedResponses({ 204 }) +@@ -450,7 +452,7 @@ public final class LoadTestAdministrationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTestProfileSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testProfileId") String testProfileId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/test-profiles/{testProfileId}") + @ExpectedResponses({ 200 }) +@@ -2730,8 +2732,9 @@ public final class LoadTestAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTestFileWithResponseAsync(String testId, String fileName, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTestFile(this.getEndpoint(), +- this.getServiceVersion().getVersion(), testId, fileName, requestOptions, context)); ++ this.getServiceVersion().getVersion(), testId, fileName, accept, requestOptions, context)); + } + + /** +@@ -2749,8 +2752,9 @@ public final class LoadTestAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTestFileWithResponse(String testId, String fileName, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteTestFileSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testId, fileName, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +@@ -2767,8 +2771,9 @@ public final class LoadTestAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTestWithResponseAsync(String testId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTest(this.getEndpoint(), +- this.getServiceVersion().getVersion(), testId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), testId, accept, requestOptions, context)); + } + + /** +@@ -2785,8 +2790,9 @@ public final class LoadTestAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTestWithResponse(String testId, RequestOptions requestOptions) { +- return service.deleteTestSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testId, requestOptions, +- Context.NONE); ++ final String accept = "application/json"; ++ return service.deleteTestSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testId, accept, ++ requestOptions, Context.NONE); + } + + /** +@@ -2936,8 +2942,9 @@ public final class LoadTestAdministrationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTestProfileWithResponseAsync(String testProfileId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTestProfile(this.getEndpoint(), +- this.getServiceVersion().getVersion(), testProfileId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), testProfileId, accept, requestOptions, context)); + } + + /** +@@ -2956,8 +2963,9 @@ public final class LoadTestAdministrationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTestProfileWithResponse(String testProfileId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteTestProfileSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testProfileId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +diff --git a/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestRunClientImpl.java b/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestRunClientImpl.java +index 795e6ea68ab..1b8baee686e 100644 +--- a/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestRunClientImpl.java ++++ b/sdk/loadtesting/azure-developer-loadtesting/src/main/java/com/azure/developer/loadtesting/implementation/LoadTestRunClientImpl.java +@@ -231,7 +231,7 @@ public final class LoadTestRunClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTestRun(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testRunId") String testRunId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/test-runs/{testRunId}") + @ExpectedResponses({ 204 }) +@@ -241,7 +241,7 @@ public final class LoadTestRunClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTestRunSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testRunId") String testRunId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/test-runs/{testRunId}/app-components") + @ExpectedResponses({ 200 }) +@@ -485,7 +485,7 @@ public final class LoadTestRunClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteTestProfileRun(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testProfileRunId") String testProfileRunId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/test-profile-runs/{testProfileRunId}") + @ExpectedResponses({ 204 }) +@@ -495,7 +495,7 @@ public final class LoadTestRunClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteTestProfileRunSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("testProfileRunId") String testProfileRunId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/test-profile-runs/{testProfileRunId}") + @ExpectedResponses({ 200 }) +@@ -1639,8 +1639,9 @@ public final class LoadTestRunClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTestRunWithResponseAsync(String testRunId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTestRun(this.getEndpoint(), +- this.getServiceVersion().getVersion(), testRunId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), testRunId, accept, requestOptions, context)); + } + + /** +@@ -1659,7 +1660,8 @@ public final class LoadTestRunClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTestRunWithResponse(String testRunId, RequestOptions requestOptions) { +- return service.deleteTestRunSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testRunId, ++ final String accept = "application/json"; ++ return service.deleteTestRunSync(this.getEndpoint(), this.getServiceVersion().getVersion(), testRunId, accept, + requestOptions, Context.NONE); + } + +@@ -4380,8 +4382,9 @@ public final class LoadTestRunClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteTestProfileRunWithResponseAsync(String testProfileRunId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteTestProfileRun(this.getEndpoint(), +- this.getServiceVersion().getVersion(), testProfileRunId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), testProfileRunId, accept, requestOptions, context)); + } + + /** +@@ -4400,8 +4403,9 @@ public final class LoadTestRunClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteTestProfileRunWithResponse(String testProfileRunId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteTestProfileRunSync(this.getEndpoint(), this.getServiceVersion().getVersion(), +- testProfileRunId, requestOptions, Context.NONE); ++ testProfileRunId, accept, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-monitor.patch b/eng/sdk/patches/0001-revert-impl-in-monitor.patch new file mode 100644 index 0000000000..f54f516b67 --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-monitor.patch @@ -0,0 +1,58 @@ +From d767417fc77ec1a5754ea6c973c258acab2cc9a6 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 12:44:57 +0800 +Subject: [PATCH] revert impl in monitor + +--- + .../implementation/LogsIngestionClientImpl.java | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/sdk/monitor/azure-monitor-ingestion/src/main/java/com/azure/monitor/ingestion/implementation/LogsIngestionClientImpl.java b/sdk/monitor/azure-monitor-ingestion/src/main/java/com/azure/monitor/ingestion/implementation/LogsIngestionClientImpl.java +index 1d513291f2b..7e7a7ed1484 100644 +--- a/sdk/monitor/azure-monitor-ingestion/src/main/java/com/azure/monitor/ingestion/implementation/LogsIngestionClientImpl.java ++++ b/sdk/monitor/azure-monitor-ingestion/src/main/java/com/azure/monitor/ingestion/implementation/LogsIngestionClientImpl.java +@@ -161,7 +161,8 @@ public final class LogsIngestionClientImpl { + Mono> upload(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("ruleId") String ruleId, + @PathParam("stream") String streamName, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, ++ RequestOptions requestOptions, Context context); + + @Post("/dataCollectionRules/{ruleId}/streams/{stream}") + @ExpectedResponses({ 204 }) +@@ -171,8 +172,8 @@ public final class LogsIngestionClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response uploadSync(@HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion, + @PathParam("ruleId") String ruleId, @PathParam("stream") String streamName, +- @HeaderParam("Content-Type") String contentType, @BodyParam("application/json") BinaryData body, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, ++ @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); + } + + /** +@@ -211,8 +212,9 @@ public final class LogsIngestionClientImpl { + public Mono> uploadWithResponseAsync(String ruleId, String streamName, BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.upload(this.getEndpoint(), this.getServiceVersion().getVersion(), +- ruleId, streamName, contentType, body, requestOptions, context)); ++ ruleId, streamName, contentType, accept, body, requestOptions, context)); + } + + /** +@@ -251,7 +253,8 @@ public final class LogsIngestionClientImpl { + public Response uploadWithResponse(String ruleId, String streamName, BinaryData body, + RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return service.uploadSync(this.getEndpoint(), this.getServiceVersion().getVersion(), ruleId, streamName, +- contentType, body, requestOptions, Context.NONE); ++ contentType, accept, body, requestOptions, Context.NONE); + } + } +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-onlineexperimentation.patch b/eng/sdk/patches/0001-revert-impl-in-onlineexperimentation.patch new file mode 100644 index 0000000000..ee27735b2c --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-onlineexperimentation.patch @@ -0,0 +1,123 @@ +From e2cb51c007dd035bbd712acfc4c186d4a56b4383 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 13:12:56 +0800 +Subject: [PATCH] revert impl in onlineexperimentation + +--- + .../OnlineExperimentationClientImpl.java | 10 ++++++---- + ...lineExperimentationWorkspacesClientImpl.java | 17 ++++++++++------- + 2 files changed, 16 insertions(+), 11 deletions(-) + +diff --git a/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/src/main/java/com/azure/analytics/onlineexperimentation/implementation/OnlineExperimentationClientImpl.java b/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/src/main/java/com/azure/analytics/onlineexperimentation/implementation/OnlineExperimentationClientImpl.java +index 32e6622cbc6..ed26312e71d 100644 +--- a/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/src/main/java/com/azure/analytics/onlineexperimentation/implementation/OnlineExperimentationClientImpl.java ++++ b/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/src/main/java/com/azure/analytics/onlineexperimentation/implementation/OnlineExperimentationClientImpl.java +@@ -233,7 +233,7 @@ public final class OnlineExperimentationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> deleteMetric(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("experimentMetricId") String experimentMetricId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Delete("/experiment-metrics/{experimentMetricId}") + @ExpectedResponses({ 204 }) +@@ -243,7 +243,7 @@ public final class OnlineExperimentationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response deleteMetricSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("experimentMetricId") String experimentMetricId, +- RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context); + + @Get("/experiment-metrics") + @ExpectedResponses({ 200 }) +@@ -698,8 +698,9 @@ public final class OnlineExperimentationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + public Mono> deleteMetricWithResponseAsync(String experimentMetricId, + RequestOptions requestOptions) { ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.deleteMetric(this.getEndpoint(), +- this.getServiceVersion().getVersion(), experimentMetricId, requestOptions, context)); ++ this.getServiceVersion().getVersion(), experimentMetricId, accept, requestOptions, context)); + } + + /** +@@ -730,8 +731,9 @@ public final class OnlineExperimentationClientImpl { + */ + @ServiceMethod(returns = ReturnType.SINGLE) + public Response deleteMetricWithResponse(String experimentMetricId, RequestOptions requestOptions) { ++ final String accept = "application/json"; + return service.deleteMetricSync(this.getEndpoint(), this.getServiceVersion().getVersion(), experimentMetricId, +- requestOptions, Context.NONE); ++ accept, requestOptions, Context.NONE); + } + + /** +diff --git a/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/src/main/java/com/azure/resourcemanager/onlineexperimentation/implementation/OnlineExperimentationWorkspacesClientImpl.java b/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/src/main/java/com/azure/resourcemanager/onlineexperimentation/implementation/OnlineExperimentationWorkspacesClientImpl.java +index fcacbc0d538..f610d3e49f3 100644 +--- a/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/src/main/java/com/azure/resourcemanager/onlineexperimentation/implementation/OnlineExperimentationWorkspacesClientImpl.java ++++ b/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/src/main/java/com/azure/resourcemanager/onlineexperimentation/implementation/OnlineExperimentationWorkspacesClientImpl.java +@@ -128,23 +128,23 @@ public final class OnlineExperimentationWorkspacesClientImpl implements OnlineEx + @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept, + @BodyParam("application/json") OnlineExperimentationWorkspacePatch properties, Context context); + +- @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" }) ++ @Headers({ "Content-Type: application/json" }) + @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OnlineExperimentation/workspaces/{workspaceName}") + @ExpectedResponses({ 202, 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Mono>> delete(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, + @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, +- Context context); ++ @HeaderParam("Accept") String accept, Context context); + +- @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" }) ++ @Headers({ "Content-Type: application/json" }) + @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OnlineExperimentation/workspaces/{workspaceName}") + @ExpectedResponses({ 202, 204 }) + @UnexpectedResponseExceptionType(ManagementException.class) + Response deleteSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId, + @PathParam("resourceGroupName") String resourceGroupName, @PathParam("workspaceName") String workspaceName, +- Context context); ++ @HeaderParam("Accept") String accept, Context context); + + @Headers({ "Content-Type: application/json" }) + @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OnlineExperimentation/workspaces") +@@ -847,9 +847,10 @@ public final class OnlineExperimentationWorkspacesClientImpl implements OnlineEx + if (workspaceName == null) { + return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); + } ++ final String accept = "application/json"; + return FluxUtil + .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getApiVersion(), +- this.client.getSubscriptionId(), resourceGroupName, workspaceName, context)) ++ this.client.getSubscriptionId(), resourceGroupName, workspaceName, accept, context)) + .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly())); + } + +@@ -883,8 +884,9 @@ public final class OnlineExperimentationWorkspacesClientImpl implements OnlineEx + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); + } ++ final String accept = "application/json"; + return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(), +- this.client.getSubscriptionId(), resourceGroupName, workspaceName, Context.NONE); ++ this.client.getSubscriptionId(), resourceGroupName, workspaceName, accept, Context.NONE); + } + + /** +@@ -918,8 +920,9 @@ public final class OnlineExperimentationWorkspacesClientImpl implements OnlineEx + throw LOGGER.atError() + .log(new IllegalArgumentException("Parameter workspaceName is required and cannot be null.")); + } ++ final String accept = "application/json"; + return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(), +- this.client.getSubscriptionId(), resourceGroupName, workspaceName, context); ++ this.client.getSubscriptionId(), resourceGroupName, workspaceName, accept, context); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/patches/0001-revert-impl-in-translation.patch b/eng/sdk/patches/0001-revert-impl-in-translation.patch new file mode 100644 index 0000000000..1a561ced9a --- /dev/null +++ b/eng/sdk/patches/0001-revert-impl-in-translation.patch @@ -0,0 +1,59 @@ +From 67cd3515137238ae3c69008d0a65ec74af3338e9 Mon Sep 17 00:00:00 2001 +From: Weidong Xu +Date: Thu, 7 Aug 2025 12:13:55 +0800 +Subject: [PATCH] revert impl in translation + +--- + .../DocumentTranslationClientImpl.java | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java +index 9fb5a9e6fc8..cefc7bff313 100644 +--- a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java ++++ b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java +@@ -179,7 +179,8 @@ public final class DocumentTranslationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> translation(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, ++ RequestOptions requestOptions, Context context); + + @Post("/document/batches") + @ExpectedResponses({ 202 }) +@@ -189,7 +190,8 @@ public final class DocumentTranslationClientImpl { + @UnexpectedResponseExceptionType(HttpResponseException.class) + Response translationSync(@HostParam("endpoint") String endpoint, + @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType, +- @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context); ++ @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body, ++ RequestOptions requestOptions, Context context); + + @Get("/document/batches") + @ExpectedResponses({ 200 }) +@@ -426,8 +428,9 @@ public final class DocumentTranslationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + private Mono> translationWithResponseAsync(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; ++ final String accept = "application/json"; + return FluxUtil.withContext(context -> service.translation(this.getEndpoint(), +- this.getServiceVersion().getVersion(), contentType, body, requestOptions, context)); ++ this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context)); + } + + /** +@@ -502,8 +505,9 @@ public final class DocumentTranslationClientImpl { + @ServiceMethod(returns = ReturnType.SINGLE) + private Response translationWithResponse(BinaryData body, RequestOptions requestOptions) { + final String contentType = "application/json"; +- return service.translationSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, body, +- requestOptions, Context.NONE); ++ final String accept = "application/json"; ++ return service.translationSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept, ++ body, requestOptions, Context.NONE); + } + + /** +-- +2.50.1.windows.1 + diff --git a/eng/sdk/sync_sdk.py b/eng/sdk/sync_sdk.py index 2ce1cdd9f4..0f480cab45 100644 --- a/eng/sdk/sync_sdk.py +++ b/eng/sdk/sync_sdk.py @@ -14,6 +14,8 @@ from typing import List sdk_root: str +# script is in "eng/sdk/" +script_root: str = os.path.dirname(os.path.realpath(__file__)) skip_artifacts: List[str] = [ "azure-ai-anomalydetector", # deprecated @@ -110,6 +112,21 @@ def update_sdks(): if artifact in skip_artifacts: continue + # # update commit ID for ARM module + # commit_id = "3c15c2f8c50fb3130b34887d29442da75f07fefb" + # if commit_id and arm_module: + # with open(tsp_location_file, "r", encoding="utf-8") as f_in: + # lines = f_in.readlines() + # lines_out = [] + # for line in lines: + # if line.startswith("commit:"): + # line = f"commit: {commit_id}\n" + # lines_out.append(line) + # with open(tsp_location_file, "w", encoding="utf-8") as f_out: + # f_out.writelines(lines_out) + + # logging.info("Updated tsp-location file content:\n%s", "".join(lines_out)) + if os.path.dirname(module_path).endswith("-v2"): # skip modules on azure-core-v2 logging.info(f"Skip azure-core-v2 module on path {module_path}") @@ -169,6 +186,19 @@ def update_sdks(): logging.error(f"Failed modules {failed_modules}") +def apply_patches() -> None: + failed_patches = [] + for patch_file in glob.glob(os.path.join(script_root, "patches/*.patch")): + try: + subprocess.check_call(["git", "apply", patch_file, "--ignore-whitespace"], cwd=sdk_root) + except subprocess.CalledProcessError: + logging.error(f"Failed to apply patch {patch_file}") + failed_patches.append(patch_file) + + if failed_patches: + logging.error(f"Failed patches {failed_patches}") + + def delete_generated_source_code(path: str) -> None: autorest_generated_header = "Code generated by Microsoft (R) AutoRest Code Generator" typespec_generated_header = "Code generated by Microsoft (R) TypeSpec Code Generator" @@ -181,7 +211,7 @@ def delete_generated_source_code(path: str) -> None: else: try: # Read file content and check for header - with open(cur_path, 'r', encoding='utf-8') as f: + with open(cur_path, "r", encoding="utf-8") as f: content = f.read() if autorest_generated_header in content or typespec_generated_header in content: os.remove(cur_path) # Delete the file @@ -201,6 +231,8 @@ def main(): update_sdks() + apply_patches() + if __name__ == "__main__": logging.basicConfig(