From 9c347174413d83aa8a2c4db237e9e45e4bd1661c Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 12 May 2025 23:08:27 +0000 Subject: [PATCH] CodeGen from PR 34621 in Azure/azure-rest-api-specs Merge c11b9d8546fcddfc023d55f4e70c2f04413ca84e into 1e37d13d12612ab6abbbc4f9539e1f6ec507663b --- .../com/azure/compute/batch/BatchAsyncClient.java | 12 +++++++----- .../java/com/azure/compute/batch/BatchClient.java | 12 +++++++----- .../batch/implementation/BatchClientImpl.java | 6 ++++++ .../compute/batch/implementation/package-info.java | 2 +- .../com/azure/compute/batch/models/package-info.java | 2 +- .../java/com/azure/compute/batch/package-info.java | 2 +- .../azure-compute-batch_apiview_properties.json | 1 - sdk/batch/azure-compute-batch/tsp-location.yaml | 4 ++-- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java index e16a901798d4..fb8b23cb2d45 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java @@ -90,7 +90,6 @@ import com.azure.compute.batch.models.GetBatchTaskFileOptions; import com.azure.compute.batch.models.GetBatchTaskFilePropertiesOptions; import com.azure.compute.batch.models.GetBatchTaskOptions; -import com.azure.compute.batch.models.GetCertificateResponse; import com.azure.compute.batch.models.ListBatchApplicationsOptions; import com.azure.compute.batch.models.ListBatchCertificatesOptions; import com.azure.compute.batch.models.ListBatchJobPreparationAndReleaseTaskStatusOptions; @@ -5790,6 +5789,9 @@ public Mono> deleteCertificateWithResponse(String thumbprintAlgor * } * ] * } + * data: String (Required) + * certificateFormat: String(pfx/cer) (Optional) + * password: String (Optional) * } * } * @@ -13699,7 +13701,7 @@ public Mono deleteCertificate(String thumbprintAlgorithm, String thumbprin */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getCertificate(String thumbprintAlgorithm, String thumbprint, + public Mono getCertificate(String thumbprintAlgorithm, String thumbprint, GetBatchCertificateOptions options) { // Generated convenience method for getCertificateWithResponse RequestOptions requestOptions = new RequestOptions(); @@ -13716,7 +13718,7 @@ public Mono getCertificate(String thumbprintAlgorithm, S false); } return getCertificateWithResponse(thumbprintAlgorithm, thumbprint, requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(GetCertificateResponse.class)); + .map(protocolMethodData -> protocolMethodData.toObject(BatchCertificate.class)); } /** @@ -13734,11 +13736,11 @@ public Mono getCertificate(String thumbprintAlgorithm, S */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public Mono getCertificate(String thumbprintAlgorithm, String thumbprint) { + public Mono getCertificate(String thumbprintAlgorithm, String thumbprint) { // Generated convenience method for getCertificateWithResponse RequestOptions requestOptions = new RequestOptions(); return getCertificateWithResponse(thumbprintAlgorithm, thumbprint, requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(GetCertificateResponse.class)); + .map(protocolMethodData -> protocolMethodData.toObject(BatchCertificate.class)); } /** diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java index 5237b192624a..59dcbaa2eda8 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java @@ -90,7 +90,6 @@ import com.azure.compute.batch.models.GetBatchTaskFileOptions; import com.azure.compute.batch.models.GetBatchTaskFilePropertiesOptions; import com.azure.compute.batch.models.GetBatchTaskOptions; -import com.azure.compute.batch.models.GetCertificateResponse; import com.azure.compute.batch.models.ListBatchApplicationsOptions; import com.azure.compute.batch.models.ListBatchCertificatesOptions; import com.azure.compute.batch.models.ListBatchJobPreparationAndReleaseTaskStatusOptions; @@ -5780,6 +5779,9 @@ public Response deleteCertificateWithResponse(String thumbprintAlgorithm, * } * ] * } + * data: String (Required) + * certificateFormat: String(pfx/cer) (Optional) + * password: String (Optional) * } * } * @@ -13418,7 +13420,7 @@ public void deleteCertificate(String thumbprintAlgorithm, String thumbprint) { */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public GetCertificateResponse getCertificate(String thumbprintAlgorithm, String thumbprint, + public BatchCertificate getCertificate(String thumbprintAlgorithm, String thumbprint, GetBatchCertificateOptions options) { // Generated convenience method for getCertificateWithResponse RequestOptions requestOptions = new RequestOptions(); @@ -13435,7 +13437,7 @@ public GetCertificateResponse getCertificate(String thumbprintAlgorithm, String false); } return getCertificateWithResponse(thumbprintAlgorithm, thumbprint, requestOptions).getValue() - .toObject(GetCertificateResponse.class); + .toObject(BatchCertificate.class); } /** @@ -13453,11 +13455,11 @@ public GetCertificateResponse getCertificate(String thumbprintAlgorithm, String */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) - public GetCertificateResponse getCertificate(String thumbprintAlgorithm, String thumbprint) { + public BatchCertificate getCertificate(String thumbprintAlgorithm, String thumbprint) { // Generated convenience method for getCertificateWithResponse RequestOptions requestOptions = new RequestOptions(); return getCertificateWithResponse(thumbprintAlgorithm, thumbprint, requestOptions).getValue() - .toObject(GetCertificateResponse.class); + .toObject(BatchCertificate.class); } /** 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 ac94e0786cb7..e9956db55648 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 @@ -17240,6 +17240,9 @@ public Response deleteCertificateWithResponse(String thumbprintAlgorithm, * } * ] * } + * data: String (Required) + * certificateFormat: String(pfx/cer) (Optional) + * password: String (Optional) * } * } * @@ -17298,6 +17301,9 @@ public Mono> getCertificateWithResponseAsync(String thumbpr * } * ] * } + * data: String (Required) + * certificateFormat: String(pfx/cer) (Optional) + * password: String (Optional) * } * } * diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/package-info.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/package-info.java index a798af259bc4..9c9901503bd0 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/package-info.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/package-info.java @@ -4,7 +4,7 @@ /** * * Package containing the implementations for Batch. - * Azure Batch provides Cloud-scale job scheduling and compute management. + * Azure Batch provides Cloud-scale job scheduling and compute management test. * */ package com.azure.compute.batch.implementation; diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/models/package-info.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/models/package-info.java index e5e83637d028..292d317530b3 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/models/package-info.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/models/package-info.java @@ -4,7 +4,7 @@ /** * * Package containing the data models for Batch. - * Azure Batch provides Cloud-scale job scheduling and compute management. + * Azure Batch provides Cloud-scale job scheduling and compute management test. * */ package com.azure.compute.batch.models; diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/package-info.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/package-info.java index af3f8818859e..a031c5dabeb7 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/package-info.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/package-info.java @@ -4,7 +4,7 @@ /** * * Package containing the classes for Batch. - * Azure Batch provides Cloud-scale job scheduling and compute management. + * Azure Batch provides Cloud-scale job scheduling and compute management test. * */ package com.azure.compute.batch; diff --git a/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json b/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json index 2de447260bdd..88130b942537 100644 --- a/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json +++ b/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json @@ -471,7 +471,6 @@ "com.azure.compute.batch.models.GetBatchTaskFileOptions": null, "com.azure.compute.batch.models.GetBatchTaskFilePropertiesOptions": null, "com.azure.compute.batch.models.GetBatchTaskOptions": null, - "com.azure.compute.batch.models.GetCertificateResponse": "Client.getCertificate.Response.anonymous", "com.azure.compute.batch.models.HttpHeader": "Azure.Batch.HttpHeader", "com.azure.compute.batch.models.ImageReference": "Azure.Batch.ImageReference", "com.azure.compute.batch.models.ImageVerificationType": "Azure.Batch.ImageVerificationType", diff --git a/sdk/batch/azure-compute-batch/tsp-location.yaml b/sdk/batch/azure-compute-batch/tsp-location.yaml index d56c8209b46c..e6110e0b4c38 100644 --- a/sdk/batch/azure-compute-batch/tsp-location.yaml +++ b/sdk/batch/azure-compute-batch/tsp-location.yaml @@ -1,4 +1,4 @@ directory: specification/batch/Azure.Batch -commit: 80ea1faf49a5f7c655529d312fe886daed0069ad +commit: 6a439da0fa799a27aef35d4fac4a29455cc86fec repo: Azure/azure-rest-api-specs -cleanup: false +additionalDirectories: