Add createSingletonService() to 32 test-infra service factories

Add singleton service support to all test-infra service factories that
previously only had createService(). Each follows the established
pattern (inner SingletonXxxService, lazy holder, factory method).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: gnodet

components/camel-spring-parent/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/test/infra/services/RabbitMQServiceFactory.java

@@ -26,4 +26,8 @@ private RabbitMQServiceFactory() {
     public static RabbitMQService createService() {
         return org.apache.camel.test.infra.rabbitmq.services.RabbitMQServiceFactory.createService();
     }
+
+    public static RabbitMQService createSingletonService() {
+        return org.apache.camel.test.infra.rabbitmq.services.RabbitMQServiceFactory.createSingletonService();
+    }
 }

test-infra/camel-test-infra-azure-storage-blob/src/main/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java

@@ -17,10 +17,45 @@
 
 package org.apache.camel.test.infra.azure.storage.blob.services;
 
+import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
 import org.apache.camel.test.infra.azure.common.services.AzureService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 
 public final class AzureStorageBlobServiceFactory {
+
+    private static class SingletonAzureStorageBlobService extends SingletonService<AzureService>
+            implements AzureService {
+        public SingletonAzureStorageBlobService(AzureService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public AzureCredentialsHolder azureCredentials() {
+            return getService().azureCredentials();
+        }
+
+        @Override
+        public String accountName() {
+            return getService().accountName();
+        }
+
+        @Override
+        public String accessKey() {
+            return getService().accessKey();
+        }
+
+        @Override
+        public String host() {
+            return getService().host();
+        }
+
+        @Override
+        public int port() {
+            return getService().port();
+        }
+    }
+
     private AzureStorageBlobServiceFactory() {
 
     }
@@ -36,6 +71,21 @@ public static AzureService createService() {
                 .build();
     }
 
+    public static AzureService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final AzureService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<AzureService> instance = builder();
+            instance.addLocalMapping(
+                    () -> new SingletonAzureStorageBlobService(new AzureStorageBlobLocalContainerService(), "azure"))
+                    .addRemoteMapping(AzureStorageBlobRemoteService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     static class AzureStorageBlobLocalContainerService extends AzureStorageBlobLocalContainerInfraService
             implements AzureService {
     }

test-infra/camel-test-infra-azure-storage-datalake/src/main/java/org/apache/camel/test/infra/azure/storage/datalake/services/AzureStorageDataLakeServiceFactory.java

@@ -17,11 +17,45 @@
 
 package org.apache.camel.test.infra.azure.storage.datalake.services;
 
+import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
 import org.apache.camel.test.infra.azure.common.services.AzureService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 
 public final class AzureStorageDataLakeServiceFactory {
 
+    private static class SingletonAzureStorageDataLakeService extends SingletonService<AzureService>
+            implements AzureService {
+        public SingletonAzureStorageDataLakeService(AzureService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public AzureCredentialsHolder azureCredentials() {
+            return getService().azureCredentials();
+        }
+
+        @Override
+        public String accountName() {
+            return getService().accountName();
+        }
+
+        @Override
+        public String accessKey() {
+            return getService().accessKey();
+        }
+
+        @Override
+        public String host() {
+            return getService().host();
+        }
+
+        @Override
+        public int port() {
+            return getService().port();
+        }
+    }
+
     private AzureStorageDataLakeServiceFactory() {
 
     }
@@ -36,6 +70,19 @@ public static AzureService createService() {
                 .build();
     }
 
+    public static AzureService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final AzureService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<AzureService> instance = builder();
+            instance.addRemoteMapping(AzureStorageDataLakeRemoteService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     static class AzureStorageDataLakeRemoteService extends AzureStorageDataLakeRemoteInfraService implements AzureService {
     }
 }

test-infra/camel-test-infra-azure-storage-queue/src/main/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java

@@ -17,10 +17,45 @@
 
 package org.apache.camel.test.infra.azure.storage.queue.services;
 
+import org.apache.camel.test.infra.azure.common.AzureCredentialsHolder;
 import org.apache.camel.test.infra.azure.common.services.AzureService;
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 
 public final class AzureStorageQueueServiceFactory {
+
+    private static class SingletonAzureStorageQueueService extends SingletonService<AzureService>
+            implements AzureService {
+        public SingletonAzureStorageQueueService(AzureService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public AzureCredentialsHolder azureCredentials() {
+            return getService().azureCredentials();
+        }
+
+        @Override
+        public String accountName() {
+            return getService().accountName();
+        }
+
+        @Override
+        public String accessKey() {
+            return getService().accessKey();
+        }
+
+        @Override
+        public String host() {
+            return getService().host();
+        }
+
+        @Override
+        public int port() {
+            return getService().port();
+        }
+    }
+
     private AzureStorageQueueServiceFactory() {
 
     }
@@ -36,6 +71,21 @@ public static AzureService createService() {
                 .build();
     }
 
+    public static AzureService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final AzureService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<AzureService> instance = builder();
+            instance.addLocalMapping(
+                    () -> new SingletonAzureStorageQueueService(new AzureStorageQueueLocalContainerService(), "azure"))
+                    .addRemoteMapping(AzureStorageQueueRemoteService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     public static class AzureStorageQueueLocalContainerService extends AzureStorageQueueLocalContainerInfraService
             implements AzureService {
     }

test-infra/camel-test-infra-cassandra/src/main/java/org/apache/camel/test/infra/cassandra/services/CassandraServiceFactory.java

@@ -17,8 +17,36 @@
 package org.apache.camel.test.infra.cassandra.services;
 
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 
 public final class CassandraServiceFactory {
+
+    private static class SingletonCassandraService extends SingletonService<CassandraService> implements CassandraService {
+        public SingletonCassandraService(CassandraService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public int getCQL3Port() {
+            return getService().getCQL3Port();
+        }
+
+        @Override
+        public String getCassandraHost() {
+            return getService().getCassandraHost();
+        }
+
+        @Override
+        public String hosts() {
+            return getService().hosts();
+        }
+
+        @Override
+        public int port() {
+            return getService().port();
+        }
+    }
+
     private CassandraServiceFactory() {
 
     }
@@ -43,6 +71,21 @@ public static CassandraService createService() {
                 .build();
     }
 
+    public static CassandraService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final CassandraService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<CassandraService> instance = builder();
+            instance.addLocalMapping(
+                    () -> new SingletonCassandraService(new CassandraLocalContainerService(), "cassandra"))
+                    .addRemoteMapping(RemoteCassandraService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     public static class RemoteCassandraService extends RemoteCassandraInfraService implements CassandraService {
     }
 }

test-infra/camel-test-infra-chatscript/src/main/java/org/apache/camel/test/infra/chatscript/services/ChatScriptServiceFactory.java

@@ -17,9 +17,22 @@
 package org.apache.camel.test.infra.chatscript.services;
 
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
 
 public final class ChatScriptServiceFactory {
 
+    private static class SingletonChatScriptService extends SingletonService<ChatScriptService>
+            implements ChatScriptService {
+        public SingletonChatScriptService(ChatScriptService service, String name) {
+            super(service, name);
+        }
+
+        @Override
+        public String serviceAddress() {
+            return getService().serviceAddress();
+        }
+    }
+
     private ChatScriptServiceFactory() {
 
     }
@@ -35,6 +48,21 @@ public static ChatScriptService createService() {
                 .build();
     }
 
+    public static ChatScriptService createSingletonService() {
+        return SingletonServiceHolder.INSTANCE;
+    }
+
+    private static class SingletonServiceHolder {
+        static final ChatScriptService INSTANCE;
+        static {
+            SimpleTestServiceBuilder<ChatScriptService> instance = builder();
+            instance.addLocalMapping(
+                    () -> new SingletonChatScriptService(new ChatScriptLocalContainerTestService(), "chatscript"))
+                    .addRemoteMapping(ChatScriptRemoteTestService::new);
+            INSTANCE = instance.build();
+        }
+    }
+
     public static class ChatScriptLocalContainerTestService extends ChatScriptLocalContainerInfraService
             implements ChatScriptService {
     }