OpenAI: refactor code to clean

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

Author: lambochen

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioSpeechAutoConfiguration.java

@@ -72,8 +72,8 @@ public OpenAiAudioSpeechModel openAiAudioSpeechModel(OpenAiConnectionProperties
 		var openAiAudioApi = OpenAiAudioApi.builder()
 			.baseUrl(resolved.baseUrl())
 			.apiKey(new SimpleApiKey(resolved.apiKey()))
-			.audioSpeechPath(speechProperties.getAudioSpeechPath())
 			.headers(resolved.headers())
+			.audioSpeechPath(speechProperties.getAudioSpeechPath())
 			.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
 			.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
 			.responseErrorHandler(responseErrorHandler)

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiAudioTranscriptionAutoConfiguration.java

@@ -72,8 +72,8 @@ public OpenAiAudioTranscriptionModel openAiAudioTranscriptionModel(OpenAiConnect
 		var openAiAudioApi = OpenAiAudioApi.builder()
 			.baseUrl(resolved.baseUrl())
 			.apiKey(new SimpleApiKey(resolved.apiKey()))
-			.audioTranscriptionPath(transcriptionProperties.getAudioTranscriptionPath())
 			.headers(resolved.headers())
+			.audioTranscriptionPath(transcriptionProperties.getAudioTranscriptionPath())
 			.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
 			.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
 			.responseErrorHandler(responseErrorHandler)

auto-configurations/models/spring-ai-autoconfigure-model-openai/src/main/java/org/springframework/ai/model/openai/autoconfigure/OpenAiModerationAutoConfiguration.java

@@ -69,9 +69,9 @@ public OpenAiModerationModel openAiModerationModel(OpenAiConnectionProperties co
 
 		var openAiModerationApi = OpenAiModerationApi.builder()
 			.baseUrl(resolved.baseUrl())
-			.moderationPath(moderationProperties.getModerationPath())
 			.apiKey(new SimpleApiKey(resolved.apiKey()))
 			.headers(resolved.headers())
+			.moderationPath(moderationProperties.getModerationPath())
 			.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
 			.responseErrorHandler(responseErrorHandler)
 			.build();

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

@@ -112,25 +112,25 @@ public OpenAiAudioApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin
 
 		// @formatter:off
 		this.restClient = restClientBuilder.clone()
-				.baseUrl(baseUrl)
-				.defaultHeaders(authHeaders)
-				.defaultStatusHandler(responseErrorHandler)
-				.defaultRequest(requestHeadersSpec -> {
-					if (!(apiKey instanceof NoopApiKey)) {
-						requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
-					}
-				})
-				.build();
+			.baseUrl(baseUrl)
+			.defaultHeaders(authHeaders)
+			.defaultStatusHandler(responseErrorHandler)
+			.defaultRequest(requestHeadersSpec -> {
+				if (!(apiKey instanceof NoopApiKey)) {
+					requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
+				}
+			})
+			.build();
 
 		this.webClient = webClientBuilder.clone()
-				.baseUrl(baseUrl)
-				.defaultHeaders(authHeaders)
-				.defaultRequest(requestHeadersSpec -> {
-					if (!(apiKey instanceof NoopApiKey)) {
-						requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
-					}
-				})
-				.build(); // @formatter:on
+			.baseUrl(baseUrl)
+			.defaultHeaders(authHeaders)
+			.defaultRequest(requestHeadersSpec -> {
+				if (!(apiKey instanceof NoopApiKey)) {
+					requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
+				}
+			})
+			.build(); // @formatter:on
 	}
 
 	public static Builder builder() {

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

@@ -25,8 +25,6 @@
 import org.springframework.ai.model.ApiKey;
 import org.springframework.ai.model.NoopApiKey;
 import org.springframework.ai.model.SimpleApiKey;
-import org.springframework.ai.moderation.Categories;
-import org.springframework.ai.moderation.CategoryScores;
 import org.springframework.ai.openai.api.common.OpenAiApiConstants;
 import org.springframework.ai.retry.RetryUtils;
 import org.springframework.http.HttpHeaders;
@@ -88,18 +86,18 @@ public OpenAiModerationApi(String baseUrl, ApiKey apiKey, MultiValueMap<String,
 
 		// @formatter:off
 		this.restClient = restClientBuilder.clone()
-				.baseUrl(baseUrl)
-				.defaultHeaders(h -> {
-					h.setContentType(MediaType.APPLICATION_JSON);
-					h.addAll(headers);
-				})
-				.defaultStatusHandler(responseErrorHandler)
-				.defaultRequest(requestHeadersSpec -> {
-					if (!(apiKey instanceof NoopApiKey)) {
-						requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
-					}
-				})
-				.build(); // @formatter:on
+			.baseUrl(baseUrl)
+			.defaultHeaders(h -> {
+				h.setContentType(MediaType.APPLICATION_JSON);
+				h.addAll(headers);
+			})
+			.defaultStatusHandler(responseErrorHandler)
+			.defaultRequest(requestHeadersSpec -> {
+				if (!(apiKey instanceof NoopApiKey)) {
+					requestHeadersSpec.header(HttpHeaders.AUTHORIZATION, "Bearer " + apiKey.getValue());
+				}
+			})
+			.build(); // @formatter:on
 	}
 
 	public ResponseEntity<OpenAiModerationResponse> createModeration(OpenAiModerationRequest openAiModerationRequest) {