Merge pull request #12 from vlingo/camel-deps

Downgrade camel to the latest version that works with Java 1.8
vlingo · Oct 4, 2024 · 164271b · 164271b
2 parents 647362f + 312d265
commit 164271b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,9 +29,9 @@
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <version.camel>3.21.4</version.camel>
+    <version.camel>3.14.10</version.camel>
     <version.junit>5.5.1</version.junit>
-    <version.testcontainers>1.17.2</version.testcontainers>
+    <version.testcontainers>1.20.2</version.testcontainers>
     <version.lombok>1.18.8</version.lombok>
     <graalvm.version>21.1.0</graalvm.version>
   </properties>
@@ -94,13 +94,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-rabbitmq</artifactId>
+      <artifactId>camel-spring-rabbitmq</artifactId>
       <version>${version.camel}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-aws-sqs</artifactId>
+      <artifactId>camel-aws2-sqs</artifactId>
       <version>${version.camel}</version>
       <scope>test</scope>
     </dependency>

diff --git a/src/test/java/io/vlingo/xoom/lattice/exchange/camel/integration/RabbitMQIntegrationTest.java b/src/test/java/io/vlingo/xoom/lattice/exchange/camel/integration/RabbitMQIntegrationTest.java
@@ -9,6 +9,7 @@
 
 import java.util.UUID;
 
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
 import org.testcontainers.containers.GenericContainer;
 
 import io.vlingo.xoom.lattice.exchange.camel.CamelTestWithDockerIntegration;
@@ -27,6 +28,8 @@ protected GenericContainer testContainer() {
 
     @Override
     protected String exchangeUri(GenericContainer rabbitMQ) {
-        return String.format("rabbitmq:%s?addresses=%s:%s,", QUEUE_NAME, rabbitMQ.getHost(), rabbitMQ.getMappedPort(5672));
+        camelRegistry().bind("rabbitConnectionFactory",
+                new CachingConnectionFactory(rabbitMQ.getHost(), rabbitMQ.getMappedPort(5672)));
+        return String.format("spring-rabbitmq:%s?connectionFactory=#rabbitConnectionFactory&autoDeclare=true", QUEUE_NAME);
     }
 }
diff --git a/src/test/java/io/vlingo/xoom/lattice/exchange/camel/integration/SQSIntegrationTest.java b/src/test/java/io/vlingo/xoom/lattice/exchange/camel/integration/SQSIntegrationTest.java
@@ -11,33 +11,45 @@
 
 import org.testcontainers.containers.localstack.LocalStackContainer;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.services.sqs.AmazonSQS;
-import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.retry.RetryPolicy;
 
 import io.vlingo.xoom.lattice.exchange.camel.CamelTestWithDockerIntegration;
 import org.testcontainers.utility.DockerImageName;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sqs.SqsClient;
 
 public class SQSIntegrationTest extends CamelTestWithDockerIntegration<LocalStackContainer> {
     private static final String QUEUE_NAME = UUID.randomUUID().toString();
 
     @Override
     @SuppressWarnings("resource")
     protected LocalStackContainer testContainer() {
-        return new LocalStackContainer(DockerImageName.parse("localstack/localstack:0.13.2"))
+        return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2"))
                 .withServices(LocalStackContainer.Service.SQS);
     }
 
     @Override
     protected String exchangeUri(LocalStackContainer localStack) {
-        AmazonSQS sqs = AmazonSQSClientBuilder
-                .standard()
-                .withCredentials(localStack.getDefaultCredentialsProvider())
-                .withEndpointConfiguration(localStack.getEndpointConfiguration(LocalStackContainer.Service.SQS))
-                .withClientConfiguration(new ClientConfiguration().withMaxErrorRetry(20))
+        SqsClient sqs = SqsClient.builder()
+                .credentialsProvider(
+                        StaticCredentialsProvider.create(
+                                AwsBasicCredentials.create(localStack.getAccessKey(), localStack.getSecretKey())
+                        )
+                )
+                .endpointOverride(localStack.getEndpointOverride(LocalStackContainer.Service.S3))
+                .overrideConfiguration(
+                        ClientOverrideConfiguration
+                                .builder()
+                                .retryPolicy(RetryPolicy.builder().numRetries(20).build())
+                                .build()
+                )
+                .region(Region.US_WEST_1)
                 .build();
 
         camelRegistry().bind("client", sqs);
-        return String.format("aws-sqs://%s?amazonSQSClient=#client&delay=5000&maxMessagesPerPoll=5&attributeNames=VlingoExchangeMessageType&messageAttributeNames=VlingoExchangeMessageType", QUEUE_NAME);
+        return String.format("aws2-sqs://%s?amazonSQSClient=#client&delay=5000&autoCreateQueue=true&maxMessagesPerPoll=5&attributeNames=VlingoExchangeMessageType&messageAttributeNames=VlingoExchangeMessageType", QUEUE_NAME);
     }
 }