refactor(spring-ai-openai): fix code style

Signed-off-by: SenreySong <[email protected]>

Author: SenreySong

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java

@@ -220,7 +220,7 @@ public ChatResponse internalCall(Prompt prompt, ChatResponse previousChatRespons
 							"index", choice.index() != null ? choice.index() : 0,
 							"finishReason", getFinishReasonJson(choice.finishReason()),
 							"refusal", StringUtils.hasText(choice.message().refusal()) ? choice.message().refusal() : "",
-							"annotations", choice.message().annotations() != null? choice.message().annotations() : List.of(Map.of()));
+							"annotations", choice.message().annotations() != null ? choice.message().annotations() : List.of(Map.of()));
 					return buildGeneration(choice, metadata, request);
 				}).toList();
 				// @formatter:on
@@ -306,23 +306,22 @@ public Flux<ChatResponse> internalStream(Prompt prompt, ChatResponse previousCha
 			Flux<ChatResponse> chatResponse = completionChunks.map(this::chunkToChatCompletion)
 				.switchMap(chatCompletion -> Mono.just(chatCompletion).map(chatCompletion2 -> {
 					try {
-
 						// If an id is not provided, set to "NO_ID" (for compatible APIs).
 						String id = chatCompletion2.id() == null ? "NO_ID" : chatCompletion2.id();
 
 						List<Generation> generations = chatCompletion2.choices().stream().map(choice -> { // @formatter:off
-                             if (choice.message().role() != null) {
-                                 roleMap.putIfAbsent(id, choice.message().role().name());
-							 }
-							 Map<String, Object> metadata = Map.of(
-									 "id", id,
-									 "role", roleMap.getOrDefault(id, ""),
-									 "index", choice.index() != null ? choice.index() : 0,
-									 "finishReason", getFinishReasonJson(choice.finishReason()),
-									 "refusal", StringUtils.hasText(choice.message().refusal()) ? choice.message().refusal() : "",
-									 "annotations", choice.message().annotations() != null ? choice.message().annotations() : List.of(),
-									 "reasoningContent", choice.message().reasoningContent() != null ? choice.message().reasoningContent() : "");
-							 return buildGeneration(choice, metadata, request);
+							if (choice.message().role() != null) {
+								roleMap.putIfAbsent(id, choice.message().role().name());
+							}
+							Map<String, Object> metadata = Map.of(
+									"id", id,
+									"role", roleMap.getOrDefault(id, ""),
+									"index", choice.index() != null ? choice.index() : 0,
+									"finishReason", getFinishReasonJson(choice.finishReason()),
+									"refusal", StringUtils.hasText(choice.message().refusal()) ? choice.message().refusal() : "",
+									"annotations", choice.message().annotations() != null ? choice.message().annotations() : List.of(),
+									"reasoningContent", choice.message().reasoningContent() != null ? choice.message().reasoningContent() : "");
+							return buildGeneration(choice, metadata, request);
 						}).toList();
 						// @formatter:on
 						OpenAiApi.Usage usage = chatCompletion2.usage();
@@ -366,37 +365,37 @@ public Flux<ChatResponse> internalStream(Prompt prompt, ChatResponse previousCha
 			// @formatter:off
 			Flux<ChatResponse> flux = chatResponse.flatMap(response -> {
 				if (this.toolExecutionEligibilityPredicate.isToolExecutionRequired(prompt.getOptions(), response)) {
-				  // FIXME: bounded elastic needs to be used since
-				  // tool calling
-				  //  is currently only synchronous
+					// FIXME: bounded elastic needs to be used since tool calling
+					//  is currently only synchronous
 					return Flux.deferContextual(ctx -> {
-						  ToolExecutionResult toolExecutionResult;
-						  try {
-							  ToolCallReactiveContextHolder.setContext(ctx);
-							  toolExecutionResult = this.toolCallingManager.executeToolCalls(prompt, response);
-						  }
-						  finally {
-							  ToolCallReactiveContextHolder.clearContext();
-						  }
-						  if (toolExecutionResult.returnDirect()) {
-							  // Return tool execution result directly to the client.
-							  return Flux.just(ChatResponse.builder().from(response)
+						ToolExecutionResult toolExecutionResult;
+						try {
+							ToolCallReactiveContextHolder.setContext(ctx);
+							toolExecutionResult = this.toolCallingManager.executeToolCalls(prompt, response);
+						}
+						finally {
+							ToolCallReactiveContextHolder.clearContext();
+						}
+						if (toolExecutionResult.returnDirect()) {
+							// Return tool execution result directly to the client.
+							return Flux.just(ChatResponse.builder().from(response)
 									.generations(ToolExecutionResult.buildGenerations(toolExecutionResult))
-                                    .build());
-						  } else {
-							  // Send the tool execution result back to the model.
-							  return this.internalStream(new Prompt(toolExecutionResult.conversationHistory(), prompt.getOptions()),
-									  response);
-						  }
+									.build());
+						} else {
+							// Send the tool execution result back to the model.
+							return this.internalStream(new Prompt(toolExecutionResult.conversationHistory(), prompt.getOptions()),
+									response);
+						}
 					}).subscribeOn(Schedulers.boundedElastic());
-				} else {
-				  return Flux.just(response);
+				}
+				else {
+					return Flux.just(response);
 				}
 			})
 			.doOnError(observation::error)
 			.doFinally(s -> observation.stop())
 			.contextWrite(ctx -> ctx.put(ObservationThreadLocalAccessor.KEY, observation));
-          // @formatter:on
+			// @formatter:on
 
 			return new MessageAggregator().aggregate(flux, observationContext::setResponse);
 

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java

@@ -137,6 +137,7 @@ public class OpenAiChatOptions implements ToolCallingChatOptions {
 	 * modalities: ["audio"]
 	 * Note: that the audio modality is only available for the gpt-4o-audio-preview model
 	 * and is not supported for streaming completions.
+	 *
 	 */
 	private @JsonProperty("audio") AudioParameters outputAudio;
 

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java

@@ -263,9 +263,9 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 		}
 		Object dynamicBody = createDynamicRequestBody(chatRequest);
 		// @formatter:off
-    	return this.webClient.post()
-        	.uri(this.completionsPath)
-        	.headers(headers -> {
+		return this.webClient.post()
+			.uri(this.completionsPath)
+			.headers(headers -> {
 				headers.addAll(additionalHttpHeader);
 				addDefaultHeadersIfMissing(headers);
 			}) // @formatter:on
@@ -1123,7 +1123,7 @@ public enum OutputModality {
 	 * @param verbosity Controls the verbosity of the model's response.
 	 */
 	@JsonInclude(Include.NON_NULL)
-	public record ChatCompletionRequest( // @formatter:off
+	public record ChatCompletionRequest(// @formatter:off
 			@JsonProperty("messages") List<ChatCompletionMessage> messages,
 			@JsonProperty("model") String model,
 			@JsonProperty("store") Boolean store,
@@ -1440,7 +1440,7 @@ public String getValue() {
 	 */
 	@JsonInclude(Include.NON_NULL)
 	@JsonIgnoreProperties(ignoreUnknown = true)
-	public record ChatCompletionMessage( // @formatter:off
+	public record ChatCompletionMessage(// @formatter:off
 			@JsonProperty("content") Object rawContent,
 			@JsonProperty("role") Role role,
 			@JsonProperty("name") String name,
@@ -1450,7 +1450,8 @@ public record ChatCompletionMessage( // @formatter:off
 			@JsonProperty("refusal") String refusal,
 			@JsonProperty("audio") AudioOutput audioOutput,
 			@JsonProperty("annotations") List<Annotation> annotations,
-			@JsonProperty("reasoning_content") String reasoningContent) { // @formatter:on
+			@JsonProperty("reasoning_content") String reasoningContent
+	) { // @formatter:on
 
 		/**
 		 * Create a chat completion message with the given content and role. All other