From 261f3229f66664df6eae24f4ffe9fe8d69db5c0c Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:56:33 -0700 Subject: [PATCH] [Automation] Generate SDK based on TypeSpec 0.20.1 (#41675) * [Automation] Generate SDK based on TypeSpec 0.20.1 * remove DetectFromUrlRequest --------- Co-authored-by: Weidong Xu --- eng/emitter-package-lock.json | 8 ++--- eng/emitter-package.json | 2 +- .../azure/ai/vision/face/FaceAsyncClient.java | 36 +++++++++---------- .../com/azure/ai/vision/face/FaceClient.java | 36 +++++++++---------- ...Request.java => DetectFromUrlRequest.java} | 29 +++++++-------- ...ure-ai-vision-face_apiview_properties.json | 2 +- 6 files changed, 57 insertions(+), 56 deletions(-) rename sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/{DetectFromUrlImplRequest.java => DetectFromUrlRequest.java} (73%) diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json index 45a18f407b3d6..6a89cf9655227 100644 --- a/eng/emitter-package-lock.json +++ b/eng/emitter-package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@azure-tools/typespec-java": "0.20.0" + "@azure-tools/typespec-java": "0.20.1" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", @@ -161,9 +161,9 @@ } }, "node_modules/@azure-tools/typespec-java": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.20.0.tgz", - "integrity": "sha512-U7jm9kp6w6uc/IoZFFcRcsiUeuoO+T9XWbGhVNXFvOGAX9//+4aaV+rK2xvIWAHa08hnGX9D14t3qRade6ymvQ==", + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.20.1.tgz", + "integrity": "sha512-1Kj81r2rv50Zt9atVZfN5yWjJff2twiyarABHUObvNW763abUYndfGXQmktbPYbYun0Ub+9FAPuYwHuqSPvzWg==", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.0", diff --git a/eng/emitter-package.json b/eng/emitter-package.json index a7b86596a0e21..cb7cd8b3b63a4 100644 --- a/eng/emitter-package.json +++ b/eng/emitter-package.json @@ -1,7 +1,7 @@ { "main": "dist/src/index.js", "dependencies": { - "@azure-tools/typespec-java": "0.20.0" + "@azure-tools/typespec-java": "0.20.1" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java index 4d9e3f656f616..f1e491a62c131 100644 --- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java +++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java @@ -5,7 +5,7 @@ import com.azure.ai.vision.face.implementation.FaceClientImpl; import com.azure.ai.vision.face.implementation.models.DetectFromUrlImplOptions; -import com.azure.ai.vision.face.implementation.models.DetectFromUrlImplRequest; +import com.azure.ai.vision.face.implementation.models.DetectFromUrlRequest; import com.azure.ai.vision.face.implementation.models.FindSimilarRequest; import com.azure.ai.vision.face.implementation.models.GroupRequest; import com.azure.ai.vision.face.implementation.models.VerifyFaceToFaceRequest; @@ -72,7 +72,7 @@ public final class FaceAsyncClient { * The 'recognitionModel' associated with the query faceId should be the same as the 'recognitionModel' used by the * target faceId array. *

Request Body Schema

- * + * * 
{@code
      * {
      *     faceId: String (Required)
@@ -83,9 +83,9 @@ public final class FaceAsyncClient {
      *     ]
      * }
      * }
- * + * *

Response Body Schema

- * + * * 
{@code
      * [
      *      (Required){
@@ -122,16 +122,16 @@ public Mono> findSimilarWithResponse(BinaryData findSimilar
      * > * For the scenarios that are sensitive to accuracy please make your own judgment.
      * > * The 'recognitionModel' associated with the both faces should be the same.
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     faceId1: String (Required)
      *     faceId2: String (Required)
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     isIdentical: boolean (Required)
@@ -168,7 +168,7 @@ public Mono> verifyFaceToFaceWithResponse(BinaryData verify
      * only have 2 candidate faces.
      * * The 'recognitionModel' associated with the query faces' faceIds should be the same.
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     faceIds (Required): [
@@ -176,9 +176,9 @@ public Mono> verifyFaceToFaceWithResponse(BinaryData verify
      *     ]
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     groups (Required): [
@@ -422,15 +422,15 @@ public Mono group(List faceIds) {
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     url: String (Required)
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * [
      *      (Required){
@@ -608,13 +608,13 @@ Mono> detectFromUrlImplWithResponse(BinaryData detectFromUr
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * BinaryData
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * [
      *      (Required){
@@ -786,7 +786,7 @@ Mono> detectFromUrlImpl(DetectFromUrlImplOptions optio
         Boolean returnFaceLandmarks = options.isReturnFaceLandmarks();
         Boolean returnRecognitionModel = options.isReturnRecognitionModel();
         Integer faceIdTimeToLive = options.getFaceIdTimeToLive();
-        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
+        DetectFromUrlRequest detectFromUrlRequestObj = new DetectFromUrlRequest(options.getUrl());
         BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         if (detectionModel != null) {
             requestOptions.addQueryParam("detectionModel", detectionModel.toString(), false);
@@ -1322,7 +1322,7 @@ public Mono> detect(String url, FaceDetectionModel det
         addRequiredQueryParameterForDetection(requestOptions, detectionModel, recognitionModel, returnFaceId);
         addOptionalQueryParameterForDetection(requestOptions, returnFaceAttributes, returnFaceLandmarks,
             returnRecognitionModel, faceIdTimeToLive);
-        DetectFromUrlImplRequest requestObj = new DetectFromUrlImplRequest(url);
+        DetectFromUrlRequest requestObj = new DetectFromUrlRequest(url);
         BinaryData request = BinaryData.fromObject(requestObj);
         return detectFromUrlImplWithResponse(request, requestOptions).flatMap(FluxUtil::toMono)
             .map(protocolMethodData -> protocolMethodData.toObject(TYPE_REFERENCE_LIST_FACE_DETECTION_RESULT));
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
index b479cccfc2bc2..f3cb8b5e98bfb 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
@@ -5,7 +5,7 @@
 
 import com.azure.ai.vision.face.implementation.FaceClientImpl;
 import com.azure.ai.vision.face.implementation.models.DetectFromUrlImplOptions;
-import com.azure.ai.vision.face.implementation.models.DetectFromUrlImplRequest;
+import com.azure.ai.vision.face.implementation.models.DetectFromUrlRequest;
 import com.azure.ai.vision.face.implementation.models.FindSimilarRequest;
 import com.azure.ai.vision.face.implementation.models.GroupRequest;
 import com.azure.ai.vision.face.implementation.models.VerifyFaceToFaceRequest;
@@ -70,7 +70,7 @@ public final class FaceClient {
      * The 'recognitionModel' associated with the query faceId should be the same as the 'recognitionModel' used by the
      * target faceId array.
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     faceId: String (Required)
@@ -81,9 +81,9 @@ public final class FaceClient {
      *     ]
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * [
      *      (Required){
@@ -119,16 +119,16 @@ public Response findSimilarWithResponse(BinaryData findSimilarReques
      * > * For the scenarios that are sensitive to accuracy please make your own judgment.
      * > * The 'recognitionModel' associated with the both faces should be the same.
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     faceId1: String (Required)
      *     faceId2: String (Required)
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     isIdentical: boolean (Required)
@@ -165,7 +165,7 @@ public Response verifyFaceToFaceWithResponse(BinaryData verifyFaceTo
      * only have 2 candidate faces.
      * * The 'recognitionModel' associated with the query faces' faceIds should be the same.
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     faceIds (Required): [
@@ -173,9 +173,9 @@ public Response verifyFaceToFaceWithResponse(BinaryData verifyFaceTo
      *     ]
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     groups (Required): [
@@ -417,15 +417,15 @@ public FaceGroupingResult group(List faceIds) {
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * {
      *     url: String (Required)
      * }
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * [
      *      (Required){
@@ -602,13 +602,13 @@ Response detectFromUrlImplWithResponse(BinaryData detectFromUrlReque
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

-     * 
+     *
      * 
{@code
      * BinaryData
      * }

-     * 
+     *
      * 
Response Body Schema

-     * 
+     *
      * 
{@code
      * [
      *      (Required){
@@ -780,7 +780,7 @@ List detectFromUrlImpl(DetectFromUrlImplOptions options) {
         Boolean returnFaceLandmarks = options.isReturnFaceLandmarks();
         Boolean returnRecognitionModel = options.isReturnRecognitionModel();
         Integer faceIdTimeToLive = options.getFaceIdTimeToLive();
-        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
+        DetectFromUrlRequest detectFromUrlRequestObj = new DetectFromUrlRequest(options.getUrl());
         BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         if (detectionModel != null) {
             requestOptions.addQueryParam("detectionModel", detectionModel.toString(), false);
@@ -1316,7 +1316,7 @@ public List detect(String url, FaceDetectionModel detection
         addRequiredQueryParameterForDetection(requestOptions, detectionModel, recognitionModel, returnFaceId);
         addOptionalQueryParameterForDetection(requestOptions, returnFaceAttributes, returnFaceLandmarks,
             returnRecognitionModel, faceIdTimeToLive);
-        DetectFromUrlImplRequest requestObj = new DetectFromUrlImplRequest(url);
+        DetectFromUrlRequest requestObj = new DetectFromUrlRequest(url);
         BinaryData request = BinaryData.fromObject(requestObj);
         return detectFromUrlImplWithResponse(request, requestOptions).getValue()
             .toObject(TYPE_REFERENCE_LIST_FACE_DETECTION_RESULT);
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlImplRequest.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
similarity index 73%
rename from sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlImplRequest.java
rename to sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
index 7344c38258789..f81fa5b09304d 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlImplRequest.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/models/DetectFromUrlRequest.java
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
+
 package com.azure.ai.vision.face.implementation.models;
 
 import com.azure.core.annotation.Generated;
@@ -12,11 +13,10 @@
 import java.io.IOException;
 
 /**
- * The DetectFromUrlImplRequest model.
+ * The DetectFromUrlRequest model.
  */
 @Immutable
-public final class DetectFromUrlImplRequest implements JsonSerializable {
-
+public final class DetectFromUrlRequest implements JsonSerializable {
     /*
      * URL of input image.
      */
@@ -24,18 +24,18 @@ public final class DetectFromUrlImplRequest implements JsonSerializable {
             String url = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
+
                 if ("url".equals(fieldName)) {
                     url = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
             }
-            return new DetectFromUrlImplRequest(url);
+            return new DetectFromUrlRequest(url);
         });
     }
 }
diff --git a/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json b/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
index 092afd387a891..afec059cfbcba 100644
--- a/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
+++ b/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
@@ -73,7 +73,7 @@
     "com.azure.ai.vision.face.FaceSessionClientBuilder": "ClientCustomizations.FaceSessionClient",
     "com.azure.ai.vision.face.implementation.models.CreateLivenessWithVerifySessionMultipartContent": "Face.CreateLivenessWithVerifySessionMultipartContent",
     "com.azure.ai.vision.face.implementation.models.DetectFromUrlImplOptions": "null",
-    "com.azure.ai.vision.face.implementation.models.DetectFromUrlImplRequest": "detectFromUrl.Request.anonymous",
+    "com.azure.ai.vision.face.implementation.models.DetectFromUrlRequest": "detectFromUrl.Request.anonymous",
     "com.azure.ai.vision.face.implementation.models.FindSimilarRequest": "ClientCustomizations.findSimilar.Request.anonymous",
     "com.azure.ai.vision.face.implementation.models.GroupRequest": "ClientCustomizations.group.Request.anonymous",
     "com.azure.ai.vision.face.implementation.models.VerifyFaceToFaceRequest": "ClientCustomizations.verifyFaceToFace.Request.anonymous",