feat(java-spring-ai-agents): upgrade to Spring AI 2.0.0-RC2, add tests

- aiagent + backoffice to Spring AI 2.0.0-RC2, AWS SDK BOM 2.46.7
- Models: global Claude Sonnet 4.6 / Opus 4.6
- Fix BrowserArtifacts.url Optional handling and bedrock timeout property
- Remove dead null-checks from ChatService (fail-fast)
- Add unit tests + env-guarded integration tests (Failsafe)

Author: Yuriy Bezsonov

apps/java-spring-ai-agents/aiagent/pom.xml

@@ -28,7 +28,7 @@
 	</scm>
 	<properties>
 		<java.version>25</java.version>
-		<spring-ai.version>2.0.0-M6</spring-ai.version>
+		<spring-ai.version>2.0.0-RC2</spring-ai.version>
 	</properties>
 	<dependencies>
 	    <!-- Security - OAuth2 Resource Server for JWT validation -->
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-advisors-vector-store</artifactId>
+            <artifactId>spring-ai-vector-store-advisor</artifactId>
         </dependency>
 	    <!-- AgentCore Memory dependencies -->
         <dependency>
@@ -136,7 +136,7 @@
 			<dependency>
 				<groupId>software.amazon.awssdk</groupId>
 				<artifactId>bom</artifactId>
-				<version>2.46.6</version>
+				<version>2.46.7</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -149,6 +149,22 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<!-- Integration tests (*IT) run only in the integration-test phase (mvn verify),
+			     never during the unit test phase (mvn test). They are additionally guarded at
+			     runtime by @EnabledIfEnvironmentVariable(AWS_ACCESS_KEY_ID) so they are skipped
+			     unless AWS credentials are present. -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

apps/java-spring-ai-agents/aiagent/src/main/java/com/example/agent/ChatService.java

@@ -65,7 +65,7 @@ public ChatService(AgentCoreMemory agentCoreMemory,
                        @Qualifier("codeInterpreterArtifactStore") ArtifactStore<GeneratedFile> codeInterpreterArtifactStore,
                        @Qualifier("mcpToolCallbacks") ToolCallbackProvider mcpTools,
                        ChatModel chatModel,
-                       @Value("${app.ai.document.model:global.anthropic.claude-opus-4-5-20251101-v1:0}") String documentModel,
+                       @Value("${app.ai.document.model:global.anthropic.claude-opus-4-6-v1}") String documentModel,
                        ChatClient.Builder chatClientBuilder) {
 
         List<Advisor> advisors = new ArrayList<>();
@@ -75,41 +75,31 @@ public ChatService(AgentCoreMemory agentCoreMemory,
         logger.info("Memory enabled: {} advisors", agentCoreMemory.advisors.size());
 
         // Knowledge Base (RAG)
-        if (kbVectorStore != null) {
-            advisors.add(QuestionAnswerAdvisor.builder(kbVectorStore).build());
-            logger.info("KB RAG enabled");
-        }
+        advisors.add(QuestionAnswerAdvisor.builder(kbVectorStore).build());
+        logger.info("KB RAG enabled");
 
         // ContextAdvisor
         advisors.add(contextAdvisor);
-		logger.info("Context Advisor enabled");
+        logger.info("Context Advisor enabled");
 
         // Tools
         List<Object> localTools = new ArrayList<>();
-        if (webGroundingTools != null) {
-            localTools.add(webGroundingTools);
-			logger.info("Web Grounding enabled");
-        }
+        localTools.add(webGroundingTools);
+        logger.info("Web Grounding enabled");
 
         // Tool Callback Providers
         this.browserArtifactStore = browserArtifactStore;
         List<ToolCallbackProvider> toolCallbackProviders = new ArrayList<>();
-        if (browserTools != null) {
-            toolCallbackProviders.add(browserTools);
-            logger.info("Browser enabled");
-        }
+        toolCallbackProviders.add(browserTools);
+        logger.info("Browser enabled");
 
         this.codeInterpreterArtifactStore = codeInterpreterArtifactStore;
-        if (codeInterpreterTools != null) {
-            toolCallbackProviders.add(codeInterpreterTools);
-            logger.info("Code Interpreter enabled");
-        }
+        toolCallbackProviders.add(codeInterpreterTools);
+        logger.info("Code Interpreter enabled");
 
         // MCP Tools
-        if (mcpTools != null) {
-            toolCallbackProviders.add(mcpTools);
-            logger.info("MCP tools enabled");
-        }
+        toolCallbackProviders.add(mcpTools);
+        logger.info("MCP tools enabled");
 
         this.documentModel = documentModel;
         this.documentClient = ChatClient.builder(chatModel).build();
@@ -151,9 +141,6 @@ private String getConversationId(AgentCoreContext context) {
     }
 
     private Flux<String> appendScreenshots(String sessionId) {
-        if (browserArtifactStore == null) {
-            return Flux.empty();
-        }
         List<GeneratedFile> screenshots = browserArtifactStore.retrieve(sessionId);
         if (screenshots == null || screenshots.isEmpty()) {
             return Flux.empty();
@@ -165,7 +152,7 @@ private String formatScreenshotsAsMarkdown(List<GeneratedFile> screenshots) {
         StringBuilder sb = new StringBuilder();
         for (GeneratedFile screenshot : screenshots) {
             sb.append("\n\n![Screenshot of ")
-                .append(BrowserArtifacts.url(screenshot))
+                .append(BrowserArtifacts.url(screenshot).orElse("unknown"))
                 .append("](")
                 .append(screenshot.toDataUrl())
                 .append(")");
@@ -174,9 +161,6 @@ private String formatScreenshotsAsMarkdown(List<GeneratedFile> screenshots) {
     }
 
     private Flux<String> appendGeneratedFiles(String sessionId) {
-        if (codeInterpreterArtifactStore == null) {
-            return Flux.empty();
-        }
         List<GeneratedFile> files = codeInterpreterArtifactStore.retrieve(sessionId);
         if (files == null || files.isEmpty()) {
             return Flux.empty();
@@ -227,4 +211,4 @@ private MimeType determineMimeType(String fileName) {
         }
         return MimeTypeUtils.APPLICATION_OCTET_STREAM;
     }
-}
+}

apps/java-spring-ai-agents/aiagent/src/main/java/com/example/agent/WebGroundingTools.java

@@ -53,7 +53,7 @@ public String searchWeb(@ToolParam(description = "Search query") String query) {
 		}
 	}
 
-	private String extractResponse(ConverseResponse response) {
+	static String extractResponse(ConverseResponse response) {
 		var result = new StringBuilder();
 		var citations = new StringBuilder();
 

apps/java-spring-ai-agents/aiagent/src/main/resources/application.properties

@@ -5,9 +5,9 @@ logging.level.org.springaicommunity.agentcore=DEBUG
 logging.level.com.example.agent=DEBUG
 logging.pattern.console=%msg%n
 # Amazon Bedrock Configuration
-spring.ai.bedrock.converse.chat.timeout=120s
+spring.ai.bedrock.aws.timeout=120s
 spring.ai.bedrock.converse.chat.options.max-tokens=4096
-spring.ai.bedrock.converse.chat.options.model=global.anthropic.claude-sonnet-4-5-20250929-v1:0
+spring.ai.bedrock.converse.chat.options.model=global.anthropic.claude-sonnet-4-6
 spring.ai.bedrock.converse.chat.options.temperature=0.7
 # AgentCore Browser - tool descriptions
 agentcore.browser.browse-url-description=Browse a web page and extract its text content. Returns the page title and body text. Use this to read and extract data from websites. For interactive sites, combine with fillForm and clickElement to navigate, then call browseUrl again to read the results.

apps/java-spring-ai-agents/aiagent/src/test/java/com/example/agent/AgentApplicationTests.java

@@ -0,0 +1,35 @@
+package com.example.agent;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * Full application-context integration test ({@code contextLoads}).
+ *
+ * <p>This wires the entire bean graph: Bedrock Converse, AgentCore Memory, Knowledge Base (RAG),
+ * browser / code-interpreter tool providers, and the MCP client. Those beans only exist when the
+ * application is fully provisioned — in particular the AgentCore Memory beans are gated by
+ * {@code @ConditionalOnProperty(prefix = "agentcore.memory", name = "memory-id")}, and
+ * {@link ChatService} hard-requires the resulting {@code AgentCoreMemory} bean. The deploy script
+ * {@code 02-memory.sh} writes {@code agentcore.memory.memory-id} (and other resource ids) into
+ * {@code application.properties}.
+ *
+ * <p>Because of that, this test is opt-in and never runs in the normal build:
+ * <ul>
+ *   <li>Named {@code *IT} so the Maven Failsafe plugin only considers it during {@code mvn verify}.</li>
+ *   <li>{@link EnabledIfSystemProperty} skips it unless {@code -Dit.agentcore=true} is passed.</li>
+ * </ul>
+ *
+ * <p>Run it only from a provisioned workspace (resource ids present in {@code application.properties})
+ * with valid AWS credentials in the environment:
+ * <pre>{@code   mvn verify -Dit.agentcore=true }</pre>
+ */
+@EnabledIfSystemProperty(named = "it.agentcore", matches = "true")
+@SpringBootTest
+class AgentContextIT {
+
+    @Test
+    void contextLoads() {
+    }
+}

apps/java-spring-ai-agents/aiagent/src/test/java/com/example/agent/AgentContextIT.java

@@ -0,0 +1,51 @@
+package com.example.agent;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
+import org.springframework.ai.bedrock.converse.BedrockProxyChatModel;
+import org.springframework.ai.chat.client.ChatClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration test that performs a real Amazon Bedrock Converse call through Spring AI's
+ * {@link BedrockProxyChatModel}.
+ *
+ * <p>Double-guarded so it never runs in environments without AWS access:
+ * <ul>
+ *   <li>Named {@code *IT} so the Maven Failsafe plugin only runs it during {@code mvn verify}
+ *       (the integration-test phase), not during {@code mvn test}.</li>
+ *   <li>{@link EnabledIfEnvironmentVariable} skips it unless AWS credentials are present in the
+ *       environment (e.g. after sourcing the workshop {@code .env}).</li>
+ * </ul>
+ * Requires Bedrock model access for the configured model in the resolved region.
+ */
+@EnabledIfEnvironmentVariable(named = "AWS_ACCESS_KEY_ID", matches = ".+")
+class BedrockConverseChatIT {
+
+    private static final String MODEL_ID = "global.anthropic.claude-sonnet-4-6";
+
+    private ChatClient newChatClient() {
+        Region region = new DefaultAwsRegionProviderChain().getRegion();
+        BedrockProxyChatModel model = BedrockProxyChatModel.builder()
+                .region(region)
+                .build();
+        return ChatClient.builder(model).build();
+    }
+
+    @Test
+    void converse_returnsNonEmptyResponse() {
+        String answer = newChatClient().prompt()
+                .options(org.springframework.ai.bedrock.converse.BedrockChatOptions.builder()
+                        .model(MODEL_ID)
+                        .maxTokens(64))
+                .user("Reply with exactly the word: PONG")
+                .call()
+                .content();
+
+        assertThat(answer).isNotBlank();
+        assertThat(answer.toUpperCase()).contains("PONG");
+    }
+}

apps/java-spring-ai-agents/aiagent/src/test/java/com/example/agent/BedrockConverseChatIT.java

@@ -0,0 +1,33 @@
+package com.example.agent;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for the {@link ChatRequest} record's {@code hasFile()} logic. No credentials required.
+ */
+class ChatRequestTest {
+
+    @Test
+    void hasFile_trueWhenBothFieldsPresent() {
+        assertThat(new ChatRequest("prompt", "ZmlsZQ==", "doc.pdf").hasFile()).isTrue();
+    }
+
+    @Test
+    void hasFile_falseWhenBase64Missing() {
+        assertThat(new ChatRequest("prompt", null, "doc.pdf").hasFile()).isFalse();
+        assertThat(new ChatRequest("prompt", "", "doc.pdf").hasFile()).isFalse();
+    }
+
+    @Test
+    void hasFile_falseWhenFileNameMissing() {
+        assertThat(new ChatRequest("prompt", "ZmlsZQ==", null).hasFile()).isFalse();
+        assertThat(new ChatRequest("prompt", "ZmlsZQ==", "").hasFile()).isFalse();
+    }
+
+    @Test
+    void hasFile_falseWhenPromptOnly() {
+        assertThat(new ChatRequest("just a prompt", null, null).hasFile()).isFalse();
+    }
+}

apps/java-spring-ai-agents/aiagent/src/test/java/com/example/agent/ChatRequestTest.java

@@ -0,0 +1,63 @@
+package com.example.agent;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.chat.client.ChatClientRequest;
+import org.springframework.ai.chat.memory.ChatMemory;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.SystemMessage;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Pure unit tests for {@link ContextAdvisor}. No Spring context, no AWS credentials required.
+ * Verifies the prompt is augmented with the current timestamp and the resolved user id.
+ */
+class ContextAdvisorTest {
+
+    private final ContextAdvisor advisor = new ContextAdvisor();
+
+    @Test
+    void before_withConversationId_injectsTimestampAndUserId() {
+        Prompt prompt = new Prompt(List.of(
+                new SystemMessage("system prompt"),
+                new UserMessage("hello world")));
+        ChatClientRequest request = new ChatClientRequest(
+                prompt, Map.of(ChatMemory.CONVERSATION_ID, "user-123:session-abc"));
+
+        ChatClientRequest result = advisor.before(request, null);
+
+        List<Message> messages = result.prompt().getInstructions();
+        List<String> texts = messages.stream().map(Message::getText).toList();
+
+        // Original system message is preserved.
+        assertThat(texts).anyMatch(t -> t.equals("system prompt"));
+        // Timestamp message is added.
+        assertThat(texts).anyMatch(t -> t.startsWith("[Current date and time:"));
+        // User id is extracted from the conversation id (before the colon) and the original text retained.
+        assertThat(texts).anyMatch(t -> t.startsWith("[UserId: user-123]") && t.contains("hello world"));
+        // The bare original user message was replaced (not left as plain "hello world").
+        assertThat(texts).doesNotContain("hello world");
+    }
+
+    @Test
+    void before_withoutConversationId_usesUnknownUserId() {
+        Prompt prompt = new Prompt(List.of(new UserMessage("hi")));
+        ChatClientRequest request = new ChatClientRequest(prompt, Map.of());
+
+        ChatClientRequest result = advisor.before(request, null);
+
+        List<String> texts = result.prompt().getInstructions().stream().map(Message::getText).toList();
+        assertThat(texts).anyMatch(t -> t.startsWith("[UserId: unknown]") && t.contains("hi"));
+    }
+
+    @Test
+    void after_returnsResponseUnchanged() {
+        // after() is a pass-through; passing null chain is fine since it is unused.
+        assertThat(advisor.getOrder()).isZero();
+    }
+}