Remove manual URL mapper for azure-ai-agents and bumped openai-java library version

eng/versioning/external_dependencies.txt

@@ -36,7 +36,7 @@ com.microsoft.sqlserver:mssql-jdbc;10.2.3.jre8
 com.microsoft.azure:azure-functions-maven-plugin;1.30.0
 com.microsoft.azure.functions:azure-functions-java-library;2.2.0
 com.mysql:mysql-connector-j;9.0.0
-com.openai:openai-java;4.6.1
+com.openai:openai-java;4.14.0
 com.squareup.okhttp3:okhttp;4.12.0
 commons-codec:commons-codec;1.15
 commons-net:commons-net;3.9.0

sdk/ai/azure-ai-agents/CHANGELOG.md

@@ -7,6 +7,7 @@
 - New `MemorySearchAgent` sample was added demonstrating memory search functionality
 - Tests for `MemoryStoresClient` and `MemoryStoresAsyncClient`
 - Various documentation updates
+- Using unified `HttpClient` setup for Azure specifics and `openai` client library wrapping methods
 
 ### Breaking Changes
 
@@ -16,6 +17,8 @@
 
 ### Other Changes
 
+- Updated version of `openai` client library to `4.14.0`
+
 ## 1.0.0-beta.1 (2025-11-12)
 
 ### Features Added

sdk/ai/azure-ai-agents/pom.xml

@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.openai</groupId>
       <artifactId>openai-java</artifactId>
-      <version>4.6.1</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
+      <version>4.14.0</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -97,7 +97,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.openai:openai-java:[4.6.1]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
+                <include>com.openai:openai-java:[4.14.0]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
               </includes>
             </bannedDependencies>
             <requireReleaseDeps>

sdk/ai/azure-ai-agents/src/main/java/com/azure/ai/agents/implementation/http/HttpClientHelper.java

@@ -28,8 +28,11 @@
 import com.openai.errors.UnauthorizedException;
 import com.openai.errors.UnexpectedStatusCodeException;
 import com.openai.errors.UnprocessableEntityException;
+import reactor.core.publisher.Mono;
 
 import java.io.ByteArrayOutputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
@@ -82,10 +85,14 @@ public HttpResponse execute(HttpRequest request, RequestOptions requestOptions)
             Objects.requireNonNull(request, "request");
             Objects.requireNonNull(requestOptions, "requestOptions");
 
-            com.azure.core.http.HttpRequest azureRequest = buildAzureRequest(request);
-
-            return new AzureHttpResponseAdapter(
-                this.httpPipeline.sendSync(azureRequest, buildRequestContext(requestOptions)));
+            try {
+                com.azure.core.http.HttpRequest azureRequest = buildAzureRequest(request);
+                return new AzureHttpResponseAdapter(
+                    this.httpPipeline.sendSync(azureRequest, buildRequestContext(requestOptions)));
+            } catch (MalformedURLException exception) {
+                throw new OpenAIException("Invalid URL in request: " + exception.getMessage(),
+                    LOGGER.logThrowableAsError(exception));
+            }
         }
 
         @Override
@@ -98,9 +105,8 @@ public CompletableFuture<HttpResponse> executeAsync(HttpRequest request, Request
             Objects.requireNonNull(request, "request");
             Objects.requireNonNull(requestOptions, "requestOptions");
 
-            final com.azure.core.http.HttpRequest azureRequest = buildAzureRequest(request);
-
-            return this.httpPipeline.send(azureRequest, buildRequestContext(requestOptions))
+            return Mono.fromCallable(() -> buildAzureRequest(request))
+                .flatMap(azureRequest -> this.httpPipeline.send(azureRequest, buildRequestContext(requestOptions)))
                 .map(response -> (HttpResponse) new AzureHttpResponseAdapter(response))
                 .onErrorMap(HttpClientWrapper::mapAzureExceptionToOpenAI)
                 .toFuture();
@@ -179,7 +185,8 @@ private static Headers toOpenAIHeaders(HttpHeaders azureHeaders) {
         /**
          * Converts the OpenAI request metadata and body into an Azure {@link com.azure.core.http.HttpRequest}.
          */
-        private static com.azure.core.http.HttpRequest buildAzureRequest(HttpRequest request) {
+        private static com.azure.core.http.HttpRequest buildAzureRequest(HttpRequest request)
+            throws MalformedURLException {
             HttpRequestBody requestBody = request.body();
             String contentType = requestBody != null ? requestBody.contentType() : null;
             BinaryData bodyData = null;
@@ -196,7 +203,7 @@ private static com.azure.core.http.HttpRequest buildAzureRequest(HttpRequest req
             }
 
             com.azure.core.http.HttpRequest azureRequest = new com.azure.core.http.HttpRequest(
-                HttpMethod.valueOf(request.method().name()), OpenAiRequestUrlBuilder.buildUrl(request), headers);
+                HttpMethod.valueOf(request.method().name()), URI.create(request.url()).toURL(), headers);
 
             if (bodyData != null) {
                 azureRequest.setBody(bodyData);

sdk/ai/azure-ai-agents/src/test/java/com/azure/ai/agents/implementation/http/HttpClientHelperTests.java

@@ -4,9 +4,7 @@
 package com.azure.ai.agents.implementation.http;
 
 import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpHeaderName;
 import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpMethod;
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.HttpRequest;
 import com.azure.core.http.HttpResponse;
@@ -27,7 +25,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -36,39 +33,6 @@
 
 class HttpClientHelperTests {
 
-    private static final HttpHeaderName REQUEST_ID_HEADER = HttpHeaderName.fromString("x-request-id");
-    private static final HttpHeaderName CUSTOM_HEADER_NAME = HttpHeaderName.fromString("custom-header");
-    private static final HttpHeaderName X_TEST_HEADER = HttpHeaderName.fromString("X-Test");
-    private static final HttpHeaderName X_MULTI_HEADER = HttpHeaderName.fromString("X-Multi");
-
-    @Test
-    void executeMapsRequestAndResponse() {
-        RecordingHttpClient recordingClient = new RecordingHttpClient(request -> createMockResponse(request, 201,
-            new HttpHeaders().set(REQUEST_ID_HEADER, "req-123").set(CUSTOM_HEADER_NAME, "custom-value"), "pong"));
-        com.openai.core.http.HttpClient openAiClient
-            = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
-
-        com.openai.core.http.HttpRequest openAiRequest = createOpenAiRequest();
-
-        try (com.openai.core.http.HttpResponse response = openAiClient.execute(openAiRequest)) {
-            HttpRequest sentRequest = recordingClient.getLastRequest();
-            assertNotNull(sentRequest, "Azure HttpClient should receive a request");
-            assertEquals(HttpMethod.POST, sentRequest.getHttpMethod());
-            assertEquals("https://example.com/path/segment?q=a%20b", sentRequest.getUrl().toString());
-            assertEquals("alpha", sentRequest.getHeaders().getValue(X_TEST_HEADER));
-            assertArrayEquals(new String[] { "first", "second" }, sentRequest.getHeaders().getValues(X_MULTI_HEADER));
-            assertEquals("text/plain", sentRequest.getHeaders().getValue(HttpHeaderName.CONTENT_TYPE));
-            assertEquals("payload", new String(sentRequest.getBodyAsBinaryData().toBytes(), StandardCharsets.UTF_8));
-
-            assertEquals(201, response.statusCode());
-            assertEquals("req-123", response.requestId().orElseThrow(() -> new AssertionError("Missing request id")));
-            assertEquals("custom-value", response.headers().values("custom-header").get(0));
-            assertEquals("pong", new String(readAllBytes(response.body()), StandardCharsets.UTF_8));
-        } catch (Exception e) {
-            fail("Exception thrown while reading response", e);
-        }
-    }
-
     @Test
     void executeAsyncCompletesSuccessfully() {
         RecordingHttpClient recordingClient

sdk/ai/azure-ai-projects/CHANGELOG.md

@@ -10,6 +10,8 @@
 
 ### Other Changes
 
+- Updated version of `openai` client library to `4.14.0`
+
 ## 1.0.0-beta.3 (2025-11-12)
 
 ### Features Added

sdk/ai/azure-ai-projects/pom.xml

@@ -77,7 +77,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.openai</groupId>
       <artifactId>openai-java</artifactId>
-      <version>4.6.1</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
+      <version>4.14.0</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
     </dependency>
 
     <!-- test Dependencies -->
@@ -106,7 +106,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.openai:openai-java:[4.6.1]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
+                <include>com.openai:openai-java:[4.14.0]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>

sdk/openai/azure-ai-openai-stainless/pom.xml

@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.openai</groupId>
       <artifactId>openai-java</artifactId>
-      <version>4.6.1</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
+      <version>4.14.0</version> <!-- {x-version-update;com.openai:openai-java;external_dependency} -->
     </dependency>
 
     <!-- provided scope -->
@@ -132,7 +132,7 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.openai:openai-java:[4.6.1]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
+                <include>com.openai:openai-java:[4.14.0]</include> <!-- {x-include-update;com.openai:openai-java;external_dependency} -->
               </includes>
             </bannedDependencies>
             <requireReleaseDeps>