diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc index e9cee4c02212e..642c7282f9887 100644 --- a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc +++ b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc @@ -651,7 +651,7 @@ public class KafkaAndSchemaRegistryTestResource implements QuarkusTestResourceLi registry.start(); Map properties = new HashMap<>(); properties.put("mp.messaging.connector.smallrye-kafka.apicurio.registry.url", - "http://" + registry.getContainerIpAddress() + ":" + registry.getMappedPort(8080) + "/apis/registry/v2"); + "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/apis/registry/v2"); properties.put("kafka.bootstrap.servers", kafka.getBootstrapServers()); return properties; } diff --git a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java index 3857238fff224..ef247aad563e5 100644 --- a/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java +++ b/integration-tests/kafka-avro/src/test/java/io/quarkus/it/kafka/KafkaAndSchemaRegistryTestResource.java @@ -12,11 +12,11 @@ public class KafkaAndSchemaRegistryTestResource implements QuarkusTestResourceLi private static GenericContainer registry; public static String getConfluentSchemaRegistryUrl() { - return "http://" + registry.getContainerIpAddress() + ":" + registry.getMappedPort(8080) + "/api/ccompat"; + return "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api/ccompat"; } public static String getApicurioSchemaRegistryUrl() { - return "http://" + registry.getContainerIpAddress() + ":" + registry.getMappedPort(8080) + "/api"; + return "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api"; } @Override @@ -27,9 +27,9 @@ public Map start() { registry.start(); Map properties = new HashMap<>(); properties.put("schema.url.confluent", - "http://" + registry.getContainerIpAddress() + ":" + registry.getMappedPort(8080) + "/api/ccompat"); + "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api/ccompat"); properties.put("schema.url.apicurio", - "http://" + registry.getContainerIpAddress() + ":" + registry.getMappedPort(8080) + "/api"); + "http://" + registry.getHost() + ":" + registry.getMappedPort(8080) + "/api"); return properties; } diff --git a/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaKeycloakTestResource.java b/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaKeycloakTestResource.java index 7dd3f57f3d8dd..bfac502d54c94 100644 --- a/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaKeycloakTestResource.java +++ b/integration-tests/kafka-oauth-keycloak/src/test/java/io/quarkus/it/kafka/KafkaKeycloakTestResource.java @@ -36,7 +36,7 @@ public Map start() { .withNetworkAliases("kafka") .withServerProperties(MountableFile.forClasspathResource("kafkaServer.properties")) .withBootstrapServers( - c -> String.format("JWT://%s:%s", c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT))); + c -> String.format("JWT://%s:%s", c.getHost(), c.getMappedPort(KAFKA_PORT))); this.kafka.start(); log.info(this.kafka.getLogs()); properties.put("kafka.bootstrap.servers", this.kafka.getBootstrapServers()); diff --git a/integration-tests/kafka-sasl-elytron/src/test/java/io/quarkus/it/kafka/KafkaSaslTestResource.java b/integration-tests/kafka-sasl-elytron/src/test/java/io/quarkus/it/kafka/KafkaSaslTestResource.java index 1e0bb8556a415..3e44f45793636 100644 --- a/integration-tests/kafka-sasl-elytron/src/test/java/io/quarkus/it/kafka/KafkaSaslTestResource.java +++ b/integration-tests/kafka-sasl-elytron/src/test/java/io/quarkus/it/kafka/KafkaSaslTestResource.java @@ -36,7 +36,7 @@ public Map start() { //Start kafka container kafka = new StrimziKafkaContainer() .withBootstrapServers( - c -> String.format("SASL_PLAINTEXT://%s:%s", c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT))) + c -> String.format("SASL_PLAINTEXT://%s:%s", c.getHost(), c.getMappedPort(KAFKA_PORT))) .withPort(KAFKA_PORT) .withServerProperties(MountableFile.forClasspathResource("kafkaServer.properties")) .withCopyFileToContainer(MountableFile.forClasspathResource("krb5KafkaBroker.conf"), "/etc/krb5.conf") diff --git a/integration-tests/kafka-sasl/src/test/java/io/quarkus/it/kafka/KafkaSASLTestResource.java b/integration-tests/kafka-sasl/src/test/java/io/quarkus/it/kafka/KafkaSASLTestResource.java index 688d9ca04df14..8b3ffa5464990 100644 --- a/integration-tests/kafka-sasl/src/test/java/io/quarkus/it/kafka/KafkaSASLTestResource.java +++ b/integration-tests/kafka-sasl/src/test/java/io/quarkus/it/kafka/KafkaSASLTestResource.java @@ -15,7 +15,7 @@ public class KafkaSASLTestResource implements QuarkusTestResourceLifecycleManage private final StrimziKafkaContainer kafka = new StrimziKafkaContainer() .withServerProperties(MountableFile.forClasspathResource("server.properties")) .withBootstrapServers( - container -> String.format("SASL_PLAINTEXT://%s:%s", container.getContainerIpAddress(), + container -> String.format("SASL_PLAINTEXT://%s:%s", container.getHost(), container.getMappedPort(KAFKA_PORT))); @Override diff --git a/integration-tests/kafka-ssl/src/test/java/io/quarkus/it/kafka/KafkaSSLTestResource.java b/integration-tests/kafka-ssl/src/test/java/io/quarkus/it/kafka/KafkaSSLTestResource.java index 6d546a0dea09f..ad140e14fce63 100644 --- a/integration-tests/kafka-ssl/src/test/java/io/quarkus/it/kafka/KafkaSSLTestResource.java +++ b/integration-tests/kafka-ssl/src/test/java/io/quarkus/it/kafka/KafkaSSLTestResource.java @@ -14,7 +14,7 @@ public class KafkaSSLTestResource implements QuarkusTestResourceLifecycleManager { private final StrimziKafkaContainer kafka = new StrimziKafkaContainer() - .withBootstrapServers(c -> String.format("SSL://%s:%s", c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT))) + .withBootstrapServers(c -> String.format("SSL://%s:%s", c.getHost(), c.getMappedPort(KAFKA_PORT))) .withServerProperties(MountableFile.forClasspathResource("server.properties")) .withCopyFileToContainer(MountableFile.forClasspathResource("kafka-keystore.p12"), "/opt/kafka/config/kafka-keystore.p12") diff --git a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaSSLTestResource.java b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaSSLTestResource.java index 9f5751f9e00d0..7f62dcce37865 100644 --- a/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaSSLTestResource.java +++ b/integration-tests/kafka-streams/src/test/java/io/quarkus/it/kafka/streams/KafkaSSLTestResource.java @@ -15,7 +15,7 @@ public class KafkaSSLTestResource implements QuarkusTestResourceLifecycleManager private static final StrimziKafkaContainer kafka = new StrimziKafkaContainer() .withServerProperties(MountableFile.forClasspathResource("server.properties")) - .withBootstrapServers(c -> String.format("SSL://%s:%s", c.getContainerIpAddress(), c.getMappedPort(KAFKA_PORT))) + .withBootstrapServers(c -> String.format("SSL://%s:%s", c.getHost(), c.getMappedPort(KAFKA_PORT))) .withCopyFileToContainer(MountableFile.forClasspathResource("ks-keystore.p12"), "/opt/kafka/config/kafka-keystore.p12") .withCopyFileToContainer(MountableFile.forClasspathResource("ks-truststore.p12"), diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java index 5cc05e29af393..ace4c3317afdd 100644 --- a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java +++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/FakeMailerTestResource.java @@ -22,8 +22,8 @@ public Map start() { server.start(); HashMap properties = new HashMap<>(); properties.put("quarkus.mailer.port", Integer.toString(server.getMappedPort(1025))); - properties.put("quarkus.mailer.host", server.getContainerIpAddress()); - properties.put("fake.mailer", server.getContainerIpAddress() + ":" + server.getMappedPort(1080)); + properties.put("quarkus.mailer.host", server.getHost()); + properties.put("fake.mailer", server.getHost() + ":" + server.getMappedPort(1080)); // properties.put("quarkus.mailer.port", Integer.toString(32787)); // properties.put("quarkus.mailer.host", "localhost"); // properties.put("fake.mailer", "localhost" + ":" + 32786); diff --git a/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestResourceLifecycle.java b/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestResourceLifecycle.java index d1c8d191b4973..9785f65f6005c 100644 --- a/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestResourceLifecycle.java +++ b/integration-tests/narayana-lra/src/test/java/org/acme/quickstart/lra/LRAParticipantTestResourceLifecycle.java @@ -30,7 +30,7 @@ public Map start() { Map properties = new HashMap<>(); coordinatorEndpoint = String.format("http://%s:%d/%s", - registry.getContainerIpAddress(), + registry.getHost(), registry.getFirstMappedPort(), LRAConstants.COORDINATOR_PATH_NAME); diff --git a/test-framework/infinispan-client/src/main/java/io/quarkus/test/infinispan/client/InfinispanTestResource.java b/test-framework/infinispan-client/src/main/java/io/quarkus/test/infinispan/client/InfinispanTestResource.java index 882368637a148..881d438351106 100644 --- a/test-framework/infinispan-client/src/main/java/io/quarkus/test/infinispan/client/InfinispanTestResource.java +++ b/test-framework/infinispan-client/src/main/java/io/quarkus/test/infinispan/client/InfinispanTestResource.java @@ -47,7 +47,7 @@ public Map start() { HOTROD_PORT, USER, PASSWORD); INFINISPAN.start(); - final String hosts = INFINISPAN.getContainerIpAddress() + ":" + INFINISPAN.getMappedPort(HOTROD_PORT); + final String hosts = INFINISPAN.getHost() + ":" + INFINISPAN.getMappedPort(HOTROD_PORT); return Collections.singletonMap("quarkus.infinispan-client.server-list", hosts); }