Skip to content

Commit a4e5c29

Browse files
jpalvarezljpalvarezl
committed
Code style checks
1 parent 96153b7 commit a4e5c29

File tree

4 files changed

+40
-30
lines changed

4 files changed

+40
-30
lines changed

‎sdk/ai/azure-ai-agents/src/main/java/com/azure/ai/agents/AgentsClientBuilder.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,9 @@ private HttpPipeline createHttpPipeline() {
328328
* @return an instance of ConversationsAsyncClient.
329329
*/
330330
public ConversationsAsyncClient buildConversationsAsyncClient() {
331-
return new ConversationsAsyncClient(getOpenAIAsyncClientBuilder().build().withOptions(optionBuilder ->
332-
optionBuilder.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
331+
return new ConversationsAsyncClient(getOpenAIAsyncClientBuilder().build()
332+
.withOptions(optionBuilder -> optionBuilder
333+
.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
333334
}
334335

335336
/**
@@ -338,8 +339,9 @@ public ConversationsAsyncClient buildConversationsAsyncClient() {
338339
* @return an instance of ConversationsClient.
339340
*/
340341
public ConversationsClient buildConversationsClient() {
341-
return new ConversationsClient(getOpenAIClientBuilder().build().withOptions(optionBuilder ->
342-
optionBuilder.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
342+
return new ConversationsClient(getOpenAIClientBuilder().build()
343+
.withOptions(optionBuilder -> optionBuilder
344+
.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
343345
}
344346

345347
/**
@@ -348,8 +350,9 @@ public ConversationsClient buildConversationsClient() {
348350
* @return an instance of ResponsesClient
349351
*/
350352
public ResponsesClient buildResponsesClient() {
351-
return new ResponsesClient(getOpenAIClientBuilder().build().withOptions(optionBuilder ->
352-
optionBuilder.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
353+
return new ResponsesClient(getOpenAIClientBuilder().build()
354+
.withOptions(optionBuilder -> optionBuilder
355+
.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
353356
}
354357

355358
/**
@@ -358,8 +361,9 @@ public ResponsesClient buildResponsesClient() {
358361
* @return an instance of ResponsesAsyncClient
359362
*/
360363
public ResponsesAsyncClient buildResponsesAsyncClient() {
361-
return new ResponsesAsyncClient(getOpenAIAsyncClientBuilder().build().withOptions(optionBuilder ->
362-
optionBuilder.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
364+
return new ResponsesAsyncClient(getOpenAIAsyncClientBuilder().build()
365+
.withOptions(optionBuilder -> optionBuilder
366+
.httpClient(HttpClientHelper.mapToOpenAIHttpClient(createHttpPipeline()))));
363367
}
364368

365369
private OpenAIOkHttpClient.Builder getOpenAIClientBuilder() {

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ public CompletableFuture<HttpResponse> executeAsync(HttpRequest request, Request
9494
return failedFuture(runtimeException);
9595
}
9696

97-
return this.httpPipeline.send(azureRequest, new Context("azure-eagerly-read-response", true))
97+
return this.httpPipeline.send(azureRequest, new Context("azure-eagerly-read-response", false))
9898
.map(response -> (HttpResponse) new AzureHttpResponseAdapter(response))
99-
// .onErrorMap(t -> {
100-
// // 2 or 3 from Azure Errors, should be mapped to Stainless Error.
101-
// // - Auth
102-
// // - Resource not found
103-
// // - HttpResponse Ex
104-
// //
105-
// // new StainlessException(t.getCause())
106-
// })
107-
.toFuture();
99+
// .onErrorMap(t -> {
100+
// // 2 or 3 from Azure Errors, should be mapped to Stainless Error.
101+
// // - Auth
102+
// // - Resource not found
103+
// // - HttpResponse Ex
104+
// //
105+
// // new StainlessException(t.getCause())
106+
// })
107+
.toFuture();
108108
}
109109

110110
/**
@@ -128,9 +128,8 @@ private static com.azure.core.http.HttpRequest buildAzureRequest(HttpRequest req
128128
headers.set(HttpHeaderName.CONTENT_TYPE, contentType);
129129
}
130130

131-
com.azure.core.http.HttpRequest azureRequest
132-
= new com.azure.core.http.HttpRequest(HttpMethod.valueOf(request.method().name()),
133-
OpenAiRequestUrlBuilder.buildUrl(request), headers);
131+
com.azure.core.http.HttpRequest azureRequest = new com.azure.core.http.HttpRequest(
132+
HttpMethod.valueOf(request.method().name()), OpenAiRequestUrlBuilder.buildUrl(request), headers);
134133

135134
if (bodyData != null) {
136135
azureRequest.setBody(bodyData);

‎sdk/ai/azure-ai-agents/src/test/java/com/azure/ai/agents/ConversationsAsyncTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@Disabled("Disabled for lack of recordings. Needs to be enabled on the Public Preview release.")
2727
public class ConversationsAsyncTests extends ClientTestBase {
2828

29-
ClientLogger LOGGER = new ClientLogger(ConversationsAsyncTests.class);
29+
private final ClientLogger logger = new ClientLogger(ConversationsAsyncTests.class);
3030

3131
@ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
3232
@MethodSource("com.azure.ai.agents.TestUtils#getTestParameters")
@@ -39,7 +39,7 @@ public void basicCRUDOperations(HttpClient httpClient, AgentsServiceVersion serv
3939
String conversationId = createdConversation.id();
4040
assertNotNull(conversationId);
4141
assertTrue(StringUtils.isNotBlank(conversationId));
42-
LOGGER.log(LogLevel.INFORMATIONAL, () -> "Create completed");
42+
logger.log(LogLevel.INFORMATIONAL, () -> "Create completed");
4343

4444
// update
4545
ConversationUpdateParams.Metadata metadata = ConversationUpdateParams.Metadata.builder()

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

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class HttpClientHelperTests {
4444
void executeMapsRequestAndResponse() {
4545
RecordingHttpClient recordingClient = new RecordingHttpClient(request -> createMockResponse(request, 201,
4646
new HttpHeaders().set(REQUEST_ID_HEADER, "req-123").set(CUSTOM_HEADER_NAME, "custom-value"), "pong"));
47-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
47+
com.openai.core.http.HttpClient openAiClient
48+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
4849

4950
com.openai.core.http.HttpRequest openAiRequest = createOpenAiRequest();
5051

@@ -71,7 +72,8 @@ void executeMapsRequestAndResponse() {
7172
void executeAsyncCompletesSuccessfully() {
7273
RecordingHttpClient recordingClient
7374
= new RecordingHttpClient(request -> createMockResponse(request, 204, new HttpHeaders(), ""));
74-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
75+
com.openai.core.http.HttpClient openAiClient
76+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
7577

7678
com.openai.core.http.HttpRequest openAiRequest = createOpenAiRequest();
7779

@@ -94,7 +96,8 @@ void executeWithNullRequestBodySucceeds() throws Exception {
9496
}
9597
return createMockResponse(request, 200, new HttpHeaders(), "success");
9698
});
97-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
99+
com.openai.core.http.HttpClient openAiClient
100+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
98101

99102
com.openai.core.http.HttpRequest openAiRequest = com.openai.core.http.HttpRequest.builder()
100103
.method(com.openai.core.http.HttpMethod.GET)
@@ -112,7 +115,8 @@ void executeWithNullRequestBodySucceeds() throws Exception {
112115
void executeThrowsUncheckedIOExceptionOnBodyBufferingFailure() {
113116
RecordingHttpClient recordingClient
114117
= new RecordingHttpClient(request -> createMockResponse(request, 200, new HttpHeaders(), ""));
115-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
118+
com.openai.core.http.HttpClient openAiClient
119+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
116120

117121
com.openai.core.http.HttpRequest openAiRequest = com.openai.core.http.HttpRequest.builder()
118122
.method(com.openai.core.http.HttpMethod.POST)
@@ -133,7 +137,8 @@ void executeThrowsUncheckedIOExceptionOnBodyBufferingFailure() {
133137
void executeThrowsExceptionOnMalformedUrl() {
134138
RecordingHttpClient recordingClient
135139
= new RecordingHttpClient(request -> createMockResponse(request, 200, new HttpHeaders(), ""));
136-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
140+
com.openai.core.http.HttpClient openAiClient
141+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
137142

138143
com.openai.core.http.HttpRequest openAiRequest = com.openai.core.http.HttpRequest.builder()
139144
.method(com.openai.core.http.HttpMethod.GET)
@@ -150,7 +155,8 @@ void executeThrowsExceptionOnMalformedUrl() {
150155
void executeAsyncPropagatesRequestBuildingErrors() {
151156
RecordingHttpClient recordingClient
152157
= new RecordingHttpClient(request -> createMockResponse(request, 200, new HttpHeaders(), ""));
153-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
158+
com.openai.core.http.HttpClient openAiClient
159+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(recordingClient).build());
154160

155161
com.openai.core.http.HttpRequest openAiRequest = com.openai.core.http.HttpRequest.builder()
156162
.method(com.openai.core.http.HttpMethod.POST)
@@ -170,7 +176,8 @@ void executeAsyncPropagatesRequestBuildingErrors() {
170176
@Test
171177
void executeAsyncPropagatesHttpClientFailures() {
172178
FailingHttpClient failingClient = new FailingHttpClient(new RuntimeException("Network error"));
173-
com.openai.core.http.HttpClient openAiClient = HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(failingClient).build());
179+
com.openai.core.http.HttpClient openAiClient
180+
= HttpClientHelper.mapToOpenAIHttpClient(new HttpPipelineBuilder().httpClient(failingClient).build());
174181

175182
com.openai.core.http.HttpRequest openAiRequest = com.openai.core.http.HttpRequest.builder()
176183
.method(com.openai.core.http.HttpMethod.GET)

0 commit comments

Comments
 (0)