Upgrade to Spring AI 2.0.0-M7 and fix breaking API changes

pom.xml

@@ -55,7 +55,7 @@
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <spring-ai.version>2.0.0-M3</spring-ai.version>
+        <spring-ai.version>2.0.0-M7</spring-ai.version>
         <spring-framework.version>7.0.1</spring-framework.version>
         <flexmark.version>0.64.8</flexmark.version>
 

spring-ai-agent-utils/src/main/java/org/springaicommunity/agent/advisors/AutoMemoryToolsAdvisor.java

@@ -89,7 +89,9 @@ public ChatClientRequest before(ChatClientRequest chatClientRequest, AdvisorChai
 				.filter(tc -> !existingNames.contains(tc.getToolDefinition().name()))
 				.forEach(toolCallbacks::add);
 
-			toolOptionsCopy.setToolCallbacks(new ArrayList<>(toolCallbacks));
+			toolOptionsCopy = ((ToolCallingChatOptions.Builder<?>) toolOptionsCopy.mutate())
+				.toolCallbacks(new ArrayList<>(toolCallbacks))
+				.build();
 
 			return chatClientRequest.mutate().prompt(augPrompt.mutate().chatOptions(toolOptionsCopy).build()).build();
 

spring-ai-agent-utils/src/main/java/org/springaicommunity/agent/tools/task/claude/ClaudeSubagentExecutor.java

@@ -183,7 +183,7 @@ protected ChatClient.Builder doFindChatClientBuilder(ClaudeSubagentDefinition cl
 					if (MODEL_NAME_MAPPER.containsKey(modelName)) {
 						modelName = MODEL_NAME_MAPPER.get(modelName);
 					}
-					builder = builder.clone().defaultOptions(ChatOptions.builder().model(modelName).build());
+					builder = builder.clone().defaultOptions(ChatOptions.builder().model(modelName));
 				}
 				return builder;
 			}

spring-ai-agent-utils/src/test/java/org/springaicommunity/agent/advisors/AutoMemoryToolsAdvisorTest.java

@@ -35,6 +35,7 @@
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.tool.DefaultToolCallingChatOptions;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.core.io.ByteArrayResource;
 
@@ -93,8 +94,7 @@ void customOrder() {
 		@Test
 		@DisplayName("Empty memoriesRootDirectory throws")
 		void emptyDirectoryThrows() {
-			assertThatIllegalArgumentException()
-				.isThrownBy(() -> AutoMemoryToolsAdvisor.builder().build());
+			assertThatIllegalArgumentException().isThrownBy(() -> AutoMemoryToolsAdvisor.builder().build());
 		}
 
 		@Test
@@ -156,9 +156,8 @@ void injectsWithToolCallingOptions() {
 		@Test
 		@DisplayName("Preserves existing system message text")
 		void preservesExistingSystemText() {
-			Prompt prompt = new Prompt(
-				List.of(new SystemMessage("ORIGINAL"), new UserMessage("hi")),
-				new DefaultToolCallingChatOptions());
+			Prompt prompt = new Prompt(List.of(new SystemMessage("ORIGINAL"), new UserMessage("hi")),
+					new DefaultToolCallingChatOptions());
 			ChatClientRequest request = request(prompt);
 
 			ChatClientRequest result = advisor("APPENDED").before(request, advisorChain);
@@ -185,8 +184,7 @@ void noReminderByDefault() {
 
 			ChatClientRequest result = advisor("MEMORY_PROMPT").before(request, advisorChain);
 
-			assertThat(result.prompt().getSystemMessage().getText())
-				.doesNotContain("system-reminder")
+			assertThat(result.prompt().getSystemMessage().getText()).doesNotContain("system-reminder")
 				.doesNotContain("Consolidate");
 		}
 
@@ -202,8 +200,7 @@ void reminderInjectedWhenTriggerTrue() {
 			Prompt prompt = new Prompt(new UserMessage("hi"), new DefaultToolCallingChatOptions());
 			ChatClientRequest result = a.before(request(prompt), advisorChain);
 
-			assertThat(result.prompt().getSystemMessage().getText())
-				.contains("Consolidate")
+			assertThat(result.prompt().getSystemMessage().getText()).contains("Consolidate")
 				.contains("system-reminder");
 		}
 
@@ -262,13 +259,10 @@ void registersAllSixMemoryTools() {
 			ChatClientRequest result = advisor("prompt").before(request, advisorChain);
 
 			DefaultToolCallingChatOptions opts = (DefaultToolCallingChatOptions) result.prompt().getOptions();
-			List<String> names = opts.getToolCallbacks().stream()
-				.map(tc -> tc.getToolDefinition().name())
-				.toList();
+			List<String> names = opts.getToolCallbacks().stream().map(tc -> tc.getToolDefinition().name()).toList();
 
-			assertThat(names).containsExactlyInAnyOrder(
-				"MemoryView", "MemoryCreate", "MemoryStrReplace",
-				"MemoryInsert", "MemoryDelete", "MemoryRename");
+			assertThat(names).containsExactlyInAnyOrder("MemoryView", "MemoryCreate", "MemoryStrReplace",
+					"MemoryInsert", "MemoryDelete", "MemoryRename");
 		}
 
 		@Test
@@ -293,13 +287,15 @@ void skipsDuplicates() {
 				.getOptions()).getToolCallbacks();
 
 			// Second pass: pre-populate options with those same callbacks
-			DefaultToolCallingChatOptions opts = new DefaultToolCallingChatOptions();
-			opts.setToolCallbacks(memoryCallbacks);
+			ToolCallingChatOptions opts = DefaultToolCallingChatOptions.builder()
+				.toolCallbacks(memoryCallbacks)
+				.build();
+
 			ChatClientRequest requestWithDups = request(new Prompt(new UserMessage("hi"), opts));
 
 			ChatClientRequest result = a.before(requestWithDups, advisorChain);
 
-			DefaultToolCallingChatOptions resultOpts = (DefaultToolCallingChatOptions) result.prompt().getOptions();
+			ToolCallingChatOptions resultOpts = (ToolCallingChatOptions) result.prompt().getOptions();
 			List<String> names = resultOpts.getToolCallbacks()
 				.stream()
 				.map(tc -> tc.getToolDefinition().name())