This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 2dddbdf Decouple the RabbitMQ client from the service to simplify
using the test infra from Camel
2dddbdf is described below
commit 2dddbdf2eeb69036538d696fbe76555e8a2f3e64
Author: Otavio Rodolfo Piske <opi...@redhat.com>
AuthorDate: Wed Nov 4 10:20:44 2020 +0100
Decouple the RabbitMQ client from the service to simplify using the test
infra from Camel
---
.../rabbitmq/services/RabbitMQLocalContainerService.java | 5 ++---
.../kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java | 6 ++----
.../camel/kafkaconnector/rabbitmq/services/RabbitMQService.java | 5 ++---
.../camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java | 2 +-
.../camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java | 2 +-
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java
index ee7a827..d922516 100644
---
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java
+++
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQLocalContainerService.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.rabbitmq.services;
-import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.RabbitMQContainer;
@@ -57,8 +56,8 @@ public class RabbitMQLocalContainerService implements
RabbitMQService {
}
@Override
- public RabbitMQClient getClient() {
- return new RabbitMQClient(container.getAmqpUrl());
+ public String getAmqpUrl() {
+ return container.getAmqpUrl();
}
@Override
diff --git
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java
index 74d2a48..b0c524c 100644
---
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java
+++
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQRemoteService.java
@@ -17,8 +17,6 @@
package org.apache.camel.kafkaconnector.rabbitmq.services;
-import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient;
-
public class RabbitMQRemoteService implements RabbitMQService {
@@ -28,8 +26,8 @@ public class RabbitMQRemoteService implements RabbitMQService
{
}
@Override
- public RabbitMQClient getClient() {
- return null;
+ public String getAmqpUrl() {
+ return System.getProperty("rabbitmq.connection.amqp");
}
@Override
diff --git
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java
index d026ba2..c093bd8 100644
---
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java
+++
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/services/RabbitMQService.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.rabbitmq.services;
-import org.apache.camel.kafkaconnector.rabbitmq.clients.RabbitMQClient;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -32,10 +31,10 @@ public interface RabbitMQService extends BeforeAllCallback,
AfterAllCallback {
ConnectionProperties connectionProperties();
/**
- * Get the appropriate client for the service
+ * Gets the connection URI
* @return
*/
- RabbitMQClient getClient();
+ String getAmqpUrl();
/**
* Perform any initialization necessary
diff --git
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java
index 80b1606..60bebba 100644
---
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java
+++
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/sink/RabbitMQSinkITCase.java
@@ -59,7 +59,7 @@ public class RabbitMQSinkITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
received = 0;
- rabbitMQClient = rabbitmqService.getClient();
+ rabbitMQClient = new RabbitMQClient(rabbitmqService.getAmqpUrl());
}
private boolean checkRecord(Delivery rabbitMQDelivery) {
diff --git
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java
index 73a75e3..cf89916 100644
---
a/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java
+++
b/tests/itests-rabbitmq/src/test/java/org/apache/camel/kafkaconnector/rabbitmq/source/RabbitMQSourceITCase.java
@@ -56,7 +56,7 @@ public class RabbitMQSourceITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
received = 0;
- rabbitMQClient = rabbitmqService.getClient();
+ rabbitMQClient = new RabbitMQClient(rabbitmqService.getAmqpUrl());
}
private <T> boolean checkRecord(ConsumerRecord<String, T> record) {
