diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisAsyncClient.java b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisAsyncClient.java index c63f7fbd7607..47533add47c8 100644 --- a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisAsyncClient.java +++ b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisAsyncClient.java @@ -5,6 +5,7 @@ import com.azure.ai.vision.imageanalysis.implementation.ImageAnalysisClientImpl; import com.azure.ai.vision.imageanalysis.implementation.models.ImageUrl; +import com.azure.ai.vision.imageanalysis.models.ImageAnalysisOptions; import com.azure.ai.vision.imageanalysis.models.ImageAnalysisResult; import com.azure.ai.vision.imageanalysis.models.VisualFeatures; import com.azure.core.annotation.Generated; @@ -26,33 +27,9 @@ import java.util.Objects; import java.util.stream.Collectors; import reactor.core.publisher.Mono; -import com.azure.ai.vision.imageanalysis.models.ImageAnalysisOptions; /** * Initializes a new instance of the asynchronous ImageAnalysisClient type. - * - * - * 
- * //
- * // Create an asynchronous Image Analysis client with API key authentication.
- * //
- * ImageAnalysisAsyncClient client = new ImageAnalysisClientBuilder()
- *     .endpoint(endpoint)
- *     .credential(new KeyCredential(key))
- *     .buildAsyncClient();
- *
- * - * - * 
- * //
- * // Create an asynchronous Image Analysis client with Entra ID authentication.
- * //
- * ImageAnalysisAsyncClient client = new ImageAnalysisClientBuilder()
- *     .endpoint(endpoint)
- *     .credential(new DefaultAzureCredentialBuilder().build())
- *     .buildAsyncClient();
- *
- * */ @ServiceClient(builder = ImageAnalysisClientBuilder.class, isAsync = true) public final class ImageAnalysisAsyncClient { @@ -101,15 +78,18 @@ public final class ImageAnalysisAsyncClient { * You can add these to a request with {@link RequestOptions#addQueryParam} *

Request Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -195,7 +175,8 @@ public final class ImageAnalysisAsyncClient {
      *         ]
      *     }
      * }
-     * }

+     * }
+     *
* * @param visualFeatures A list of visual features to analyze. * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People. @@ -271,7 +252,7 @@ Mono analyzeFromUrl(List visualFeatures, Im return analyzeFromUrlWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), BinaryData.fromObject(imageUrl), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); + .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); } /** @@ -297,7 +278,7 @@ Mono analyzeFromUrl(List visualFeatures, Im return analyzeFromUrlWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), BinaryData.fromObject(imageUrl), requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); + .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); } /** @@ -331,13 +312,16 @@ Mono analyzeFromUrl(List visualFeatures, Im * You can add these to a request with {@link RequestOptions#addQueryParam} *

Request Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -423,7 +407,8 @@ Mono analyzeFromUrl(List visualFeatures, Im
      *         ]
      *     }
      * }
-     * }

+     * }
+     *
* * @param visualFeatures A list of visual features to analyze. * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People. @@ -499,7 +484,7 @@ Mono analyzeFromImageData(List visualFeatur return analyzeFromImageDataWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), imageData, requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); + .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); } /** @@ -525,7 +510,7 @@ Mono analyzeFromImageData(List visualFeatur return analyzeFromImageDataWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), imageData, requestOptions).flatMap(FluxUtil::toMono) - .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); + .map(protocolMethodData -> protocolMethodData.toObject(ImageAnalysisResult.class)); } /** diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClient.java b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClient.java index 219cdf259fc2..80a3fef77100 100644 --- a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClient.java +++ b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClient.java @@ -28,28 +28,6 @@ /** * Initializes a new instance of the synchronous ImageAnalysisClient type. - * - * 
- * //
- * // Create a synchronous Image Analysis client with API key authentication.
- * //
- * ImageAnalysisClient client = new ImageAnalysisClientBuilder()
- *     .endpoint(endpoint)
- *     .credential(new KeyCredential(key))
- *     .buildClient();
- *
- * - * - * 
- * //
- * // Create a synchronous Image Analysis client with Entra ID authentication.
- * //
- * ImageAnalysisClient client = new ImageAnalysisClientBuilder()
- *     .endpoint(endpoint)
- *     .credential(new DefaultAzureCredentialBuilder().build())
- *     .buildClient();
- *
- * */ @ServiceClient(builder = ImageAnalysisClientBuilder.class) public final class ImageAnalysisClient { @@ -98,15 +76,18 @@ public final class ImageAnalysisClient { * You can add these to a request with {@link RequestOptions#addQueryParam} *

Request Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -192,7 +173,8 @@ public final class ImageAnalysisClient {
      *         ]
      *     }
      * }
-     * }

+     * }
+     *
* * @param visualFeatures A list of visual features to analyze. * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People. @@ -267,7 +249,7 @@ ImageAnalysisResult analyzeFromUrl(List visualFeatures, ImageUrl return analyzeFromUrlWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), BinaryData.fromObject(imageUrl), requestOptions).getValue() - .toObject(ImageAnalysisResult.class); + .toObject(ImageAnalysisResult.class); } /** @@ -293,7 +275,7 @@ ImageAnalysisResult analyzeFromUrl(List visualFeatures, ImageUrl return analyzeFromUrlWithResponse(visualFeatures.stream() .map(paramItemValue -> Objects.toString(paramItemValue, "")) .collect(Collectors.toList()), BinaryData.fromObject(imageUrl), requestOptions).getValue() - .toObject(ImageAnalysisResult.class); + .toObject(ImageAnalysisResult.class); } /** @@ -327,13 +309,16 @@ ImageAnalysisResult analyzeFromUrl(List visualFeatures, ImageUrl * You can add these to a request with {@link RequestOptions#addQueryParam} *

Request Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -419,7 +404,8 @@ ImageAnalysisResult analyzeFromUrl(List visualFeatures, ImageUrl
      *         ]
      *     }
      * }
-     * }

+     * }
+     *
* * @param visualFeatures A list of visual features to analyze. * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People. diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientBuilder.java b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientBuilder.java index 982d248c304f..3f07d53c9ea2 100644 --- a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientBuilder.java +++ b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/ImageAnalysisClientBuilder.java @@ -22,8 +22,8 @@ import com.azure.core.http.policy.AddHeadersFromContextPolicy; import com.azure.core.http.policy.AddHeadersPolicy; import com.azure.core.http.policy.BearerTokenAuthenticationPolicy; -import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpLogOptions; +import com.azure.core.http.policy.HttpLoggingPolicy; import com.azure.core.http.policy.HttpPipelinePolicy; import com.azure.core.http.policy.HttpPolicyProviders; import com.azure.core.http.policy.KeyCredentialPolicy; diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/implementation/ImageAnalysisClientImpl.java b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/implementation/ImageAnalysisClientImpl.java index 7f1a1e6249bb..88f6b5a0fd08 100644 --- a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/implementation/ImageAnalysisClientImpl.java +++ b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/com/azure/ai/vision/imageanalysis/implementation/ImageAnalysisClientImpl.java @@ -233,13 +233,16 @@ Response analyzeFromUrlSync(@HostParam("endpoint") String endpoint, * You can add these to a request with {@link RequestOptions#addQueryParam} *

Request Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -325,7 +328,8 @@ Response analyzeFromUrlSync(@HostParam("endpoint") String endpoint,
      *         ]
      *     }
      * }
-     * }

+     * }
+     *
* * @param visualFeatures A list of visual features to analyze. * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People. @@ -383,13 +387,16 @@ public Mono> analyzeFromImageDataWithResponseAsync(ListRequest Body Schema

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

+     * }
+     *
* *

Response Body Schema

* - * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -475,7 +482,8 @@ public Mono> analyzeFromImageDataWithResponseAsync(List
+     * }
+     * 

      * 
      * @param visualFeatures A list of visual features to analyze.
      * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People.
@@ -531,15 +539,18 @@ public Response analyzeFromImageDataWithResponse(List visual
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

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

+     * }
+     * 

      * 
      * 
Response Body Schema

      * 
-     * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -625,7 +636,8 @@ public Response analyzeFromImageDataWithResponse(List visual
      *         ]
      *     }
      * }
-     * }

+     * }
+     * 

      * 
      * @param visualFeatures A list of visual features to analyze.
      * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People.
@@ -683,15 +695,18 @@ public Mono> analyzeFromUrlWithResponseAsync(List v
      * You can add these to a request with {@link RequestOptions#addQueryParam}
      * 
Request Body Schema

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

+     * }
+     * 

      * 
      * 
Response Body Schema

      * 
-     * 
{@code
+     * 
+     * {@code
      * {
      *     captionResult (Optional): {
      *         confidence: double (Required)
@@ -777,7 +792,8 @@ public Mono> analyzeFromUrlWithResponseAsync(List v
      *         ]
      *     }
      * }
-     * }

+     * }
+     * 

      * 
      * @param visualFeatures A list of visual features to analyze.
      * Seven visual features are supported: Caption, DenseCaptions, Read (OCR), Tags, Objects, SmartCrops, and People.
diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/module-info.java b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/module-info.java
index ca0981f3cdc7..99279c104b70 100644
--- a/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/module-info.java
+++ b/sdk/vision/azure-ai-vision-imageanalysis/src/main/java/module-info.java
@@ -4,8 +4,10 @@
 
 module com.azure.ai.vision.imageanalysis {
     requires transitive com.azure.core;
+
     exports com.azure.ai.vision.imageanalysis;
     exports com.azure.ai.vision.imageanalysis.models;
+
     opens com.azure.ai.vision.imageanalysis.models to com.azure.core;
     opens com.azure.ai.vision.imageanalysis.implementation.models to com.azure.core;
 }
diff --git a/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/generated/ImageAnalysisClientTestBase.java b/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/generated/ImageAnalysisClientTestBase.java
index f75bcfa7c382..1940d85b7ded 100644
--- a/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/generated/ImageAnalysisClientTestBase.java
+++ b/sdk/vision/azure-ai-vision-imageanalysis/src/test/java/com/azure/ai/vision/imageanalysis/generated/ImageAnalysisClientTestBase.java
@@ -10,7 +10,6 @@
 
 import com.azure.ai.vision.imageanalysis.ImageAnalysisClient;
 import com.azure.ai.vision.imageanalysis.ImageAnalysisClientBuilder;
-import com.azure.core.http.HttpClient;
 import com.azure.core.http.policy.HttpLogDetailLevel;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.test.TestMode;
@@ -26,11 +25,10 @@ class ImageAnalysisClientTestBase extends TestProxyTestBase {
     protected void beforeTest() {
         ImageAnalysisClientBuilder imageAnalysisClientbuilder = new ImageAnalysisClientBuilder()
             .endpoint(Configuration.getGlobalConfiguration().get("ENDPOINT", "endpoint"))
-            .httpClient(HttpClient.createDefault())
+            .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null)))
             .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC));
         if (getTestMode() == TestMode.PLAYBACK) {
-            imageAnalysisClientbuilder.httpClient(interceptorManager.getPlaybackClient())
-                .credential(new MockTokenCredential());
+            imageAnalysisClientbuilder.credential(new MockTokenCredential());
         } else if (getTestMode() == TestMode.RECORD) {
             imageAnalysisClientbuilder.addPolicy(interceptorManager.getRecordPolicy())
                 .credential(new DefaultAzureCredentialBuilder().build());
diff --git a/sdk/vision/azure-ai-vision-imageanalysis/tsp-location.yaml b/sdk/vision/azure-ai-vision-imageanalysis/tsp-location.yaml
index 5afeb7d9a3ef..64f419dc42d7 100644
--- a/sdk/vision/azure-ai-vision-imageanalysis/tsp-location.yaml
+++ b/sdk/vision/azure-ai-vision-imageanalysis/tsp-location.yaml
@@ -1,5 +1,4 @@
-repo: Azure/azure-rest-api-specs
 directory: specification/ai/ImageAnalysis
-additionalDirectories: []
-commit: d6be8f199982997f0a94e3e9bbbe8b2f7e304f7d
-
+commit: 6b815c0cae3b7b3b42809a68a22b1d86511ecf7f
+repo: Azure/azure-rest-api-specs
+additionalDirectories: