azure

apache · Nov 28, 2024 · 677fa78 · 677fa78
1 parent ea8b20e
commit 677fa78
Show file tree

Hide file tree

Showing 26 changed files with 87 additions and 22 deletions.
diff --git a/...ge-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java b/...ge-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/Base.java
@@ -21,7 +21,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.azure.storage.blob.BlobConfiguration;
 import org.apache.camel.test.infra.azure.common.AzureConfigs;
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.azure.storage.blob.clients.AzureStorageBlobClientUtils;
 import org.apache.camel.test.infra.azure.storage.blob.services.AzureStorageBlobServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
@@ -36,7 +36,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class Base extends CamelTestSupport {
     @RegisterExtension
-    public static AzureService service;
+    public static AzureTestService service;
 
     protected BlobServiceClient serviceClient;
     protected String containerName;

diff --git a/...ake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java b/...ake/src/test/java/org/apache/camel/component/azure/storage/datalake/integration/Base.java
@@ -27,7 +27,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.azure.storage.datalake.DataLakeConfiguration;
 import org.apache.camel.test.infra.azure.common.AzureConfigs;
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.azure.storage.datalake.clients.AzureStorageDataLakeClientUtils;
 import org.apache.camel.test.infra.azure.storage.datalake.services.AzureStorageDataLakeServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
@@ -42,7 +42,7 @@
 public class Base extends CamelTestSupport {
 
     @RegisterExtension
-    public AzureService service = AzureStorageDataLakeServiceFactory.createService();
+    public static AzureTestService service = AzureStorageDataLakeServiceFactory.createService();
 
     protected DataLakeServiceClient serviceClient;
     protected DataLakeConfiguration configuration;

diff --git a/...est/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java b/...est/java/org/apache/camel/component/azure/storage/queue/integration/StorageQueueBase.java
@@ -21,7 +21,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.azure.storage.queue.QueueConfiguration;
 import org.apache.camel.test.infra.azure.common.AzureConfigs;
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.azure.storage.queue.clients.AzureStorageClientUtils;
 import org.apache.camel.test.infra.azure.storage.queue.services.AzureStorageQueueServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
@@ -34,7 +34,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class StorageQueueBase extends CamelTestSupport {
     @RegisterExtension
-    public static AzureService service;
+    public static AzureTestService service;
 
     protected QueueServiceClient serviceClient;
     protected String queueName;

diff --git a/test-infra/camel-test-infra-azure-common/pom.xml b/test-infra/camel-test-infra-azure-common/pom.xml
@@ -36,6 +36,16 @@
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${testcontainers-version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/...test/infra/azure/common/AzureConfigs.java → ...test/infra/azure/common/AzureConfigs.java b/...test/infra/azure/common/AzureConfigs.java → ...test/infra/azure/common/AzureConfigs.java
diff --git a/.../azure/common/AzureCredentialsHolder.java → .../azure/common/AzureCredentialsHolder.java b/.../azure/common/AzureCredentialsHolder.java → .../azure/common/AzureCredentialsHolder.java
diff --git a/...t/infra/azure/common/AzureProperties.java → ...t/infra/azure/common/AzureProperties.java b/...t/infra/azure/common/AzureProperties.java → ...t/infra/azure/common/AzureProperties.java
diff --git a/...a/azure/common/services/AzureService.java → ...a/azure/common/services/AzureService.java b/...a/azure/common/services/AzureService.java → ...a/azure/common/services/AzureService.java
@@ -18,9 +18,9 @@
 package org.apache.camel.test.infra.azure.common.services;
 
 import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
-import org.apache.camel.test.infra.common.services.TestService;
+import org.apache.camel.test.infra.common.services.InfrastructureService;
 
-public interface AzureService extends TestService {
+public interface AzureService extends InfrastructureService {
 
     /**
      * Gets the credentials for the test service

diff --git a/.../azure/common/services/AzureServices.java → .../azure/common/services/AzureServices.java b/.../azure/common/services/AzureServices.java → .../azure/common/services/AzureServices.java
diff --git a/.../common/services/AzureStorageService.java → .../common/services/AzureStorageService.java b/.../common/services/AzureStorageService.java → .../common/services/AzureStorageService.java
diff --git a/...ure/common/services/AzuriteContainer.java → ...ure/common/services/AzuriteContainer.java b/...ure/common/services/AzuriteContainer.java → ...ure/common/services/AzuriteContainer.java
diff --git a/...mon/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureTestService.java b/...mon/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureTestService.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.infra.azure.common.services;
+
+import org.apache.camel.test.infra.common.services.ContainerTestService;
+import org.apache.camel.test.infra.common.services.TestService;
+
+public interface AzureTestService extends AzureService, TestService, ContainerTestService {
+}
diff --git a/test-infra/camel-test-infra-azure-storage-blob/pom.xml b/test-infra/camel-test-infra-azure-storage-blob/pom.xml
@@ -55,6 +55,11 @@
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>

diff --git a/.../clients/AzureStorageBlobClientUtils.java → .../clients/AzureStorageBlobClientUtils.java b/.../clients/AzureStorageBlobClientUtils.java → .../clients/AzureStorageBlobClientUtils.java
diff --git a/...zureStorageBlobLocalContainerService.java → ...zureStorageBlobLocalContainerService.java b/...zureStorageBlobLocalContainerService.java → ...zureStorageBlobLocalContainerService.java
diff --git a/...rvices/AzureStorageBlobRemoteService.java → ...rvices/AzureStorageBlobRemoteService.java b/...rvices/AzureStorageBlobRemoteService.java → ...rvices/AzureStorageBlobRemoteService.java
diff --git a/...g/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java b/...g/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java
@@ -17,22 +17,29 @@
 
 package org.apache.camel.test.infra.azure.storage.blob.services;
 
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
 
 public final class AzureStorageBlobServiceFactory {
     private AzureStorageBlobServiceFactory() {
 
     }
 
-    public static SimpleTestServiceBuilder<AzureService> builder() {
+    public static SimpleTestServiceBuilder<AzureTestService> builder() {
         return new SimpleTestServiceBuilder<>("azure");
     }
 
-    public static AzureService createService() {
+    public static AzureTestService createService() {
         return builder()
-                .addLocalMapping(AzureStorageBlobLocalContainerService::new)
-                .addRemoteMapping(AzureStorageBlobRemoteService::new)
+                .addLocalMapping(AzureStorageBlobLocalContainerTestService::new)
+                .addRemoteMapping(AzureStorageBlobRemoteTestService::new)
                 .build();
     }
+
+    static class AzureStorageBlobLocalContainerTestService extends AzureStorageBlobLocalContainerService
+            implements AzureTestService {
+    }
+
+    static class AzureStorageBlobRemoteTestService extends AzureStorageBlobRemoteService implements AzureTestService {
+    }
 }
diff --git a/test-infra/camel-test-infra-azure-storage-datalake/pom.xml b/test-infra/camel-test-infra-azure-storage-datalake/pom.xml
@@ -55,6 +55,11 @@
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- azure sdk -->
         <dependency>

diff --git a/...ents/AzureStorageDataLakeClientUtils.java → ...ents/AzureStorageDataLakeClientUtils.java b/...ents/AzureStorageDataLakeClientUtils.java → ...ents/AzureStorageDataLakeClientUtils.java
diff --git a/...es/AzureStorageDataLakeRemoteService.java → ...es/AzureStorageDataLakeRemoteService.java b/...es/AzureStorageDataLakeRemoteService.java → ...es/AzureStorageDataLakeRemoteService.java
diff --git a/.../camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java b/.../camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java
@@ -17,7 +17,7 @@
 
 package org.apache.camel.test.infra.azure.storage.datalake.services;
 
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
 
 public final class AzureStorageDataLakeServiceFactory {
@@ -26,13 +26,16 @@ private AzureStorageDataLakeServiceFactory() {
 
     }
 
-    public static SimpleTestServiceBuilder<AzureService> builder() {
+    public static SimpleTestServiceBuilder<AzureTestService> builder() {
         return new SimpleTestServiceBuilder<>("azure");
     }
 
-    public static AzureService createService() {
+    public static AzureTestService createService() {
         return builder()
-                .addRemoteMapping(AzureStorageDataLakeRemoteService::new)
+                .addRemoteMapping(AzureStorageDataLakeRemoteTestService::new)
                 .build();
     }
+
+    static class AzureStorageDataLakeRemoteTestService extends AzureStorageDataLakeRemoteService implements AzureTestService {
+    }
 }
diff --git a/test-infra/camel-test-infra-azure-storage-queue/pom.xml b/test-infra/camel-test-infra-azure-storage-queue/pom.xml
@@ -55,6 +55,11 @@
             <version>${project.version}</version>
             <type>test-jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test-infra-azure-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>

diff --git a/...ueue/clients/AzureStorageClientUtils.java → ...ueue/clients/AzureStorageClientUtils.java b/...ueue/clients/AzureStorageClientUtils.java → ...ueue/clients/AzureStorageClientUtils.java
diff --git a/...ureStorageQueueLocalContainerService.java → ...ureStorageQueueLocalContainerService.java b/...ureStorageQueueLocalContainerService.java → ...ureStorageQueueLocalContainerService.java
diff --git a/...vices/AzureStorageQueueRemoteService.java → ...vices/AzureStorageQueueRemoteService.java b/...vices/AzureStorageQueueRemoteService.java → ...vices/AzureStorageQueueRemoteService.java
diff --git a/...apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java b/...apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java
@@ -17,22 +17,29 @@
 
 package org.apache.camel.test.infra.azure.storage.queue.services;
 
-import org.apache.camel.test.infra.azure.common.services.AzureService;
+import org.apache.camel.test.infra.azure.common.services.AzureTestService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
 
 public final class AzureStorageQueueServiceFactory {
     private AzureStorageQueueServiceFactory() {
 
     }
 
-    public static SimpleTestServiceBuilder<AzureService> builder() {
+    public static SimpleTestServiceBuilder<AzureTestService> builder() {
         return new SimpleTestServiceBuilder<>("azure");
     }
 
-    public static AzureService createService() {
+    public static AzureTestService createService() {
         return builder()
-                .addLocalMapping(AzureStorageQueueLocalContainerService::new)
-                .addRemoteMapping(AzureStorageQueueRemoteService::new)
+                .addLocalMapping(AzureStorageQueueLocalContainerTestService::new)
+                .addRemoteMapping(AzureStorageQueueRemoteTestService::new)
                 .build();
     }
+
+    public static class AzureStorageQueueLocalContainerTestService extends AzureStorageQueueLocalContainerService
+            implements AzureTestService {
+    }
+
+    public static class AzureStorageQueueRemoteTestService extends AzureStorageQueueRemoteService implements AzureTestService {
+    }
 }