Align all components

apache · Dec 5, 2024 · 1d3bfa4 · 1d3bfa4
1 parent 78c48f2
commit 1d3bfa4
Show file tree

Hide file tree

Showing 413 changed files with 1,445 additions and 1,655 deletions.
diff --git a/components/camel-ai/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml
@@ -57,12 +57,6 @@
 
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-chatscript</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-chatscript</artifactId>

diff --git a/...l-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java b/...l-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java
@@ -24,8 +24,8 @@
 import org.apache.camel.component.chatscript.ChatScriptMessage;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.model.language.SimpleExpression;
+import org.apache.camel.test.infra.chatscript.services.ChatScriptService;
 import org.apache.camel.test.infra.chatscript.services.ChatScriptServiceFactory;
-import org.apache.camel.test.infra.chatscript.services.ChatScriptTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -37,7 +37,7 @@ public class ChatScriptComponentIT extends CamelTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(ChatScriptComponentIT.class);
 
     @RegisterExtension
-    public static ChatScriptTestService service = ChatScriptServiceFactory.createService();
+    public static ChatScriptService service = ChatScriptServiceFactory.createService();
 
     @Test
     public void testChatScript() throws Exception {

diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml b/components/camel-ai/camel-langchain4j-chat/pom.xml
@@ -66,25 +66,13 @@
             <version>${langchain4j-version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-ollama</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-ollama</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>dev.langchain4j</groupId>
-            <artifactId>langchain4j-open-ai</artifactId>
-            <version>${langchain4j-version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
@@ -103,25 +103,13 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-qdrant</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-qdrant</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-milvus</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-milvus</artifactId>

diff --git a/components/camel-ai/camel-milvus/pom.xml b/components/camel-ai/camel-milvus/pom.xml
@@ -124,12 +124,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-milvus</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-milvus</artifactId>

diff --git a/components/camel-ai/camel-qdrant/pom.xml b/components/camel-ai/camel-qdrant/pom.xml
@@ -134,12 +134,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-qdrant</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-qdrant</artifactId>

diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml
@@ -104,12 +104,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-torchserve</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-torchserve</artifactId>

diff --git a/components/camel-aws/camel-aws-bedrock/pom.xml b/components/camel-aws/camel-aws-bedrock/pom.xml
@@ -87,13 +87,6 @@
             <scope>test</scope>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml
@@ -63,12 +63,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/components/camel-aws/camel-aws-config/pom.xml b/components/camel-aws/camel-aws-config/pom.xml
@@ -63,12 +63,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/...config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java b/...config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java
@@ -19,16 +19,16 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.aws.config.AWSConfigComponent;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class AWSConfigBase extends CamelTestSupport {
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createConfigService();
+    public static AWSService service = AWSServiceFactory.createConfigService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {

diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -83,12 +83,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/.../org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java b/.../org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
@@ -16,11 +16,13 @@
  */
 package org.apache.camel.component.aws.secretsmanager.integration;
 
+import java.net.URI;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.aws.secretsmanager.SecretsManagerComponent;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,12 +32,10 @@
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClientBuilder;
 
-import java.net.URI;
-
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AwsSecretsManagerBaseTest extends CamelTestSupport {
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createSecretsManagerService();
+    public static AWSService service = AWSServiceFactory.createSecretsManagerService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {

diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml
@@ -70,12 +70,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml
@@ -63,12 +63,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/...amel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java b/...amel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java
@@ -19,16 +19,16 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.aws2.cw.Cw2Component;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class Aws2CwBase extends CamelTestSupport {
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createCloudWatchService();
+    public static AWSService service = AWSServiceFactory.createCloudWatchService();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {

diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -87,12 +87,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/...el-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java b/...el-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java
@@ -19,8 +19,8 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.aws2.ddb.Ddb2Component;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,7 +30,7 @@
 public class Aws2DDBBase extends CamelTestSupport {
 
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createSingletonDynamoDBService();
+    public static AWSService service = AWSServiceFactory.createSingletonDynamoDBService();
 
     protected DynamoDbClient ddbClient;
 

diff --git a/.../test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java b/.../test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
@@ -16,29 +16,29 @@
  */
 package org.apache.camel.component.aws2.ddbstream;
 
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.health.HealthCheck;
 import org.apache.camel.health.HealthCheckHelper;
 import org.apache.camel.health.HealthCheckRegistry;
 import org.apache.camel.health.HealthCheckRepository;
 import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 public class Ddb2StreamConsumerHealthCheckIT extends CamelTestSupport {
 
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createSingletonS3Service();
+    public static AWSService service = AWSServiceFactory.createSingletonS3Service();
 
     CamelContext context;
 

diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml
@@ -63,12 +63,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/...l-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java b/...l-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java
@@ -19,8 +19,8 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.aws2.ec2.AWS2EC2Component;
 import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
+import org.apache.camel.test.infra.aws2.services.AWSService;
 import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
-import org.apache.camel.test.infra.aws2.services.AWSTestService;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -29,7 +29,7 @@
 public class Aws2EC2Base extends CamelTestSupport {
     @SuppressWarnings("unused")
     @RegisterExtension
-    public static AWSTestService service = AWSServiceFactory.createEC2Service();
+    public static AWSService service = AWSServiceFactory.createEC2Service();
 
     @Override
     protected CamelContext createCamelContext() throws Exception {

diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml
@@ -63,12 +63,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>

diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml
@@ -78,12 +78,6 @@
         </dependency>
 
         <!-- test infra -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-aws-v2</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-       </dependency>
        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-infra-aws-v2</artifactId>