From dde072520649104c77e9a8ea7ae41ac4aed47e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Barto=C5=A1?= Date: Mon, 2 Feb 2026 20:10:42 +0100 Subject: [PATCH] Do not use deprecated test containers in tests (#45942) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #45941 Signed-off-by: Martin Bartoš --- .../junit5/extension/DatabaseContainer.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java index e41408ee537..7d64a9f8843 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java @@ -26,10 +26,10 @@ import org.jboss.logmanager.Level; import org.jboss.logmanager.LogManager; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.JdbcDatabaseContainer; -import org.testcontainers.containers.MSSQLServerContainer; -import org.testcontainers.containers.MariaDBContainer; -import org.testcontainers.containers.MySQLContainer; -import org.testcontainers.containers.PostgreSQLContainer; +import org.testcontainers.mariadb.MariaDBContainer; +import org.testcontainers.mssqlserver.MSSQLServerContainer; +import org.testcontainers.mysql.MySQLContainer; +import org.testcontainers.postgresql.PostgreSQLContainer; import org.testcontainers.tidb.TiDBContainer; import org.testcontainers.utility.DockerImageName; @@ -60,19 +60,19 @@ public class DatabaseContainer { } private String getJdbcUrl() { - return ((JdbcDatabaseContainer)container).getJdbcUrl(); + return ((JdbcDatabaseContainer)container).getJdbcUrl(); } String getUsername() { if (container instanceof MSSQLServerContainer) { - return ((JdbcDatabaseContainer) container).getUsername(); + return ((JdbcDatabaseContainer) container).getUsername(); } return "keycloak"; } String getPassword() { if (container instanceof MSSQLServerContainer) { - return ((JdbcDatabaseContainer) container).getPassword(); + return ((JdbcDatabaseContainer) container).getPassword(); } return DEFAULT_PASSWORD; } @@ -82,7 +82,7 @@ public class DatabaseContainer { container = null; } - private JdbcDatabaseContainer configureJdbcContainer(JdbcDatabaseContainer jdbcDatabaseContainer) { + private JdbcDatabaseContainer configureJdbcContainer(JdbcDatabaseContainer jdbcDatabaseContainer) { if (jdbcDatabaseContainer instanceof MSSQLServerContainer) { return jdbcDatabaseContainer; } @@ -104,13 +104,13 @@ public class DatabaseContainer { switch (alias) { case "postgres": DockerImageName POSTGRES = DockerImageName.parse(POSTGRES_IMAGE).asCompatibleSubstituteFor("postgres"); - return configureJdbcContainer(new PostgreSQLContainer<>(POSTGRES)); + return configureJdbcContainer(new PostgreSQLContainer(POSTGRES)); case "mariadb": DockerImageName MARIADB = DockerImageName.parse(MARIADB_IMAGE).asCompatibleSubstituteFor("mariadb"); - return configureJdbcContainer(new MariaDBContainer<>(MARIADB)); + return configureJdbcContainer(new MariaDBContainer(MARIADB)); case "mysql": DockerImageName MYSQL = DockerImageName.parse(MYSQL_IMAGE).asCompatibleSubstituteFor("mysql"); - return configureJdbcContainer(new MySQLContainer<>(MYSQL)); + return configureJdbcContainer(new MySQLContainer(MYSQL)); case "mssql": DockerImageName MSSQL = DockerImageName.parse(MSSQL_IMAGE).asCompatibleSubstituteFor("sqlserver"); return configureJdbcContainer(new MSSQLServerContainer(MSSQL) {