fixup! [UPGRADE] - Maven org.testcontainers 1.17.6 -> 1.18.3

apache · Jul 20, 2023 · 035ebf0 · 035ebf0
1 parent 5c342da
commit 035ebf0
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...on/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java b/...on/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraWaitStrategy.java
@@ -52,7 +52,7 @@ public void waitUntilReady(WaitStrategyTarget waitStrategyTarget) {
         Unreliables.retryUntilTrue(Ints.checkedCast(timeout.getSeconds()), TimeUnit.SECONDS, () -> {
                 try {
                     ClusterFactory.createWithoutKeyspace(ClusterConfiguration.builder()
-                        .host(Host.from(cassandraContainer.getContainerIpAddress(), cassandraContainer.getMappedPort(9042)))
+                        .host(Host.from(cassandraContainer.getHost(), cassandraContainer.getMappedPort(9042)))
                         .username("cassandra")
                         .password("cassandra")
                         .maxRetry(1)

diff --git a/...s-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/...s-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
@@ -224,7 +224,7 @@ public Host getHost() {
     }
 
     public String getIp() {
-        return cassandraContainer.getContainerIpAddress();
+        return cassandraContainer.getHost();
     }
 
     public int getBindingPort() {

diff --git a/...ends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java b/...ends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/DockerRabbitMQ.java
@@ -109,7 +109,7 @@ private String hostName(Optional<String> hostNamePrefix) {
     }
 
     private String getHostIp() {
-        return container.getContainerIpAddress();
+        return container.getHost();
     }
 
     private Integer getPort() {

diff --git a/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java b/server/testing/src/main/java/org/apache/james/util/docker/DockerContainer.java
@@ -193,7 +193,7 @@ public String getContainerIp() {
     }
 
     public String getHostIp() {
-        return container.getContainerIpAddress();
+        return container.getHost();
     }
 
     @Override

diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java b/third-party/linshare/src/test/java/org/apache/james/linshare/Linshare.java
@@ -86,7 +86,7 @@ public int getPort() {
     }
 
     public String getIp() {
-        return linshareBackend.getContainerIpAddress();
+        return linshareBackend.getHost();
     }
 
     public String getUrl() {
@@ -182,7 +182,7 @@ public RequestSpecification fakeSmtpRequestSpecification() {
             .setAccept(ContentType.JSON)
             .setConfig(newConfig().encoderConfig(encoderConfig().defaultContentCharset(StandardCharsets.UTF_8)))
             .setPort(linshareSmtp.getMappedPort(80))
-            .setBaseUri("http://" + linshareSmtp.getContainerIpAddress())
+            .setBaseUri("http://" + linshareSmtp.getHost())
             .build();
     }
 }
diff --git a/...party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java b/...party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinExtension.java
@@ -114,7 +114,7 @@ public static class SpamAssassin {
 
         private SpamAssassin(GenericContainer<?> spamAssassinContainer) {
             this.spamAssassinContainer = spamAssassinContainer;
-            this.ip = spamAssassinContainer.getContainerIpAddress();
+            this.ip = spamAssassinContainer.getHost();
             this.bindingPort = spamAssassinContainer.getMappedPort(SPAMASSASSIN_PORT);
         }