Fix compilation error in camel-aws-s3

Author: cunningt

components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentConfiguration.java

@@ -22,6 +22,7 @@
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import software.amazon.awssdk.core.Protocol;
+import software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient;
 import software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeClient;
 
 /**
@@ -113,12 +114,36 @@ public class BedrockAgentRuntimeComponentConfiguration
      * etc.
      */
     private Boolean autowiredEnabled = true;
+    /**
+     * To use an existing configured AWS Bedrock Agent Runtime async client
+     * (required for invokeFlow which streams events back). The option is a
+     * software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient type.
+     */
+    private BedrockAgentRuntimeAsyncClient bedrockAgentRuntimeAsyncClient;
     /**
      * To use an existing configured AWS Bedrock Agent Runtime client. The
      * option is a
      * software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeClient type.
      */
     private BedrockAgentRuntimeClient bedrockAgentRuntimeClient;
+    /**
+     * Enables tracing for the invokeFlow operation. When enabled, the producer
+     * collects FlowTraceEvent entries and publishes them in the
+     * CamelAwsBedrockAgentRuntimeFlowTraces header.
+     */
+    private Boolean enableTrace = false;
+    /**
+     * The unique identifier of the Bedrock flow alias to invoke (used by the
+     * invokeFlow operation). Can be overridden per exchange via the
+     * CamelAwsBedrockAgentRuntimeFlowAliasIdentifier header.
+     */
+    private String flowAliasIdentifier;
+    /**
+     * The unique identifier of the Bedrock flow to invoke (used by the
+     * invokeFlow operation). Can be overridden per exchange via the
+     * CamelAwsBedrockAgentRuntimeFlowIdentifier header.
+     */
+    private String flowIdentifier;
     /**
      * Used for enabling or disabling all consumer based health checks from this
      * component
@@ -275,6 +300,15 @@ public void setAutowiredEnabled(Boolean autowiredEnabled) {
         this.autowiredEnabled = autowiredEnabled;
     }
 
+    public BedrockAgentRuntimeAsyncClient getBedrockAgentRuntimeAsyncClient() {
+        return bedrockAgentRuntimeAsyncClient;
+    }
+
+    public void setBedrockAgentRuntimeAsyncClient(
+            BedrockAgentRuntimeAsyncClient bedrockAgentRuntimeAsyncClient) {
+        this.bedrockAgentRuntimeAsyncClient = bedrockAgentRuntimeAsyncClient;
+    }
+
     public BedrockAgentRuntimeClient getBedrockAgentRuntimeClient() {
         return bedrockAgentRuntimeClient;
     }
@@ -284,6 +318,30 @@ public void setBedrockAgentRuntimeClient(
         this.bedrockAgentRuntimeClient = bedrockAgentRuntimeClient;
     }
 
+    public Boolean getEnableTrace() {
+        return enableTrace;
+    }
+
+    public void setEnableTrace(Boolean enableTrace) {
+        this.enableTrace = enableTrace;
+    }
+
+    public String getFlowAliasIdentifier() {
+        return flowAliasIdentifier;
+    }
+
+    public void setFlowAliasIdentifier(String flowAliasIdentifier) {
+        this.flowAliasIdentifier = flowAliasIdentifier;
+    }
+
+    public String getFlowIdentifier() {
+        return flowIdentifier;
+    }
+
+    public void setFlowIdentifier(String flowIdentifier) {
+        this.flowIdentifier = flowIdentifier;
+    }
+
     public Boolean getHealthCheckConsumerEnabled() {
         return healthCheckConsumerEnabled;
     }

components-starter/camel-aws-bedrock-starter/src/main/java/org/apache/camel/component/aws2/bedrock/agentruntime/springboot/BedrockAgentRuntimeComponentConverter.java

@@ -42,6 +42,7 @@ public class BedrockAgentRuntimeComponentConverter
     public Set<ConvertiblePair> getConvertibleTypes() {
         Set<ConvertiblePair> answer = new LinkedHashSet<>();
         answer.add(new ConvertiblePair(String.class, org.apache.camel.component.aws2.bedrock.agentruntime.BedrockAgentRuntimeConfiguration.class));
+        answer.add(new ConvertiblePair(String.class, software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient.class));
         answer.add(new ConvertiblePair(String.class, software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeClient.class));
         return answer;
     }
@@ -60,6 +61,7 @@ public Object convert(
         ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
         switch (targetType.getName()) {
             case "org.apache.camel.component.aws2.bedrock.agentruntime.BedrockAgentRuntimeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.bedrock.agentruntime.BedrockAgentRuntimeConfiguration.class);
+            case "software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeAsyncClient.class);
             case "software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.bedrockagentruntime.BedrockAgentRuntimeClient.class);
         }
         return null;

components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java

@@ -28,6 +28,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.webmvc.autoconfigure.WebMvcProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -94,8 +95,8 @@ public PlatformHttpEngine springBootPlatformHttpEngine(Environment env, List<Exe
     }
 
     @Bean
-    public CamelRequestHandlerMapping platformHttpEngineRequestMapping(PlatformHttpEngine engine, ObjectProvider<CamelContext> camelContextProvider) {
-        CamelContext camelContext = camelContextProvider.getObject();
+    @Lazy
+    public CamelRequestHandlerMapping platformHttpEngineRequestMapping(PlatformHttpEngine engine, CamelContext camelContext) {
         PlatformHttpComponent component = camelContext.getComponent("platform-http", PlatformHttpComponent.class);
         return new CamelRequestHandlerMapping(component, engine);
     }