You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2020/11/12 09:56:55 UTC
[camel-kafka-connector] branch master updated: Decouple the Azure
clients from the service to simplify using the test infra from Camel
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 90d1cc0 Decouple the Azure clients from the service to simplify using the test infra from Camel
90d1cc0 is described below
commit 90d1cc0aa3ade0c67ae467cb55c7e2fc696843af
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Nov 11 17:13:29 2020 +0100
Decouple the Azure clients from the service to simplify using the test infra from Camel
---
.../camel/kafkaconnector/azure/common/services/AzureService.java | 4 +---
.../kafkaconnector/azure/common/services/AzureStorageService.java | 2 +-
.../azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java | 5 +++--
.../storage/services/AzureStorageBlobLocalContainerService.java | 8 +-------
.../azure/storage/services/AzureStorageBlobRemoteService.java | 8 +-------
.../azure/storage/services/AzureStorageBlobServiceFactory.java | 3 +--
.../storage/queue/sink/CamelSinkAzureStorageQueueITCase.java | 5 +++--
.../storage/services/AzureStorageQueueLocalContainerService.java | 8 +-------
.../azure/storage/services/AzureStorageQueueRemoteService.java | 8 +-------
.../azure/storage/services/AzureStorageQueueServiceFactory.java | 3 +--
10 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
index 5f43f10..2baa290 100644
--- a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
+++ b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-public interface AzureService<T> extends BeforeAllCallback, AfterAllCallback {
+public interface AzureService extends BeforeAllCallback, AfterAllCallback {
/**
* Gets the credentials for the test service
@@ -31,8 +31,6 @@ public interface AzureService<T> extends BeforeAllCallback, AfterAllCallback {
AzureCredentialsHolder azureCredentials();
- T getClient();
-
/**
* Perform any initialization necessary
*/
diff --git a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
index 8005285..0d2db5e 100644
--- a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
+++ b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
@@ -20,7 +20,7 @@ package org.apache.camel.kafkaconnector.azure.common.services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AzureStorageService<T> implements AzureService<T> {
+public abstract class AzureStorageService implements AzureService {
private static final Logger LOG = LoggerFactory.getLogger(AzureStorageService.class);
private final AzuriteContainer container = new AzuriteContainer();
diff --git a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
index 6066e71..c50b6bc 100644
--- a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
+++ b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
@@ -30,6 +30,7 @@ import com.azure.storage.blob.models.BlobItem;
import org.apache.camel.kafkaconnector.CamelSinkTask;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
+import org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageBlobClientUtils;
import org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageBlobServiceFactory;
import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
@@ -47,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class CamelSinkAzureStorageBlobITCase extends AbstractKafkaTest {
@RegisterExtension
- public static AzureService<BlobServiceClient> service = AzureStorageBlobServiceFactory.createAzureService();
+ public static AzureService service = AzureStorageBlobServiceFactory.createAzureService();
private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAzureStorageBlobITCase.class);
@@ -66,7 +67,7 @@ public class CamelSinkAzureStorageBlobITCase extends AbstractKafkaTest {
@BeforeEach
public void setUpBlob() {
- client = service.getClient();
+ client = AzureStorageBlobClientUtils.getClient();
blobContainerName = "test-" + TestUtils.randomWithRange(1, 100);
blobContainerClient = client.createBlobContainer(blobContainerName);
diff --git a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobLocalContainerService.java b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobLocalContainerService.java
index 902846d..09285ab 100644
--- a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobLocalContainerService.java
+++ b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobLocalContainerService.java
@@ -17,13 +17,12 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.blob.BlobServiceClient;
import org.apache.camel.kafkaconnector.azure.common.AzureConfigs;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureServices;
import org.apache.camel.kafkaconnector.azure.common.services.AzureStorageService;
-public class AzureStorageBlobLocalContainerService extends AzureStorageService<BlobServiceClient> {
+public class AzureStorageBlobLocalContainerService extends AzureStorageService {
@Override
public void initialize() {
@@ -39,9 +38,4 @@ public class AzureStorageBlobLocalContainerService extends AzureStorageService<B
public AzureCredentialsHolder azureCredentials() {
return getContainer().azureCredentials();
}
-
- @Override
- public BlobServiceClient getClient() {
- return AzureStorageBlobClientUtils.getClient();
- }
}
diff --git a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobRemoteService.java b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobRemoteService.java
index 35a3616..aee525c 100644
--- a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobRemoteService.java
+++ b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobRemoteService.java
@@ -17,12 +17,11 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.blob.BlobServiceClient;
import org.apache.camel.kafkaconnector.azure.common.AzureConfigs;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
-public class AzureStorageBlobRemoteService implements AzureService<BlobServiceClient> {
+public class AzureStorageBlobRemoteService implements AzureService {
@Override
public void initialize() {
@@ -49,9 +48,4 @@ public class AzureStorageBlobRemoteService implements AzureService<BlobServiceCl
}
};
}
-
- @Override
- public BlobServiceClient getClient() {
- return AzureStorageBlobClientUtils.getClient();
- }
}
diff --git a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobServiceFactory.java b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobServiceFactory.java
index cd7ad0d..d55774a 100644
--- a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobServiceFactory.java
+++ b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageBlobServiceFactory.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.blob.BlobServiceClient;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ public final class AzureStorageBlobServiceFactory {
}
- public static AzureService<BlobServiceClient> createAzureService() {
+ public static AzureService createAzureService() {
String instanceType = System.getProperty("azure.instance.type");
if (instanceType == null || instanceType.equals("local-azure-container")) {
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
index 87874bc..5898fef 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/queue/sink/CamelSinkAzureStorageQueueITCase.java
@@ -28,6 +28,7 @@ import com.azure.storage.queue.models.PeekedMessageItem;
import org.apache.camel.kafkaconnector.CamelSinkTask;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
+import org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageClientUtils;
import org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageQueueServiceFactory;
import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
@@ -45,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class CamelSinkAzureStorageQueueITCase extends AbstractKafkaTest {
@RegisterExtension
- public static AzureService<QueueServiceClient> service = AzureStorageQueueServiceFactory.createAzureService();
+ public static AzureService service = AzureStorageQueueServiceFactory.createAzureService();
private static final Logger LOG = LoggerFactory.getLogger(CamelSinkAzureStorageQueueITCase.class);
@@ -62,7 +63,7 @@ public class CamelSinkAzureStorageQueueITCase extends AbstractKafkaTest {
@BeforeEach
public void setUp() {
- client = service.getClient();
+ client = AzureStorageClientUtils.getClient();
queueName = "test-queue" + TestUtils.randomWithRange(0, 100);
queueClient = client.createQueue(queueName);
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueLocalContainerService.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueLocalContainerService.java
index 60c4f3f..d5323d2 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueLocalContainerService.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueLocalContainerService.java
@@ -17,13 +17,12 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.queue.QueueServiceClient;
import org.apache.camel.kafkaconnector.azure.common.AzureConfigs;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureServices;
import org.apache.camel.kafkaconnector.azure.common.services.AzureStorageService;
-public class AzureStorageQueueLocalContainerService extends AzureStorageService<QueueServiceClient> {
+public class AzureStorageQueueLocalContainerService extends AzureStorageService {
@Override
public void initialize() {
@@ -39,9 +38,4 @@ public class AzureStorageQueueLocalContainerService extends AzureStorageService<
public AzureCredentialsHolder azureCredentials() {
return getContainer().azureCredentials();
}
-
- @Override
- public QueueServiceClient getClient() {
- return AzureStorageClientUtils.getClient();
- }
}
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueRemoteService.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueRemoteService.java
index 8f1afb5..60e79f0 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueRemoteService.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueRemoteService.java
@@ -17,12 +17,11 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.queue.QueueServiceClient;
import org.apache.camel.kafkaconnector.azure.common.AzureConfigs;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
-public class AzureStorageQueueRemoteService implements AzureService<QueueServiceClient> {
+public class AzureStorageQueueRemoteService implements AzureService {
@Override
public void initialize() {
@@ -49,9 +48,4 @@ public class AzureStorageQueueRemoteService implements AzureService<QueueService
}
};
}
-
- @Override
- public QueueServiceClient getClient() {
- return AzureStorageClientUtils.getClient();
- }
}
diff --git a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueServiceFactory.java b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueServiceFactory.java
index 86c321d..71c15d6 100644
--- a/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueServiceFactory.java
+++ b/tests/itests-azure-storage-queue/src/test/java/org/apache/camel/kafkaconnector/azure/storage/services/AzureStorageQueueServiceFactory.java
@@ -17,7 +17,6 @@
package org.apache.camel.kafkaconnector.azure.storage.services;
-import com.azure.storage.queue.QueueServiceClient;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ public final class AzureStorageQueueServiceFactory {
}
- public static AzureService<QueueServiceClient> createAzureService() {
+ public static AzureService createAzureService() {
String instanceType = System.getProperty("azure.instance.type");
if (instanceType == null || instanceType.equals("local-azure-container")) {