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-server.git
commit 74c515651f2ff3300ede36ba5dc37f01e8e9efb2 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 13:51:46 2021 +0000 more guava updates --- .../brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 4 ++-- .../brooklyn/camp/brooklyn/MultiLocationYamlTest.java | 2 +- .../org/apache/brooklyn/util/core/file/ArchiveBuilder.java | 7 ++++++- .../container/location/kubernetes/KubernetesLocation.java | 4 ++-- .../location/kubernetes/KubernetesLocationLiveTest.java | 4 ++-- .../kubernetes/KubernetesLocationYamlLiveTest.java | 4 ++-- .../location/jclouds/DefaultConnectivityResolver.java | 4 ++-- .../apache/brooklyn/location/jclouds/JcloudsLocation.java | 14 +++++++------- .../org/apache/brooklyn/location/jclouds/JcloudsUtil.java | 2 +- .../location/jclouds/DefaultConnectivityResolverTest.java | 6 +++--- ...oudsLocationReachabilityPredicateInstantiationTest.java | 8 ++++---- .../networking/JcloudsReachableAddressStubbedTest.java | 2 +- .../brooklyn/entity/brooklynnode/BrooklynNodeImpl.java | 4 ++-- .../java/org/apache/brooklyn/entity/java/JmxSupport.java | 6 +++--- .../brooklyn/entity/java/VanillaJavaAppSshDriver.java | 2 +- .../apache/brooklyn/entity/machine/AddMachineMetrics.java | 4 ++-- .../base/SoftwareProcessEntityHttpFeedRebindTest.java | 2 +- .../brooklyn/location/winrm/WinRmMachineLocation.java | 2 +- .../brooklyn/test/framework/TestEndpointReachableTest.java | 6 +++--- 19 files changed, 46 insertions(+), 41 deletions(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java index 79efd74..d5cec29 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java @@ -271,7 +271,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { } private void assertMachine(SshMachineLocation machine, UserAndHostAndPort conn, Map<String, ?> config) { - assertEquals(machine.getAddress().getHostAddress(), conn.getHostAndPort().getHostText()); + assertEquals(machine.getAddress().getHostAddress(), conn.getHostAndPort().getHost()); assertEquals(machine.getPort(), conn.getHostAndPort().getPort()); assertEquals(machine.getUser(), conn.getUser()); for (Map.Entry<String, ?> entry : config.entrySet()) { @@ -281,7 +281,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { } private void assertMachine(WinRmMachineLocation machine, UserAndHostAndPort conn, Map<String, ?> config) { - assertEquals(machine.getAddress().getHostAddress(), conn.getHostAndPort().getHostText()); + assertEquals(machine.getAddress().getHostAddress(), conn.getHostAndPort().getHost()); assertEquals(machine.getPort(), conn.getHostAndPort().getPort()); assertEquals(machine.getUser(), conn.getUser()); for (Map.Entry<String, ?> entry : config.entrySet()) { diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MultiLocationYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MultiLocationYamlTest.java index 0b5eb85..7cc5d89 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MultiLocationYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MultiLocationYamlTest.java @@ -146,7 +146,7 @@ public class MultiLocationYamlTest extends AbstractYamlTest { String addr = machine.getAddress().getHostAddress(); int port = machine.getPort(); String user = machine.getUser(); - return addr != null && addr.equals(conn.getHostAndPort().getHostText()) + return addr != null && addr.equals(conn.getHostAndPort().getHost()) && port == conn.getHostAndPort().getPortOrDefault(22) && user != null && user.equals(conn.getUser()); } diff --git a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java index 3b11555..1c5ccc7 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java @@ -25,6 +25,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.util.Arrays; import java.util.Collections; import java.util.Map; import java.util.jar.Attributes; @@ -332,7 +333,11 @@ public class ArchiveBuilder { if (!source.isDirectory()) { throw new IllegalStateException("Cannot add multiple items at a path in archive unless they are directories: "+sources+" at "+path+" is not valid."); } - Iterable<File> children = Files.fileTraverser().breadthFirst(source); + Iterable<File> children = Arrays.asList(source.listFiles()); + // previously was: + //Files.fileTreeTraverser().children(source); + // updating to this causes overflow: + //Files.fileTraverser().breadthFirst(source); for (File child : children) { addToArchive(Os.mergePaths(name, child.getName()), Collections.singleton(child), target); } diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java index 18e63c3..504ec81 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java @@ -589,7 +589,7 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi protected void registerPortMappings(KubernetesSshMachineLocation machine, Entity entity, Service service) { PortForwardManager portForwardManager = getPortForwardManager(); List<ServicePort> ports = service.getSpec().getPorts(); - String publicHostText = machine.getSshHostAndPort().getHostText(); + String publicHostText = machine.getSshHostAndPort().getHost(); LOG.debug("Recording port-mappings for container {} of {}: {}", machine, this, ports); for (ServicePort port : ports) { @@ -1059,7 +1059,7 @@ public class KubernetesLocation extends AbstractLocation implements MachineProvi } public boolean implementsInterface(Entity entity, Class<?> type) { - return Iterables.tryFind(Arrays.asList(entity.getClass().getInterfaces()), Predicates.assignableFrom(type)).isPresent(); + return Iterables.tryFind(Arrays.asList(entity.getClass().getInterfaces()), iface -> iface.isAssignableFrom(type)).isPresent(); } @Override diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java index ed42bd2..de7347a 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java @@ -194,12 +194,12 @@ public class KubernetesLocationLiveTest extends BrooklynAppLiveTestSupport { .build()); assertTrue(machine.isSshable()); - String publicHostText = machine.getSshHostAndPort().getHostText(); + String publicHostText = machine.getSshHostAndPort().getHost(); PortForwardManager pfm = (PortForwardManager) mgmt.getLocationRegistry().getLocationManaged(PortForwardManagerLocationResolver.PFM_GLOBAL_SPEC); for (int targetPort : inboundPorts) { HostAndPort mappedPort = pfm.lookup(machine, targetPort); assertNotNull(mappedPort, "no mapping for targetPort " + targetPort); - assertEquals(mappedPort.getHostText(), publicHostText); + assertEquals(mappedPort.getHost(), publicHostText); assertTrue(mappedPort.hasPort(), "no port-part in " + mappedPort + " for targetPort " + targetPort); } } diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java index 5960e1b..7144695 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java @@ -285,7 +285,7 @@ public class KubernetesLocationYamlLiveTest extends AbstractYamlTest { HostAndPort publicPort = HostAndPort.fromString(publicMapped); assertReachableEventually(publicPort); - assertHttpStatusCodeEventuallyEquals("http://"; + publicPort.getHostText() + ":" + publicPort.getPort(), 200); + assertHttpStatusCodeEventuallyEquals("http://"; + publicPort.getHost() + ":" + publicPort.getPort(), 200); return entity; } @@ -462,7 +462,7 @@ public class KubernetesLocationYamlLiveTest extends AbstractYamlTest { HostAndPort publicPort = HostAndPort.fromString(publicMapped); assertReachableEventually(publicPort); - assertHttpStatusCodeEventuallyEquals("http://"; + publicPort.getHostText() + ":" + publicPort.getPort(), 200); + assertHttpStatusCodeEventuallyEquals("http://"; + publicPort.getHost() + ":" + publicPort.getPort(), 200); } @Test(groups = {"Live"}) diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java index f5cf624..d770680 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolver.java @@ -229,7 +229,7 @@ public class DefaultConnectivityResolver extends InitializerPatternForConfigurab } if (contextEntity != null) { - contextEntity.sensors().set(Attributes.ADDRESS, hapChoice.getHostText()); + contextEntity.sensors().set(Attributes.ADDRESS, hapChoice.getHost()); } // Treat AWS as a special case because the DNS fully qualified hostname in AWS is @@ -292,7 +292,7 @@ public class DefaultConnectivityResolver extends InitializerPatternForConfigurab int port = portForwardSshOverride.get().hasPort() ? portForwardSshOverride.get().getPort() : options.defaultLoginPort(); - final HostAndPort override = HostAndPort.fromParts(portForwardSshOverride.get().getHostText(), port); + final HostAndPort override = HostAndPort.fromParts(portForwardSshOverride.get().getHost(), port); switch (getNetworkMode()) { case ONLY_PRIVATE: LOG.info("Ignoring mode {} in favour of port forwarding override for management candidates of {}: {}", diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index 6319fc2..1b0ff3d 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -880,7 +880,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im Map<Integer, Integer> portMappings = JcloudsUtil.dockerPortMappingsFor(this, node.getId()); for(Integer containerPort : portMappings.keySet()) { Integer hostPort = portMappings.get(containerPort); - String dockerHost = ((JcloudsSshMachineLocation)machineLocation).getSshHostAndPort().getHostText(); + String dockerHost = ((JcloudsSshMachineLocation)machineLocation).getSshHostAndPort().getHost(); portForwardManager.associate(node.getId(), HostAndPort.fromParts(dockerHost, hostPort), machineLocation, containerPort); } } @@ -1705,7 +1705,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im Map<String,Object> sshProps = Maps.newLinkedHashMap(config.getAllConfig()); sshProps.put("user", initialUser); - sshProps.put("address", hostAndPort.getHostText()); + sshProps.put("address", hostAndPort.getHost()); sshProps.put("port", hostAndPort.getPort()); sshProps.put(AbstractLocation.TEMPORARY_LOCATION.getName(), true); sshProps.put(LocalLocationManager.CREATE_UNMANAGED.getName(), true); @@ -1737,7 +1737,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im Map<String,Object> winrmProps = Maps.newLinkedHashMap(config.getAllConfig()); winrmProps.put("user", initialUser); - winrmProps.put("address", hostAndPort.getHostText()); + winrmProps.put("address", hostAndPort.getHost()); winrmProps.put("port", hostAndPort.getPort()); winrmProps.put(AbstractLocation.TEMPORARY_LOCATION.getName(), true); winrmProps.put(LocalLocationManager.CREATE_UNMANAGED.getName(), true); @@ -2031,7 +2031,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im }); } - String address = managementHostAndPort.getHostText(); + String address = managementHostAndPort.getHost(); int port = managementHostAndPort.hasPort() ? managementHostAndPort.getPort() : node.getLoginPort(); // The display name will be one of the IPs of the VM (preferring public if there are any). @@ -2122,7 +2122,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im nodeRegion = extractProvider(setup, node); } - String address = winrmHostAndPort.getHostText(); + String address = winrmHostAndPort.getHost(); String displayName = getPublicHostnameGeneric(node, setup, Optional.of(address)); final Object password = winrmConfig.get(WinRmMachineLocation.PASSWORD.getName()) != null @@ -2904,7 +2904,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im if (result.isPresent()) return result.get(); } - Optional<String> preferredAddress = sshHostAndPort.isPresent() ? Optional.of(sshHostAndPort.get().getHostText()) : Optional.<String>absent(); + Optional<String> preferredAddress = sshHostAndPort.isPresent() ? Optional.of(sshHostAndPort.get().getHost()) : Optional.<String>absent(); return getPublicHostnameGeneric(node, setup, preferredAddress); } @@ -2940,7 +2940,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im if (result.isPresent()) return result.get(); } - Optional<String> preferredAddress = sshHostAndPort.isPresent() ? Optional.of(sshHostAndPort.get().getHostText()) : Optional.<String>absent(); + Optional<String> preferredAddress = sshHostAndPort.isPresent() ? Optional.of(sshHostAndPort.get().getHost()) : Optional.absent(); return getPrivateHostnameGeneric(node, setup, preferredAddress); } diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java index 4e0477e..72f1232 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java @@ -79,7 +79,7 @@ public class JcloudsUtil { Iterable<HostAndPort> addresses = getReachableAddresses(node, timeout, socketTester); HostAndPort address = Iterables.getFirst(addresses, null); if (address != null) { - return address.getHostText(); + return address.getHost(); } else { throw new IllegalStateException("No reachable IPs for " + node + "; check whether the node is " + "reachable and whether it meets the requirements of the HostAndPort tester: " + socketTester); diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java index 3e0b046..ebd1dbb 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java @@ -57,7 +57,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT DefaultConnectivityResolver customizer = new DefaultConnectivityResolver(); ConfigBag configBag = jcloudsLocation.config().getBag(); ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options); - assertEquals(result.hostAndPort().getHostText(), "10.1.1.4"); + assertEquals(result.hostAndPort().getHost(), "10.1.1.4"); assertEquals(result.hostAndPort().getPort(), 4361); } @@ -76,7 +76,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT ConfigBag configBag = jcloudsLocation.config().getBag(); ManagementAddressResolveResult result = customizer.resolve( jcloudsLocation, newNodeMetadata(), configBag, options); - assertEquals(result.hostAndPort().getHostText(), expectedHostname); + assertEquals(result.hostAndPort().getHost(), expectedHostname); } @Test @@ -198,7 +198,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT ConfigBag configBag = jcloudsLocation.config().getBag(); ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options); - assertEquals(result.hostAndPort().getHostText(), expectedIp); + assertEquals(result.hostAndPort().getHost(), expectedIp); } @DataProvider(name = "fallibleModes") diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReachabilityPredicateInstantiationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReachabilityPredicateInstantiationTest.java index 22912a7..cb60b0d 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReachabilityPredicateInstantiationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReachabilityPredicateInstantiationTest.java @@ -49,7 +49,7 @@ public class JcloudsLocationReachabilityPredicateInstantiationTest { .id("ID") .loginPort(ALLOWED_HOST_AND_PORT.getPort()) .status(NodeMetadata.Status.RUNNING) - .privateAddresses(ImmutableList.of(ALLOWED_HOST_AND_PORT.getHostText())) + .privateAddresses(ImmutableList.of(ALLOWED_HOST_AND_PORT.getHost())) .build(); @BeforeMethod @@ -64,7 +64,7 @@ public class JcloudsLocationReachabilityPredicateInstantiationTest { ConfigBag predicateConfig = new ConfigBag(); predicateConfig.put(CloudLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE, hostAndPortPredicate); jcloudsLocation.getFirstReachableAddress(node, predicateConfig); - Assert.assertTrue(hostsMatchedHolder.contains(ALLOWED_HOST_AND_PORT.getHostText())); + Assert.assertTrue(hostsMatchedHolder.contains(ALLOWED_HOST_AND_PORT.getHost())); } @Test @@ -94,7 +94,7 @@ public class JcloudsLocationReachabilityPredicateInstantiationTest { List<String> hostsMatchedHolder = new ArrayList<>(); predicateConfig.putStringKey(CloudLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE.getName() + ".hostsMatchedHolder", hostsMatchedHolder); jcloudsLocation.getFirstReachableAddress(node, predicateConfig); - Assert.assertTrue(hostsMatchedHolder.contains(ALLOWED_HOST_AND_PORT.getHostText())); + Assert.assertTrue(hostsMatchedHolder.contains(ALLOWED_HOST_AND_PORT.getHost())); } @Test @@ -163,7 +163,7 @@ public class JcloudsLocationReachabilityPredicateInstantiationTest { @Override public boolean apply(@Nullable HostAndPort input) { - ((List<String>) flags.get("hostsMatchedHolder")).add(input.getHostText()); + ((List<String>) flags.get("hostsMatchedHolder")).add(input.getHost()); return true; } } diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsReachableAddressStubbedTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsReachableAddressStubbedTest.java index 6b2b10a..f962d75 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsReachableAddressStubbedTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsReachableAddressStubbedTest.java @@ -413,7 +413,7 @@ public class JcloudsReachableAddressStubbedTest extends AbstractJcloudsStubbedUn @Override public boolean apply(HostAndPort input) { calls.add(input); - return isReachable(input.getHostText()); + return isReachable(input.getHost()); } public void assertCalled() { diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index df83086..780f356 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -458,11 +458,11 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod if (isHttpProtocolEnabled("http")) { int port = getConfig(PORT_MAPPER).apply(getAttribute(HTTP_PORT)); HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, port); - webConsoleUri = URI.create(String.format("http://%s:%s";, accessible.getHostText(), accessible.getPort())); + webConsoleUri = URI.create(String.format("http://%s:%s";, accessible.getHost(), accessible.getPort())); } else if (isHttpProtocolEnabled("https")) { int port = getConfig(PORT_MAPPER).apply(getAttribute(HTTPS_PORT)); HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, port); - webConsoleUri = URI.create(String.format("https://%s:%s";, accessible.getHostText(), accessible.getPort())); + webConsoleUri = URI.create(String.format("https://%s:%s";, accessible.getHost(), accessible.getPort())); } else { // web-console is not enabled webConsoleUri = null; diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java index 485ed2e..3613ea0 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxSupport.java @@ -160,14 +160,14 @@ public class JmxSupport implements UsesJmx { HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(JMX_PORT)); if (EnumSet.of(JmxAgentModes.JMXMP, JmxAgentModes.JMXMP_AND_RMI).contains(getJmxAgentMode())) { - return JmxHelper.toJmxmpUrl(jmx.getHostText(), jmx.getPort()); + return JmxHelper.toJmxmpUrl(jmx.getHost(), jmx.getPort()); } else { if (getJmxAgentMode() == JmxAgentModes.NONE) { fixPortsForModeNone(); } // this will work for agent or agentless HostAndPort rmi = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, entity.getAttribute(RMI_REGISTRY_PORT)); - return JmxHelper.toRmiJmxUrl(jmx.getHostText(), jmx.getPort(), rmi.getPort(), + return JmxHelper.toRmiJmxUrl(jmx.getHost(), jmx.getPort(), rmi.getPort(), entity.getAttribute(JMX_CONTEXT)); } } @@ -274,7 +274,7 @@ public class JmxSupport implements UsesJmx { Integer jmxPort = Preconditions.checkNotNull(entity.getAttribute(JMX_PORT), "jmx port must not be null for %s", entity); HostAndPort jmx = BrooklynAccessUtils.getBrooklynAccessibleAddress(entity, jmxPort); Integer jmxRemotePort = getEntity().getAttribute(JMX_PORT); - String hostName = jmx.getHostText(); + String hostName = jmx.getHost(); result.put("com.sun.management.jmxremote", null); result.put("java.rmi.server.hostname", hostName); diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java index 072215b..e5973ba 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java @@ -113,7 +113,7 @@ public class VanillaJavaAppSshDriver extends JavaSoftwareProcessSshDriver implem getEntity().sensors().set(VanillaJavaApp.CLASSPATH_FILES, ImmutableList.of(Os.mergePaths(getRunDir(), "lib"))); } else { // FIXME Cannot handle spaces in paths properly - Iterable<String> lines = Splitter.on(CharMatcher.BREAKING_WHITESPACE).omitEmptyStrings().trimResults().split(stdout); + Iterable<String> lines = Splitter.on(CharMatcher.breakingWhitespace()).omitEmptyStrings().trimResults().split(stdout); Iterable<String> files = Iterables.transform(lines, new Function<String, String>() { @Override public String apply(@Nullable String input) { diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java index 8c6d5d0..b3cbfdd 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java @@ -47,7 +47,7 @@ import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.time.Duration; /** - * Adds a {@link SSHFeed feed} with sensors returning details about the machine the entity is running on. + * Adds an {@link SshFeed} feed with sensors returning details about the machine the entity is running on. * <p> * The machine must be SSHable and running Linux. * @@ -121,7 +121,7 @@ public class AddMachineMetrics implements EntityInitializer { @Override public Double apply(SshPollValue input) { Double cpu = 0d; - Iterable<String> stdout = Splitter.on(CharMatcher.BREAKING_WHITESPACE).omitEmptyStrings().split(input.getStdout()); + Iterable<String> stdout = Splitter.on(CharMatcher.breakingWhitespace()).omitEmptyStrings().split(input.getStdout()); for (Double each : FluentIterable.from(stdout).skip(1).transform(Doubles.stringConverter())) { cpu += each; } return cpu / 100d; } diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityHttpFeedRebindTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityHttpFeedRebindTest.java index 6272707..17a531c 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityHttpFeedRebindTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessEntityHttpFeedRebindTest.java @@ -184,7 +184,7 @@ public class SoftwareProcessEntityHttpFeedRebindTest extends RebindTestFixtureWi HostAndPort accessible = BrooklynAccessUtils.getBrooklynAccessibleAddress(this, port); if (accessible!=null) { try { - URI result = new URI(mockUrl.getScheme(), mockUrl.getUserInfo(), accessible.getHostText(), accessible.getPort(), mockUrl.getPath(), mockUrl.getQuery(), mockUrl.getFragment()); + URI result = new URI(mockUrl.getScheme(), mockUrl.getUserInfo(), accessible.getHost(), accessible.getPort(), mockUrl.getPath(), mockUrl.getQuery(), mockUrl.getFragment()); return result.toString(); } catch (URISyntaxException e) { throw Exceptions.propagate(e); diff --git a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java index 0adaf2a..747abd8 100644 --- a/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java +++ b/software/winrm/src/main/java/org/apache/brooklyn/location/winrm/WinRmMachineLocation.java @@ -193,7 +193,7 @@ public class WinRmMachineLocation extends AbstractMachineLocation implements Mac if (!publicEndpoint.hasPort()) { throw new IllegalArgumentException("Invalid portMapping ('"+entry.getValue()+"') for port "+targetPort+" in machine "+this); } - pfm.associate(publicEndpoint.getHostText(), publicEndpoint, this, targetPort); + pfm.associate(publicEndpoint.getHost(), publicEndpoint, this, targetPort); } } } diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEndpointReachableTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEndpointReachableTest.java index 42c35dc..193008c 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEndpointReachableTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/TestEndpointReachableTest.java @@ -107,7 +107,7 @@ public class TestEndpointReachableTest extends BrooklynAppUnitTestSupport { @Test public void testSensorUriStringReachable() throws Exception { - String sensorVal = "http://"+serverSocketHostAndPort.getHostText()+":"+serverSocketHostAndPort.getPort(); + String sensorVal = "http://"+serverSocketHostAndPort.getHost()+":"+serverSocketHostAndPort.getPort(); AttributeSensor<String> sensor = Sensors.newStringSensor("test.reachable.endpoint"); app.createAndManageChild(EntitySpec.create(TestEndpointReachable.class) .configure(TestEndpointReachable.TARGET_ENTITY, app) @@ -118,7 +118,7 @@ public class TestEndpointReachableTest extends BrooklynAppUnitTestSupport { @Test public void testSensorUriReachable() throws Exception { - URI sensorVal = URI.create("http://"+serverSocketHostAndPort.getHostText()+":"+serverSocketHostAndPort.getPort()); + URI sensorVal = URI.create("http://"+serverSocketHostAndPort.getHost()+":"+serverSocketHostAndPort.getPort()); AttributeSensor<URI> sensor = Sensors.newSensor(URI.class, "test.reachable.endpoint"); app.createAndManageChild(EntitySpec.create(TestEndpointReachable.class) .configure(TestEndpointReachable.TARGET_ENTITY, app) @@ -129,7 +129,7 @@ public class TestEndpointReachableTest extends BrooklynAppUnitTestSupport { @Test public void testSensorUrlReachable() throws Exception { - URL sensorVal = new URL("http://"+serverSocketHostAndPort.getHostText()+":"+serverSocketHostAndPort.getPort()); + URL sensorVal = new URL("http://"+serverSocketHostAndPort.getHost()+":"+serverSocketHostAndPort.getPort()); AttributeSensor<URL> sensor = Sensors.newSensor(URL.class, "test.reachable.endpoint"); app.createAndManageChild(EntitySpec.create(TestEndpointReachable.class) .configure(TestEndpointReachable.TARGET_ENTITY, app)
