Make most of Builders final

advisors/spring-ai-advisors-vector-store/src/main/java/org/springframework/ai/chat/client/advisor/vectorstore/VectorStoreChatMemoryAdvisor.java

@@ -209,7 +209,7 @@ else if (message instanceof AssistantMessage assistantMessage) {
 	/**
 	 * Builder for VectorStoreChatMemoryAdvisor.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private PromptTemplate systemPromptTemplate = DEFAULT_SYSTEM_PROMPT_TEMPLATE;
 

mcp/common/src/main/java/org/springframework/ai/mcp/AsyncMcpToolCallback.java

@@ -160,7 +160,7 @@ public static Builder builder() {
 	/**
 	 * Builder for constructing AsyncMcpToolCallback instances.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private McpAsyncClient mcpClient;
 

mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallback.java

@@ -160,7 +160,7 @@ public static Builder builder() {
 	/**
 	 * Builder for {@code SyncMcpToolCallback} instances.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private McpSyncClient mcpClient;
 

mcp/common/src/main/java/org/springframework/ai/mcp/SyncMcpToolCallbackProvider.java

@@ -179,7 +179,7 @@ public static Builder builder() {
 	/**
 	 * Builder for {@code SyncMcpToolCallbackProvider}.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private List<McpSyncClient> mcpClients = new ArrayList<>();
 

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java

@@ -307,7 +307,7 @@ public int hashCode() {
 				this.toolContext, this.httpHeaders, this.cacheOptions);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final AnthropicChatOptions options = new AnthropicChatOptions();
 

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java

@@ -1542,7 +1542,7 @@ public record PingEvent(
 	}
 	// @formatter:on
 
-	public static class Builder {
+	public static final class Builder {
 
 		private String baseUrl = DEFAULT_BASE_URL;
 

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicCacheOptions.java

@@ -112,7 +112,7 @@ public String toString() {
 				+ ", messageTypeMinContentLengths=" + this.messageTypeMinContentLengths + '}';
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final AnthropicCacheOptions options = new AnthropicCacheOptions();
 

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

@@ -255,7 +255,7 @@ public AudioTranscriptionTimestampGranularity getValue() {
 
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected AzureOpenAiAudioTranscriptionOptions options;
 

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

@@ -573,7 +573,7 @@ public int hashCode() {
 				this.temperature, this.topP);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected AzureOpenAiChatOptions options;
 

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

@@ -116,7 +116,7 @@ public com.azure.ai.openai.models.EmbeddingsOptions toAzureOptions(List<String>
 		return azureOptions;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final AzureOpenAiEmbeddingOptions options = new AzureOpenAiEmbeddingOptions();
 

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockChatOptions.java

@@ -269,7 +269,7 @@ public int hashCode() {
 				this.toolNames, this.toolContext, this.internalToolExecutionEnabled);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final BedrockChatOptions options = new BedrockChatOptions();
 

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/BedrockCohereEmbeddingOptions.java

@@ -84,7 +84,7 @@ public Integer getDimensions() {
 		return null;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private BedrockCohereEmbeddingOptions options = new BedrockCohereEmbeddingOptions();
 

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanEmbeddingOptions.java

@@ -62,7 +62,7 @@ public Integer getDimensions() {
 		return null;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private BedrockTitanEmbeddingOptions options = new BedrockTitanEmbeddingOptions();
 

models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/api/TitanEmbeddingBedrockApi.java

@@ -139,7 +139,7 @@ public static Builder builder() {
 		/**
 		 * TitanEmbeddingRequest builder.
 		 */
-		public static class Builder {
+		public static final class Builder {
 
 			private String inputText;
 			private String inputImage;

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatOptions.java

@@ -382,7 +382,7 @@ public static DeepSeekChatOptions fromOptions(DeepSeekChatOptions fromOptions) {
 				.build();
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected DeepSeekChatOptions options;
 

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java

@@ -905,7 +905,7 @@ public record ChunkChoice(// @formatter:off
 
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private String baseUrl = org.springframework.ai.deepseek.api.common.DeepSeekConstants.DEFAULT_BASE_URL;
 

models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/ElevenLabsTextToSpeechModel.java

@@ -181,7 +181,7 @@ public ElevenLabsTextToSpeechOptions getDefaultOptions() {
 		return this.defaultOptions;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private ElevenLabsApi elevenLabsApi;
 

models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/ElevenLabsTextToSpeechOptions.java

@@ -324,7 +324,7 @@ public ElevenLabsTextToSpeechOptions copy() {
 			.build();
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final ElevenLabsTextToSpeechOptions options = new ElevenLabsTextToSpeechOptions();
 

models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsApi.java

@@ -223,7 +223,7 @@ public record PronunciationDictionaryLocator(
 				@JsonProperty("version_id") String versionId) {
 		}
 
-		public static class Builder {
+		public static final class Builder {
 
 			private String text;
 
@@ -325,7 +325,7 @@ public SpeechRequest build() {
 	/**
 	 * Builder to construct {@link ElevenLabsApi} instance.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private String baseUrl = DEFAULT_BASE_URL;
 

models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsVoicesApi.java

@@ -393,7 +393,7 @@ public record VerifiedVoiceLanguage(@JsonProperty("language") String language,
 	/**
 	 * Builder to construct {@link ElevenLabsVoicesApi} instance.
 	 */
-	public static class Builder {
+	public static final class Builder {
 
 		private String baseUrl = DEFAULT_BASE_URL;
 

models/spring-ai-google-genai-embedding/src/main/java/org/springframework/ai/google/genai/GoogleGenAiEmbeddingConnectionDetails.java

@@ -101,7 +101,7 @@ public String getModelEndpointName(String modelName) {
 		return modelName;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		/**
 		 * Your project ID.

models/spring-ai-google-genai-embedding/src/main/java/org/springframework/ai/google/genai/text/GoogleGenAiTextEmbeddingOptions.java

@@ -170,7 +170,7 @@ public enum TaskType {
 
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected GoogleGenAiTextEmbeddingOptions options;
 

models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/GoogleGenAiChatOptions.java

@@ -488,7 +488,7 @@ public enum TransportType {
 
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private GoogleGenAiChatOptions options = new GoogleGenAiChatOptions();
 

models/spring-ai-google-genai/src/main/java/org/springframework/ai/google/genai/common/GoogleGenAiSafetySetting.java

@@ -156,7 +156,7 @@ public int hashCode() {
 		return result;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private HarmCategory category = HarmCategory.HARM_CATEGORY_UNSPECIFIED;
 

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatOptions.java

@@ -397,7 +397,7 @@ public MiniMaxChatOptions copy() {
 		return fromOptions(this);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected MiniMaxChatOptions options;
 

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxEmbeddingOptions.java

@@ -59,7 +59,7 @@ public Integer getDimensions() {
 		return null;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected MiniMaxEmbeddingOptions options;
 

models/spring-ai-oci-genai/src/main/java/org/springframework/ai/oci/OCIEmbeddingOptions.java

@@ -84,7 +84,7 @@ public void setTruncate(EmbedTextDetails.Truncate truncate) {
 		this.truncate = truncate;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final OCIEmbeddingOptions options = new OCIEmbeddingOptions();
 

models/spring-ai-oci-genai/src/main/java/org/springframework/ai/oci/cohere/OCICohereChatOptions.java

@@ -294,7 +294,7 @@ public boolean equals(Object o) {
 				&& Objects.equals(this.documents, that.documents) && Objects.equals(this.tools, that.tools);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected OCICohereChatOptions chatOptions;
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaApi.java

@@ -330,7 +330,7 @@ public ToolCallFunction(String name, Map<String, Object> arguments) {
 
 		}
 
-		public static class Builder {
+		public static final class Builder {
 
 			private final Role role;
 			private String content;
@@ -466,7 +466,7 @@ public Function(String description, String name, String jsonSchema) {
 			}
 		}
 
-		public static class Builder {
+		public static final class Builder {
 
 			private final String model;
 			private List<Message> messages = List.of();
@@ -750,7 +750,7 @@ public record ProgressResponse(
 			@JsonProperty("completed") Long completed
 	) { }
 
-	public static class Builder {
+	public static final class Builder {
 
 		private String baseUrl = OllamaApiConstants.DEFAULT_BASE_URL;
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaChatOptions.java

@@ -858,7 +858,7 @@ public int hashCode() {
 				this.toolContext);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final OllamaChatOptions options = new OllamaChatOptions();
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaEmbeddingOptions.java

@@ -338,7 +338,7 @@ public int hashCode() {
 		return Objects.hash(this.model, this.keepAlive, this.truncate);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final OllamaEmbeddingOptions options = new OllamaEmbeddingOptions();
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/api/OllamaOptions.java

@@ -947,7 +947,7 @@ public int hashCode() {
 	}
 
 	@Deprecated
-	public static class Builder {
+	public static final class Builder {
 
 		private final OllamaOptions options = new OllamaOptions();
 

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/management/ModelManagementOptions.java

@@ -41,7 +41,7 @@ public static Builder builder() {
 		return new Builder();
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private PullModelStrategy pullModelStrategy = PullModelStrategy.NEVER;
 

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

@@ -188,7 +188,7 @@ public String toString() {
 				+ this.speed + '}';
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		private final OpenAiAudioSpeechOptions options = new OpenAiAudioSpeechOptions();
 

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

@@ -170,7 +170,7 @@ else if (!this.responseFormat.equals(other.responseFormat)) {
 		return true;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected OpenAiAudioTranscriptionOptions options;
 

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

@@ -673,7 +673,7 @@ public String toString() {
 		return "OpenAiChatOptions: " + ModelOptionsUtils.toJsonString(this);
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected OpenAiChatOptions options;
 

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

@@ -89,7 +89,7 @@ public void setUser(String user) {
 		this.user = user;
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		protected OpenAiEmbeddingOptions options;
 

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

@@ -1957,7 +1957,7 @@ public record EmbeddingList<T>(// @formatter:off
 			@JsonProperty("usage") Usage usage) { // @formatter:on
 	}
 
-	public static class Builder {
+	public static final class Builder {
 
 		public Builder() {
 		}