This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ff86c7594c5 CAMEL-15520: replaced deprecated getContainerIpAddress
with getHost in test-infra
ff86c7594c5 is described below
commit ff86c7594c5b60076b986dad7381555586402cdf
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Thu Aug 11 13:04:12 2022 +0200
CAMEL-15520: replaced deprecated getContainerIpAddress with getHost in
test-infra
---
.../camel/test/infra/artemis/services/ArtemisContainer.java | 10 +++++-----
.../apache/camel/test/infra/aws2/services/AWSContainer.java | 4 ++--
.../test/infra/azure/common/services/AzureStorageService.java | 2 +-
.../infra/couchdb/services/CouchDbLocalContainerService.java | 2 +-
.../dispatch/router/services/DispatchRouterContainer.java | 2 +-
.../test/infra/fhir/services/FhirLocalContainerService.java | 2 +-
.../pubsub/services/GooglePubSubLocalContainerService.java | 2 +-
.../test/infra/hdfs/v2/services/ContainerLocalHDFSService.java | 6 +++---
.../camel/test/infra/kafka/services/StrimziContainer.java | 2 +-
.../apache/camel/test/infra/kafka/services/StrimziService.java | 4 ++--
.../infra/mongodb/services/MongoDBLocalContainerService.java | 4 ++--
.../infra/openldap/services/OpenldapLocalContainerService.java | 2 +-
.../test/infra/redis/services/RedisLocalContainerService.java | 2 +-
.../camel/test/infra/xmpp/services/XmppServerContainer.java | 4 ++--
.../test/infra/zookeeper/services/ZooKeeperContainer.java | 2 +-
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisContainer.java
b/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisContainer.java
index 77c95c684a3..5657f568eda 100644
---
a/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisContainer.java
+++
b/test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisContainer.java
@@ -58,7 +58,7 @@ public class ArtemisContainer extends
GenericContainer<ArtemisContainer> impleme
* @return the end point URL as a string
*/
public String amqpEndpoint() {
- return String.format("amqp://%s:%d", getContainerIpAddress(),
amqpPort());
+ return String.format("amqp://%s:%d", getHost(), amqpPort());
}
/**
@@ -76,7 +76,7 @@ public class ArtemisContainer extends
GenericContainer<ArtemisContainer> impleme
* @return the end point URL as a string
*/
public String mqttEndpoint() {
- return String.format("tcp://%s:%d", getContainerIpAddress(),
mqttPort());
+ return String.format("tcp://%s:%d", getHost(), mqttPort());
}
/**
@@ -94,7 +94,7 @@ public class ArtemisContainer extends
GenericContainer<ArtemisContainer> impleme
* @return the admin URL as a string
*/
public String adminURL() {
- return String.format("http://%s:%d";, getContainerIpAddress(),
adminPort());
+ return String.format("http://%s:%d";, getHost(), adminPort());
}
/**
@@ -112,7 +112,7 @@ public class ArtemisContainer extends
GenericContainer<ArtemisContainer> impleme
* @return the end point URL as a string
*/
public String defaultEndpoint() {
- return String.format("tcp://%s:%d", getContainerIpAddress(),
defaultAcceptorPort());
+ return String.format("tcp://%s:%d", getHost(), defaultAcceptorPort());
}
/**
@@ -130,6 +130,6 @@ public class ArtemisContainer extends
GenericContainer<ArtemisContainer> impleme
* @return the end point URL as a string
*/
public String getOpenwireEndpoint() {
- return String.format("tcp://%s:%d", getContainerIpAddress(),
openwirePort());
+ return String.format("tcp://%s:%d", getHost(), openwirePort());
}
}
diff --git
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
index 17770260542..3469895f626 100644
---
a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
+++
b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java
@@ -88,12 +88,12 @@ public class AWSContainer extends
GenericContainer<AWSContainer> {
}
protected String getAmazonHost() {
- return getContainerIpAddress() + ":" + getMappedPort(SERVICE_PORT);
+ return getHost() + ":" + getMappedPort(SERVICE_PORT);
}
public URI getServiceEndpoint() {
try {
- String address = String.format("http://%s:%d";,
getContainerIpAddress(), getMappedPort(SERVICE_PORT));
+ String address = String.format("http://%s:%d";, getHost(),
getMappedPort(SERVICE_PORT));
LOG.debug("Running on service endpoint: {}", address);
return new URI(address);
diff --git
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
index 2f23b77f526..97b8f3474d8 100644
---
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
+++
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
@@ -50,7 +50,7 @@ public abstract class AzureStorageService implements
AzureService, ContainerServ
public void registerProperties() {
System.setProperty(AzureConfigs.ACCOUNT_NAME,
container.azureCredentials().accountName());
System.setProperty(AzureConfigs.ACCOUNT_KEY,
container.azureCredentials().accountKey());
- System.setProperty(AzureConfigs.HOST,
container.getContainerIpAddress());
+ System.setProperty(AzureConfigs.HOST, container.getHost());
}
@Override
diff --git
a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerService.java
b/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerService.java
index 6e07a77b940..ffcbec9a8ca 100644
---
a/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerService.java
+++
b/test-infra/camel-test-infra-couchdb/src/test/java/org/apache/camel/test/infra/couchdb/services/CouchDbLocalContainerService.java
@@ -80,7 +80,7 @@ public class CouchDbLocalContainerService implements
CouchDbService, ContainerSe
@Override
public String host() {
- return container.getContainerIpAddress();
+ return container.getHost();
}
@Override
diff --git
a/test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java
b/test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java
index f55fc665766..80d75fcd9ba 100644
---
a/test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java
+++
b/test-infra/camel-test-infra-dispatch-router/src/test/java/org/apache/camel/test/infra/dispatch/router/services/DispatchRouterContainer.java
@@ -54,7 +54,7 @@ public class DispatchRouterContainer extends
GenericContainer<DispatchRouterCont
* @return the end point URL as a string
*/
public String getAMQPEndpoint() {
- return String.format("amqp://%s:%d", getContainerIpAddress(),
getAMQPPort());
+ return String.format("amqp://%s:%d", getHost(), getAMQPPort());
}
@Override
diff --git
a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
index 489c1bf5642..25eb26ebbaf 100644
---
a/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
+++
b/test-infra/camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalContainerService.java
@@ -85,7 +85,7 @@ public class FhirLocalContainerService implements
FhirService, ContainerService<
public String getServiceBaseURL() {
return String.format(
"http://%s:%d/hapi-fhir-jpaserver/fhir";,
- container.getContainerIpAddress(),
+ container.getHost(),
container.getMappedPort(FhirProperties.DEFAULT_SERVICE_PORT));
}
diff --git
a/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerService.java
b/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerService.java
index 4dd4273267c..5ef219508b9 100644
---
a/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerService.java
+++
b/test-infra/camel-test-infra-google-pubsub/src/test/java/org/apache/camel/test/infra/google/pubsub/services/GooglePubSubLocalContainerService.java
@@ -80,6 +80,6 @@ public class GooglePubSubLocalContainerService implements
GooglePubSubService, C
@Override
public String getServiceAddress() {
- return String.format("%s:%d", container.getContainerIpAddress(),
container.getFirstMappedPort());
+ return String.format("%s:%d", container.getHost(),
container.getFirstMappedPort());
}
}
diff --git
a/test-infra/camel-test-infra-hdfs/src/test/java/org/apache/camel/test/infra/hdfs/v2/services/ContainerLocalHDFSService.java
b/test-infra/camel-test-infra-hdfs/src/test/java/org/apache/camel/test/infra/hdfs/v2/services/ContainerLocalHDFSService.java
index 827d79ed0a2..838d52f3ecd 100644
---
a/test-infra/camel-test-infra-hdfs/src/test/java/org/apache/camel/test/infra/hdfs/v2/services/ContainerLocalHDFSService.java
+++
b/test-infra/camel-test-infra-hdfs/src/test/java/org/apache/camel/test/infra/hdfs/v2/services/ContainerLocalHDFSService.java
@@ -50,7 +50,7 @@ public class ContainerLocalHDFSService implements
HDFSService, ContainerService<
@Override
public String getHDFSHost() {
- return nameNodeContainer.getContainerIpAddress();
+ return nameNodeContainer.getHost();
}
@Override
@@ -86,11 +86,11 @@ public class ContainerLocalHDFSService implements
HDFSService, ContainerService<
}
private String getHdfsDataNodeWeb() {
- return dataNodeContainer.getContainerIpAddress() + ":" +
dataNodeContainer.getHttpPort();
+ return dataNodeContainer.getHost() + ":" +
dataNodeContainer.getHttpPort();
}
private String getNameNodeWebAddress() {
- return nameNodeContainer.getContainerIpAddress() + ":" +
nameNodeContainer.getHttpPort();
+ return nameNodeContainer.getHost() + ":" +
nameNodeContainer.getHttpPort();
}
@Override
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
index f3d13d3d804..0bf3ddcca6e 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziContainer.java
@@ -37,7 +37,7 @@ public class StrimziContainer extends
GenericContainer<StrimziContainer> {
withEnv("LOG_DIR", "/tmp/logs");
withExposedPorts(KAFKA_PORT);
- withEnv("KAFKA_ADVERTISED_LISTENERS",
String.format("PLAINTEXT://%s:9092", getContainerIpAddress()));
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
String.format("PLAINTEXT://%s:9092", getHost()));
withEnv("KAFKA_LISTENERS", "PLAINTEXT://0.0.0.0:9092");
withEnv("KAFKA_ZOOKEEPER_CONNECT", zookeeperInstanceName + ":2181");
withNetwork(network);
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
index dae2076e82d..bb2b3a65747 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
@@ -61,7 +61,7 @@ public class StrimziService implements KafkaService,
ContainerService<StrimziCon
@Override
public String getBootstrapServers() {
- return strimziContainer.getContainerIpAddress() + ":" + getKafkaPort();
+ return strimziContainer.getHost() + ":" + getKafkaPort();
}
@Override
@@ -73,7 +73,7 @@ public class StrimziService implements KafkaService,
ContainerService<StrimziCon
public void initialize() {
zookeeperContainer.start();
- String zookeeperConnect = zookeeperContainer.getContainerIpAddress() +
":" + zookeeperContainer.getZookeeperPort();
+ String zookeeperConnect = zookeeperContainer.getHost() + ":" +
zookeeperContainer.getZookeeperPort();
LOG.info("Apache Zookeeper running at address {}", zookeeperConnect);
strimziContainer.start();
diff --git
a/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java
b/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java
index cfccfec792d..53caa980b45 100644
---
a/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java
+++
b/test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/services/MongoDBLocalContainerService.java
@@ -50,13 +50,13 @@ public class MongoDBLocalContainerService implements
MongoDBService, ContainerSe
@Override
public String getReplicaSetUrl() {
- return String.format("mongodb://%s:%s",
container.getContainerIpAddress(),
+ return String.format("mongodb://%s:%s", container.getHost(),
container.getMappedPort(DEFAULT_MONGODB_PORT));
}
@Override
public String getConnectionAddress() {
- return container.getContainerIpAddress() + ":" +
container.getMappedPort(DEFAULT_MONGODB_PORT);
+ return container.getHost() + ":" +
container.getMappedPort(DEFAULT_MONGODB_PORT);
}
@Override
diff --git
a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerService.java
b/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerService.java
index dcb5eb7e577..3f9eae74ee0 100644
---
a/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerService.java
+++
b/test-infra/camel-test-infra-openldap/src/test/java/org/apache/camel/test/infra/openldap/services/OpenldapLocalContainerService.java
@@ -112,6 +112,6 @@ public class OpenldapLocalContainerService implements
OpenldapService, Container
@Override
public String getHost() {
- return container.getContainerIpAddress();
+ return container.getHost();
}
}
diff --git
a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerService.java
b/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerService.java
index a33f48a6607..41d59a39416 100644
---
a/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerService.java
+++
b/test-infra/camel-test-infra-redis/src/test/java/org/apache/camel/test/infra/redis/services/RedisLocalContainerService.java
@@ -80,7 +80,7 @@ public class RedisLocalContainerService implements
RedisService, ContainerServic
@Override
public String host() {
- return container.getContainerIpAddress();
+ return container.getHost();
}
@Override
diff --git
a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
b/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
index 8e6a9231bd9..60b6949d367 100644
---
a/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
+++
b/test-infra/camel-test-infra-xmpp/src/test/java/org/apache/camel/test/infra/xmpp/services/XmppServerContainer.java
@@ -44,7 +44,7 @@ public class XmppServerContainer extends GenericContainer {
}
public String getUrl() {
- return String.format("%s:%d", this.getContainerIpAddress(),
this.getMappedPort(XmppProperties.PORT_DEFAULT));
+ return String.format("%s:%d", this.getHost(),
this.getMappedPort(XmppProperties.PORT_DEFAULT));
}
public void stopXmppEndpoint() throws IOException {
@@ -57,7 +57,7 @@ public class XmppServerContainer extends GenericContainer {
private void get(String urlAppendix) throws IOException {
URL url = new URL(
- String.format("http://%s:%d/%s";, this.getContainerIpAddress(),
getMappedPort(PORT_REST), urlAppendix));
+ String.format("http://%s:%d/%s";, this.getHost(),
getMappedPort(PORT_REST), urlAppendix));
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.getInputStream();
diff --git
a/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
b/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
index 4d90dd323a4..81feae3a5c4 100644
---
a/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
+++
b/test-infra/camel-test-infra-zookeeper/src/test/java/org/apache/camel/test/infra/zookeeper/services/ZooKeeperContainer.java
@@ -63,6 +63,6 @@ public class ZooKeeperContainer extends GenericContainer {
}
public String getConnectionString() {
- return String.format("%s:%d", getContainerIpAddress(),
getMappedPort(CLIENT_PORT));
+ return String.format("%s:%d", getHost(), getMappedPort(CLIENT_PORT));
}
}
