feat(java-spring-ai-agents): improve HTTP client configuration and remove conditional annotations

Author: Yuriy Bezsonov

infra/scripts/deploy/java-spring-ai-agents/3-app.sh

@@ -167,21 +167,25 @@ EOF
 cat <<'EOF' > ~/environment/aiagent/src/main/java/com/example/agent/WeatherTools.java
 package com.example.agent;
 
+import java.net.http.HttpClient;
 import java.util.List;
 import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
 import org.springframework.web.client.RestClient;
 
 class WeatherTools {
 
     private static final Logger log = LoggerFactory.getLogger(WeatherTools.class);
     private static final ParameterizedTypeReference<Map<String, Object>> MAP_TYPE =
         new ParameterizedTypeReference<>() {};
-    private final RestClient restClient = RestClient.create();
+    private final RestClient restClient = RestClient.builder()
+        .requestFactory(new JdkClientHttpRequestFactory(HttpClient.newHttpClient()))
+        .build();
 
     @Tool(description = """
         Get weather forecast for a city on a specific date.
@@ -343,7 +347,6 @@ EOF
 cat <<'EOF' > ~/environment/aiagent/src/main/java/com/example/agent/InvocationController.java
 package com.example.agent;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
@@ -352,7 +355,6 @@ import reactor.core.publisher.Flux;
 
 @RestController
 @CrossOrigin(origins = "*")
-@ConditionalOnProperty(name = "app.controller.enabled", havingValue = "true", matchIfMissing = true)
 public class InvocationController {
     private final ChatService chatService;
 

infra/scripts/deploy/java-spring-ai-agents/8-agentcore.sh

@@ -35,7 +35,7 @@ sed -i '0,/<dependencies>/{/<dependencies>/a\
         <dependency>\
             <groupId>org.springaicommunity</groupId>\
             <artifactId>spring-ai-bedrock-agentcore-starter</artifactId>\
-            <version>1.0.0-RC3</version>\
+            <version>1.0.0-RC5</version>\
         </dependency>
 }' ~/environment/aiagent/pom.xml
 log_success "AgentCore dependencies added"
@@ -53,12 +53,10 @@ import java.util.Base64;
 import org.springaicommunity.agentcore.context.AgentCoreHeaders;
 import org.springaicommunity.agentcore.annotation.AgentCoreInvocation;
 import org.springaicommunity.agentcore.context.AgentCoreContext;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
 @Service
-@ConditionalOnProperty(name = "app.controller.enabled", havingValue = "false", matchIfMissing = false)
 public class InvocationService {
     private final ChatService chatService;
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -105,7 +103,6 @@ COPY --from=builder app.jar app.jar
 
 USER 1000:1000
 EXPOSE 8080
-ENV APP_CONTROLLER_ENABLED=false
 
 ENTRYPOINT ["java", "-jar", "/app.jar"]
 EOF