This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
commit ee4ea65ad3839281bd251d97db822ba0531a8577 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 16:02:58 2021 +0000 fixes to work with guava 27 --- .../org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java | 2 +- .../apache/brooklyn/entity/database/derby/DerbyDatabase.java | 2 +- .../org/apache/brooklyn/entity/database/derby/DerbySchema.java | 2 +- .../apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java | 2 +- .../apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java | 2 +- .../brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java | 2 +- .../brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java | 2 +- .../apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java | 2 +- .../brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java | 3 +-- .../brooklyn/entity/messaging/rabbit/RabbitDestination.java | 2 +- .../brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java | 2 +- .../brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java | 2 +- .../brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java | 4 ++-- .../entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java | 2 +- .../entity/nosql/elasticsearch/ElasticSearchNodeImpl.java | 2 +- .../brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java | 2 +- .../brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java | 2 +- .../brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java | 4 ++-- .../apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java | 10 +++++----- .../nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java | 2 +- .../org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java | 2 +- .../brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java | 2 +- .../apache/brooklyn/entity/proxy/AbstractControllerImpl.java | 2 +- .../apache/brooklyn/entity/webapp/WebAppServiceMethods.java | 4 ++-- .../apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 2 +- .../brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java | 2 +- 26 files changed, 33 insertions(+), 34 deletions(-) diff --git a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index 3c313b3..16e8f9f 100644 --- a/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -105,7 +105,7 @@ public class SimulatedJBoss7ServerImpl extends JBoss7ServerImpl { getAttribute(MANAGEMENT_HTTP_PORT) + getConfig(PORT_INCREMENT)); String managementUri = String.format("http://%s:%s/management/subsystem/web/connector/http/read-resource";, - hp.getHostText(), hp.getPort()); + hp.getHost(), hp.getPort()); sensors().set(MANAGEMENT_URL, managementUri); if (simulateExternalMonitoring) { diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java index 7cd3bd4..0efdd7b 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbyDatabase.java @@ -42,7 +42,7 @@ import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.util.collections.MutableMap; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java index 67b2a40..c86f342 100644 --- a/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java +++ b/sandbox/database/src/main/java/org/apache/brooklyn/entity/database/derby/DerbySchema.java @@ -39,7 +39,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class DerbySchema extends AbstractEntity implements Schema { diff --git a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java index c899bdf..6567559 100644 --- a/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java +++ b/sandbox/monitoring/src/main/java/org/apache/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java @@ -353,7 +353,7 @@ public class ZabbixFeed extends AbstractFeed { if (machine instanceof SupportsPortForwarding) { Cidr management = entity.getConfig(BrooklynAccessUtils.MANAGEMENT_ACCESS_CIDR); HostAndPort forwarded = ((SupportsPortForwarding) machine).getSocketEndpointFor(management, port); - address = forwarded.getHostText(); + address = forwarded.getHost(); port = forwarded.getPort(); } diff --git a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java index 68a1d50..5369101 100644 --- a/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java +++ b/software/cm/chef/src/main/java/org/apache/brooklyn/entity/chef/KnifeConvergeTaskFactory.java @@ -82,7 +82,7 @@ public class KnifeConvergeTaskFactory<RET> extends KnifeTaskFactory<RET> { result.addAll(extraBootstrapParameters); HostAndPort hostAndPort = machine.getSshHostAndPort(); - result.add(wrapBash(hostAndPort.getHostText())); + result.add(wrapBash(hostAndPort.getHost())); Integer whichPort = knifeWhichPort(hostAndPort); if (whichPort!=null) result.add("-p "+whichPort); diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java index 828f567..d5cf5ef 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.activemq; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -31,7 +32,6 @@ import org.apache.brooklyn.feed.jmx.JmxAttributePollConfig; import org.apache.brooklyn.feed.jmx.JmxFeed; import com.google.common.base.Functions; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Predicates; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single ActiveMQ broker instance. diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java index 8804202..16697c9 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaBrokerImpl.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Functions; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Kafka broker instance. diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java index 34c26db..343e20b 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.qpid; +import com.google.common.base.MoreObjects.ToStringHelper; import static java.lang.String.format; import java.io.IOException; @@ -39,7 +40,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; import com.google.common.base.Functions; -import com.google.common.base.Objects.ToStringHelper; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Qpid broker instance, using AMQP 0-10. diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java index 5949e56..7cb9877 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitBrokerImpl.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.rabbit; +import com.google.common.base.MoreObjects.ToStringHelper; import static java.lang.String.format; import java.util.Map; @@ -27,8 +28,6 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Objects.ToStringHelper; - /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Rabbit MQ broker instance, using AMQP 0-9-1. */ diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java index 2756bf9..e253630 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitDestination.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.messaging.rabbit; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.Map; import org.slf4j.Logger; @@ -26,7 +27,6 @@ import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.entity.messaging.amqp.AmqpExchange; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java index b3ced27..b533347 100644 --- a/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java +++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/zookeeper/AbstractZooKeeperImpl.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.entity.zookeeper; +import com.google.common.base.MoreObjects.ToStringHelper; import java.util.concurrent.TimeUnit; import javax.management.ObjectName; @@ -31,7 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Functions; -import com.google.common.base.Objects.ToStringHelper; /** * An {@link org.apache.brooklyn.api.entity.Entity} that represents a single Apache ZooKeeper instance. diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java index fb93163..3800631 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraNodeImpl.java @@ -609,7 +609,7 @@ public class CassandraNodeImpl extends SoftwareProcessImpl implements CassandraN try { long start = System.currentTimeMillis(); - Socket s = new Socket(hp.getHostText(), hp.getPort()); + Socket s = new Socket(hp.getHost(), hp.getPort()); s.close(); long latency = System.currentTimeMillis() - start; return latency; diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java index 0642bf3..d869446 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java @@ -179,7 +179,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN URI apiUri = null; try { HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getAttribute(COUCHBASE_WEB_ADMIN_PORT)); - apiUri = URI.create(String.format("http://%s:%d/node/controller/rename";, accessible.getHostText(), accessible.getPort())); + apiUri = URI.create(String.format("http://%s:%d/node/controller/rename";, accessible.getHost(), accessible.getPort())); UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(getConfig(COUCHBASE_ADMIN_USERNAME), getConfig(COUCHBASE_ADMIN_PASSWORD)); HttpToolResponse response = HttpTool.httpPost( // the uri is required by the HttpClientBuilder in order to set the AuthScope of the credentials @@ -190,7 +190,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN HttpHeaders.ACCEPT, "*/*", // this appears needed; without it we get org.apache.http.NoHttpResponseException !? HttpHeaders.AUTHORIZATION, HttpTool.toBasicAuthorizationValue(credentials)), - Charsets.UTF_8.encode("hostname="+Urls.encode(accessible.getHostText())).array()); + Charsets.UTF_8.encode("hostname="+Urls.encode(accessible.getHost())).array()); log.debug("Renamed Couchbase server "+this+" via "+apiUri+": "+response); if (!HttpTool.isStatusCodeHealthy(response.getResponseCode())) { log.warn("Invalid response code, renaming {} ({}): {}", diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java index 0b42c76..a0e6218 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseSyncGatewayImpl.java @@ -49,7 +49,7 @@ public class CouchbaseSyncGatewayImpl extends SoftwareProcessImpl implements Cou getAttribute(CouchbaseSyncGateway.ADMIN_REST_API_PORT)); String managementUri = String.format("http://%s:%s";, - hp.getHostText(), hp.getPort()); + hp.getHost(), hp.getPort()); sensors().set(MANAGEMENT_URL, managementUri); diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java index 6bc89df..7352638 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java @@ -90,7 +90,7 @@ public class ElasticSearchNodeImpl extends SoftwareProcessImpl implements Elasti httpFeed = HttpFeed.builder() .entity(this) .period(1000) - .baseUri(String.format("http://%s:%s/_nodes/_local/stats";, hp.getHostText(), hp.getPort())) + .baseUri(String.format("http://%s:%s/_nodes/_local/stats";, hp.getHost(), hp.getPort())) .poll(new HttpPollConfig<Boolean>(SERVICE_UP) .onSuccess(HttpValueFunctions.responseCodeEquals(200)) .onFailureOrException(Functions.constant(false))) diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java index 6d13b74..b4ee4ae 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java @@ -55,7 +55,7 @@ public class HazelcastNodeImpl extends SoftwareProcessImpl implements HazelcastN HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getNodePort()); - String nodeUri = String.format("http://%s:%d/hazelcast/rest/cluster";, hp.getHostText(), hp.getPort()); + String nodeUri = String.format("http://%s:%d/hazelcast/rest/cluster";, hp.getHost(), hp.getPort()); sensors().set(Attributes.MAIN_URI, URI.create(nodeUri)); if (LOG.isDebugEnabled()) { diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java index c0ec6e7..57a0c8f 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBClientSupport.java @@ -106,7 +106,7 @@ public class MongoDBClientSupport { */ public static MongoDBClientSupport forServer(AbstractMongoDBServer standalone) throws UnknownHostException { HostAndPort hostAndPort = BrooklynAccessUtils.getBrooklynAccessibleAddress(standalone, standalone.getAttribute(MongoDBServer.PORT)); - ServerAddress address = new ServerAddress(hostAndPort.getHostText(), hostAndPort.getPort()); + ServerAddress address = new ServerAddress(hostAndPort.getHost(), hostAndPort.getPort()); if (MongoDBAuthenticationUtils.usesAuthentication(standalone)) { return new MongoDBClientSupport(address, standalone.sensors().get(MongoDBAuthenticationMixins.ROOT_USERNAME), standalone.sensors().get(MongoDBAuthenticationMixins.ROOT_PASSWORD), standalone.sensors().get(MongoDBAuthenticationMixins.AUTHENTICATION_DATABASE)); diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java index 326e07c..59e53b3 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBServerImpl.java @@ -65,11 +65,11 @@ public class MongoDBServerImpl extends SoftwareProcessImpl implements MongoDBSer int port = sensors().get(MongoDBServer.PORT); HostAndPort accessibleAddress = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, port); sensors().set(MONGO_SERVER_ENDPOINT, String.format("%s:%d", - accessibleAddress.getHostText(), accessibleAddress.getPort())); + accessibleAddress.getHost(), accessibleAddress.getPort())); int httpConsolePort = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, sensors().get(HTTP_PORT)).getPort(); sensors().set(HTTP_INTERFACE_URL, String.format("http://%s:%d";, - accessibleAddress.getHostText(), httpConsolePort)); + accessibleAddress.getHost(), httpConsolePort)); if (clientAccessEnabled()) { try { diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java index 9ea240b..f0ba4aa 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/ReplicaSetConfig.java @@ -124,7 +124,7 @@ public class ReplicaSetConfig { // address. It will require modification to MongoDBClientSupport, though, since it sets // the primary to the host/port accessible from Brooklyn. HostAndPort hap = BrooklynAccessUtils.getBrooklynAccessibleAddress(server, server.getAttribute(MongoDBServer.PORT)); - return member(hap.getHostText(), hap.getPort(), id); + return member(hap.getHost(), hap.getPort(), id); } /** @@ -132,7 +132,7 @@ public class ReplicaSetConfig { * Doesn't attempt to check that the id is free. */ public ReplicaSetConfig member(HostAndPort address, Integer id) { - return member(address.getHostText(), address.getPort(), id); + return member(address.getHost(), address.getPort(), id); } /** @@ -155,12 +155,12 @@ public class ReplicaSetConfig { /** Removes the first entity using {@link MongoDBServer#HOSTNAME} and {@link MongoDBServer#PORT}. */ public ReplicaSetConfig remove(MongoDBServer server) { HostAndPort hap = BrooklynAccessUtils.getBrooklynAccessibleAddress(server, server.getAttribute(MongoDBServer.PORT)); - return remove(hap.getHostText(), hap.getPort()); + return remove(hap.getHost(), hap.getPort()); } /** Removes the first entity with host and port matching the given address. */ public ReplicaSetConfig remove(HostAndPort address) { - return remove(address.getHostText(), address.getPort()); + return remove(address.getHost(), address.getPort()); } /** @@ -229,7 +229,7 @@ public class ReplicaSetConfig { LOG.debug("Setting voting and non-voting members of replica set: {}", name); boolean seenPrimary = false; String expectedPrimary = primary.isPresent() - ? primary.get().getHostText() + ":" + primary.get().getPort() + ? primary.get().getHost() + ":" + primary.get().getPort() : ""; // Ensure an odd number of voters diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java index b5bf2cc..4f756a6 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerClusterImpl.java @@ -49,7 +49,7 @@ public class MongoDBConfigServerClusterImpl extends DynamicClusterImpl implement @Override public String apply(Entity entity) { HostAndPort hostAndPort = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(MongoDBConfigServer.PORT)); - return hostAndPort.getHostText() + ":" + hostAndPort.getPort(); + return hostAndPort.getHost() + ":" + hostAndPort.getPort(); } }); sensors().set(MongoDBConfigServerCluster.CONFIG_SERVER_ADDRESSES, ImmutableList.copyOf(memberHostNamesAndPorts)); diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java index b7c83ac..b47c889 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerImpl.java @@ -53,7 +53,7 @@ public class SolrServerImpl extends SoftwareProcessImpl implements SolrServer { HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getSolrPort()); - String solrUri = String.format("http://%s:%d/solr";, hp.getHostText(), hp.getPort()); + String solrUri = String.format("http://%s:%d/solr";, hp.getHost(), hp.getPort()); sensors().set(MAIN_URI, URI.create(solrUri)); if (isHttpMonitoringEnabled()) { diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java index 13ca374..d846d36 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBTestHelper.java @@ -113,7 +113,7 @@ public class MongoDBTestHelper { private static MongoClient clientForServer(AbstractMongoDBServer server) { try { HostAndPort hap = BrooklynAccessUtils.getBrooklynAccessibleAddress(server, server.getAttribute(MongoDBServer.PORT)); - return new MongoClient(hap.getHostText(), hap.getPort()); + return new MongoClient(hap.getHost(), hap.getPort()); } catch (Exception e) { // Fail whatever test called this method. throw Throwables.propagate(e); diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java index bd5bc15..2be618e 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -294,7 +294,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme if (requireManagementAccessible) { HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, port); if (accessible!=null) { - domain = accessible.getHostText(); + domain = accessible.getHost(); port = accessible.getPort(); } } diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java index 6c2d874..739a494 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/WebAppServiceMethods.java @@ -90,12 +90,12 @@ public class WebAppServiceMethods implements WebAppServiceConstants { Integer rawPort = entity.getAttribute(HTTPS_PORT); checkNotNull(rawPort, "HTTPS_PORT sensors not set for %s; is an acceptable port available?", entity); HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, rawPort); - return String.format("https://%s:%s/";, hp.getHostText(), hp.getPort()); + return String.format("https://%s:%s/";, hp.getHost(), hp.getPort()); } else if (isProtocolEnabled(entity, "http")) { Integer rawPort = entity.getAttribute(HTTP_PORT); checkNotNull(rawPort, "HTTP_PORT sensors not set for %s; is an acceptable port available?", entity); HostAndPort hp = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, rawPort); - return String.format("http://%s:%s/";, hp.getHostText(), hp.getPort()); + return String.format("http://%s:%s/";, hp.getHost(), hp.getPort()); } else { throw new IllegalStateException("HTTP and HTTPS protocols not enabled for "+entity+"; enabled protocols are "+getEnabledProtocols(entity)); } diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java index b1dfba8..1430d3b 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java @@ -69,7 +69,7 @@ public class JBoss7ServerImpl extends JavaWebAppSoftwareProcessImpl implements J getAttribute(MANAGEMENT_HTTP_PORT) + getConfig(PORT_INCREMENT)); String managementUri = String.format("http://%s:%s/management/subsystem/web/connector/http/read-resource";, - hp.getHostText(), hp.getPort()); + hp.getHost(), hp.getPort()); sensors().set(MANAGEMENT_URL, managementUri); if (isHttpMonitoringEnabled()) { diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java index 92c9b2d..29d0354 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppServiceImpl.java @@ -55,7 +55,7 @@ public class NodeJsWebAppServiceImpl extends SoftwareProcessImpl implements Node ConfigToAttributes.apply(this); HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, getHttpPort()); - String nodeJsUrl = String.format("http://%s:%d";, accessible.getHostText(), accessible.getPort()); + String nodeJsUrl = String.format("http://%s:%d";, accessible.getHost(), accessible.getPort()); if (isHttpMonitoringEnabled()) { LOG.info("Connecting to {}", nodeJsUrl);
