diff --git a/modules/azure/build.gradle b/modules/azure/build.gradle index 681a6dc47e6..796f500410b 100644 --- a/modules/azure/build.gradle +++ b/modules/azure/build.gradle @@ -15,3 +15,7 @@ dependencies { testImplementation 'com.azure:azure-messaging-servicebus' testImplementation 'com.microsoft.sqlserver:mssql-jdbc:13.3.0.jre8-preview' } + +tasks.japicmp { + methodExcludes = ["org.testcontainers.azure.ServiceBusEmulatorContainer#withMsSqlServerContainer(org.testcontainers.containers.MSSQLServerContainer)"] +} diff --git a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java index fd055a0d39b..4557b6acb6a 100644 --- a/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java +++ b/modules/azure/src/main/java/org/testcontainers/azure/ServiceBusEmulatorContainer.java @@ -1,9 +1,9 @@ package org.testcontainers.azure; import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.images.builder.Transferable; +import org.testcontainers.mssqlserver.MSSQLServerContainer; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.LicenseAcceptance; @@ -25,7 +25,7 @@ public class ServiceBusEmulatorContainer extends GenericContainer msSqlServerContainer; + private MSSQLServerContainer msSqlServerContainer; /** * @param dockerImageName The specified docker image name to run @@ -51,7 +51,7 @@ public ServiceBusEmulatorContainer(final DockerImageName dockerImageName) { * @param msSqlServerContainer The MS SQL Server container used by Service Bus as a dependency * @return this */ - public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer msSqlServerContainer) { + public ServiceBusEmulatorContainer withMsSqlServerContainer(final MSSQLServerContainer msSqlServerContainer) { dependsOn(msSqlServerContainer); this.msSqlServerContainer = msSqlServerContainer; return this; diff --git a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java index 6bf6ac80fae..83cd633c5a9 100644 --- a/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java +++ b/modules/azure/src/test/java/org/testcontainers/azure/ServiceBusEmulatorContainerTest.java @@ -10,8 +10,8 @@ import com.github.dockerjava.api.model.Capability; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.containers.Network; +import org.testcontainers.mssqlserver.MSSQLServerContainer; import org.testcontainers.utility.MountableFile; import java.util.List; @@ -31,7 +31,7 @@ void testWithClient() { Network network = Network.newNetwork(); // } // sqlContainer { - MSSQLServerContainer mssqlServerContainer = new MSSQLServerContainer<>( + MSSQLServerContainer mssqlServerContainer = new MSSQLServerContainer( "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04" ) .acceptLicense()