Rename EventHubs and ServiceBus implementations

testcontainers · Feb 19, 2025 · c34ed90 · c34ed90
1 parent aad1ee5
commit c34ed90
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 28 deletions.
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
@@ -10,9 +10,8 @@ Currently, the module supports `Azurite`, `Azure Event Hubs`, `Azure Service Bus
 Class | Container Image
 -|-
 AzuriteContainer | [mcr.microsoft.com/azure-storage/azurite](https://github.com/microsoft/containerregistry)
-AzureEventHubsContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
-AzureServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
-AzureServiceBusContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
+EventHubsEmulatorContainer | [mcr.microsoft.com/azure-messaging/eventhubs-emulator](https://github.com/microsoft/containerregistry)
+ServiceBusEmulatorContainer | [mcr.microsoft.com/azure-messaging/servicebus-emulator](https://github.com/microsoft/containerregistry)
 CosmosDBEmulatorContainer | [mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator](https://github.com/microsoft/containerregistry)
 
 ## Usage example
@@ -84,23 +83,23 @@ Build Azure Table client:
 Start Azure Event Hubs Emulator during a test:
 
 <!--codeinclude-->
-[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:network
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:network
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:azuriteContainer
+[Starting an Azurite container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:azuriteContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:emulatorContainer
+[Starting an Azure Event Hubs Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 #### Using Azure Event Hubs clients
 
 Configure the consumer and the producer clients:
 
 <!--codeinclude-->
-[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/AzureEventHubsContainerTest.java) inside_block:createProducerAndConsumer
+[Configuring the clients](../../modules/azure/src/test/java/org/testcontainers/azure/EventHubsEmulatorContainerTest.java) inside_block:createProducerAndConsumer
 <!--/codeinclude-->
 
 ### Azure Service Bus Emulator
@@ -112,27 +111,27 @@ Configure the consumer and the producer clients:
 Start Azure Service Bus Emulator during a test:
 
 <!--codeinclude-->
-[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:network
+[Setting up a network](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:network
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:sqlContainer
+[Starting a SQL Server container as dependency](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:sqlContainer
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:emulatorContainer
+[Starting a Service Bus Emulator container](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:emulatorContainer
 <!--/codeinclude-->
 
 #### Using Azure Service Bus clients
 
 Configure the sender and the processor clients:
 
 <!--codeinclude-->
-[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:senderClient
+[Configuring the sender client](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:senderClient
 <!--/codeinclude-->
 
 <!--codeinclude-->
-[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/AzureServiceBusContainerTest.java) inside_block:processorClient
+[Configuring the processor client](../../modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java) inside_block:processorClient
 <!--/codeinclude-->
 
 ### CosmosDB

diff --git a/...ainers/azure/AzureEventHubsContainer.java → ...ers/azure/EventHubsEmulatorContainer.java b/...ainers/azure/AzureEventHubsContainer.java → ...ers/azure/EventHubsEmulatorContainer.java
@@ -16,7 +16,7 @@
  *     <li>AMQP: 5672</li>
  * </ul>
  */
-public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsContainer> {
+public class EventHubsEmulatorContainer extends GenericContainer<EventHubsEmulatorContainer> {
 
     private static final int DEFAULT_AMQP_PORT = 5672;
 
@@ -32,14 +32,14 @@ public class AzureEventHubsContainer extends GenericContainer<AzureEventHubsCont
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsContainer(final String dockerImageName) {
+    public EventHubsEmulatorContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * @param dockerImageName specified docker image name to run
      */
-    public AzureEventHubsContainer(final DockerImageName dockerImageName) {
+    public EventHubsEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         waitingFor(Wait.forLogMessage(".*Emulator Service is Successfully Up!.*", 1));
@@ -52,7 +52,7 @@ public AzureEventHubsContainer(final DockerImageName dockerImageName) {
      * @param azuriteContainer The Azurite container used by Event HUbs as a dependency
      * @return this
      */
-    public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
+    public EventHubsEmulatorContainer withAzuriteContainer(final AzuriteContainer azuriteContainer) {
         this.azuriteContainer = azuriteContainer;
         dependsOn(this.azuriteContainer);
         return this;
@@ -64,7 +64,7 @@ public AzureEventHubsContainer withAzuriteContainer(final AzuriteContainer azuri
      * @param config The file containing the broker configuration
      * @return this
      */
-    public AzureEventHubsContainer withConfig(final Transferable config) {
+    public EventHubsEmulatorContainer withConfig(final Transferable config) {
         withCopyToContainer(config, "/Eventhubs_Emulator/ConfigFiles/Config.json");
         return this;
     }
@@ -74,7 +74,7 @@ public AzureEventHubsContainer withConfig(final Transferable config) {
      *
      * @return this
      */
-    public AzureEventHubsContainer acceptLicense() {
+    public EventHubsEmulatorContainer acceptLicense() {
         withEnv("ACCEPT_EULA", "Y");
         return this;
     }

diff --git a/...iners/azure/AzureServiceBusContainer.java → ...rs/azure/ServiceBusEmulatorContainer.java b/...iners/azure/AzureServiceBusContainer.java → ...rs/azure/ServiceBusEmulatorContainer.java
@@ -14,7 +14,7 @@
  * <p>
  * Exposed port: 5672
  */
-public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusContainer> {
+public class ServiceBusEmulatorContainer extends GenericContainer<ServiceBusEmulatorContainer> {
 
     private static final String CONNECTION_STRING_FORMAT =
         "Endpoint=sb://%s:%d;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
@@ -30,14 +30,14 @@ public class AzureServiceBusContainer extends GenericContainer<AzureServiceBusCo
     /**
      * @param dockerImageName The specified docker image name to run
      */
-    public AzureServiceBusContainer(final String dockerImageName) {
+    public ServiceBusEmulatorContainer(final String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     /**
      * @param dockerImageName The specified docker image name to run
      */
-    public AzureServiceBusContainer(final DockerImageName dockerImageName) {
+    public ServiceBusEmulatorContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
@@ -50,7 +50,7 @@ public AzureServiceBusContainer(final DockerImageName dockerImageName) {
      * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency
      * @return this
      */
-    public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
+    public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer<?> msSqlServerContainer) {
         dependsOn(msSqlServerContainer);
         this.msSqlServerContainer = msSqlServerContainer;
         return this;
@@ -62,7 +62,7 @@ public AzureServiceBusContainer withMsSqlServerContainer(final MSSQLServerContai
      * @param config The configuration
      * @return this
      */
-    public AzureServiceBusContainer withConfig(final Transferable config) {
+    public ServiceBusEmulatorContainer withConfig(final Transferable config) {
         withCopyToContainer(config, "/ServiceBus_Emulator/ConfigFiles/Config.json");
         return this;
     }
@@ -72,7 +72,7 @@ public AzureServiceBusContainer withConfig(final Transferable config) {
      *
      * @return this
      */
-    public AzureServiceBusContainer acceptLicense() {
+    public ServiceBusEmulatorContainer acceptLicense() {
         withEnv("ACCEPT_EULA", "Y");
         return this;
     }

diff --git a/...rs/azure/AzureEventHubsContainerTest.java → ...azure/EventHubsEmulatorContainerTest.java b/...rs/azure/AzureEventHubsContainerTest.java → ...azure/EventHubsEmulatorContainerTest.java
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.waitAtMost;
 
-public class AzureEventHubsContainerTest {
+public class EventHubsEmulatorContainerTest {
 
     @Rule
     // network {
@@ -36,7 +36,7 @@ public class AzureEventHubsContainerTest {
 
     @Rule
     // emulatorContainer {
-    public AzureEventHubsContainer emulator = new AzureEventHubsContainer(
+    public EventHubsEmulatorContainer emulator = new EventHubsEmulatorContainer(
         "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1"
     )
         .acceptLicense()

diff --git a/...s/azure/AzureServiceBusContainerTest.java → ...zure/ServiceBusEmulatorContainerTest.java b/...s/azure/AzureServiceBusContainerTest.java → ...zure/ServiceBusEmulatorContainerTest.java
@@ -23,7 +23,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-public class AzureServiceBusContainerTest {
+public class ServiceBusEmulatorContainerTest {
 
     @Rule
     // network {
@@ -47,7 +47,7 @@ public class AzureServiceBusContainerTest {
 
     @Rule
     // emulatorContainer {
-    public AzureServiceBusContainer emulator = new AzureServiceBusContainer(
+    public ServiceBusEmulatorContainer emulator = new ServiceBusEmulatorContainer(
         "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1"
     )
         .acceptLicense()