From 5b82b02fc04b74910fc3c5cbd4690f18c80c3ff7 Mon Sep 17 00:00:00 2001
From: Roman Greshny <greshny@gmail.com>
Date: Sun, 18 Feb 2024 13:07:27 +0100
Subject: [PATCH] fix deprecation warning for PostgreSQLContainer

---
 .../testcontainers/PostgreSQLContainer.scala      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/postgres/src/main/scala/com/dimafeng/testcontainers/PostgreSQLContainer.scala b/modules/postgres/src/main/scala/com/dimafeng/testcontainers/PostgreSQLContainer.scala
index 20e469f9..da1da4b0 100644
--- a/modules/postgres/src/main/scala/com/dimafeng/testcontainers/PostgreSQLContainer.scala
+++ b/modules/postgres/src/main/scala/com/dimafeng/testcontainers/PostgreSQLContainer.scala
@@ -13,13 +13,11 @@ class PostgreSQLContainer(
   commonJdbcParams: JdbcDatabaseContainer.CommonParams = JdbcDatabaseContainer.CommonParams()
 ) extends SingleContainer[JavaPostgreSQLContainer[_]] with JdbcDatabaseContainer {
 
+  import PostgreSQLContainer._
+
   override val container: JavaPostgreSQLContainer[_] = {
-    val c: JavaPostgreSQLContainer[_] = dockerImageNameOverride match {
-      case Some(imageNameOverride) =>
-        new JavaPostgreSQLContainer(imageNameOverride)
-      case None =>
-        new JavaPostgreSQLContainer()
-    }
+    val dockerImageName = dockerImageNameOverride.getOrElse(parsedDockerImageName)
+    val c: JavaPostgreSQLContainer[_] = new JavaPostgreSQLContainer(dockerImageName)
 
     databaseName.foreach(c.withDatabaseName)
     pgUsername.foreach(c.withUsername)
@@ -53,6 +51,9 @@ object PostgreSQLContainer {
   val defaultUsername = "test"
   val defaultPassword = "test"
 
+  private[testcontainers] def parsedDockerImageName: DockerImageName =
+    DockerImageName.parse(defaultDockerImageName)
+
   def apply(
     dockerImageNameOverride: DockerImageName = null,
     databaseName: String = null,
@@ -69,7 +70,7 @@ object PostgreSQLContainer {
     )
 
   case class Def(
-    dockerImageName: DockerImageName = DockerImageName.parse(defaultDockerImageName),
+    dockerImageName: DockerImageName = parsedDockerImageName,
     databaseName: String = defaultDatabaseName,
     username: String = defaultUsername,
     password: String = defaultPassword,