From adc1ef3ca53a39ebe9cc85048d499bfdd1c4d187 Mon Sep 17 00:00:00 2001 From: Aled Sage Date: Sun, 11 Jun 2017 16:37:24 +0100 Subject: [PATCH] Use MoreObjects.toStringHelper (deprecation warning) --- .../brooklyn/camp/server/dto/ApiErrorDto.java | 3 ++- .../core/catalog/internal/CatalogBundleDto.java | 3 ++- .../core/catalog/internal/CatalogDto.java | 4 ++-- .../external/UrlsExternalConfigSupplier.java | 4 ++-- .../core/effector/BasicParameterType.java | 3 ++- .../brooklyn/core/entity/EntityAndAttribute.java | 3 ++- .../downloads/BasicDownloadRequirement.java | 4 ++-- .../drivers/downloads/BasicDownloadResolver.java | 4 ++-- .../drivers/downloads/BasicDownloadTargets.java | 4 ++-- .../drivers/downloads/DownloadSubstituters.java | 4 ++-- .../core/entity/lifecycle/PolicyDescriptor.java | 3 ++- .../org/apache/brooklyn/core/feed/Poller.java | 4 ++-- .../core/internal/BrooklynProperties.java | 4 ++-- .../core/internal/BrooklynPropertiesImpl.java | 4 ++-- .../AggregatingMachineProvisioningLocation.java | 4 ++-- .../core/location/BasicHardwareDetails.java | 6 +++--- .../core/location/BasicMachineDetails.java | 4 ++-- .../core/location/BasicMachineMetadata.java | 7 ++++--- .../brooklyn/core/location/BasicOsDetails.java | 6 +++--- .../core/location/access/PortForwardManager.java | 4 ++-- .../core/location/access/PortMapping.java | 3 ++- .../BasicEntitlementClassDefinition.java | 4 ++-- .../ha/dto/BasicManagementNodeSyncRecord.java | 6 +++--- .../ha/dto/ManagementPlaneSyncRecordImpl.java | 4 ++-- .../internal/NonDeploymentManagementContext.java | 4 ++-- .../core/mgmt/persist/FileBasedObjectStore.java | 4 ++-- .../core/mgmt/rebind/dto/AbstractMemento.java | 5 ++--- .../core/mgmt/usage/ApplicationUsage.java | 3 ++- .../brooklyn/core/objs/AbstractEntityAdjunct.java | 4 ++-- .../apache/brooklyn/core/objs/AdjunctType.java | 3 ++- .../apache/brooklyn/enricher/stock/Enrichers.java | 15 ++++++++------- .../ProportionalZoneFailureDetector.java | 4 ++-- .../FixedListMachineProvisioningLocation.java | 4 ++-- .../brooklyn/location/ssh/SshMachineLocation.java | 4 ++-- .../brooklyn/util/core/flags/FlagUtils.java | 3 ++- .../internal/ssh/sshj/SshjClientConnection.java | 3 ++- .../brooklyn/util/core/task/TaskInternal.java | 4 ++-- .../core/entity/EntityAutomanagedTest.java | 3 ++- .../mgmt/internal/EntityExecutionManagerTest.java | 4 ++-- .../util/core/internal/FlagUtilsTest.java | 3 ++- .../util/core/internal/ssh/RecordingSshTool.java | 5 +++-- .../jclouds/JcloudsBlobStoreBasedObjectStore.java | 4 ++-- .../location/jclouds/JcloudsLocation.java | 3 ++- .../jclouds/JcloudsWinRmMachineLocation.java | 4 ++-- .../jclouds/RebindToMachinePredicate.java | 4 ++-- .../autoscaling/MaxPoolSizeReachedEvent.java | 4 ++-- .../brooklyn/policy/autoscaling/SizeHistory.java | 4 ++-- .../org/apache/brooklyn/policy/ha/HASensors.java | 4 ++-- .../brooklyn/rest/domain/EffectorSummary.java | 3 ++- .../core/internal/winrm/RecordingWinRmTool.java | 4 ++-- .../performance/PerformanceTestDescriptor.java | 4 ++-- .../test/performance/PerformanceTestResult.java | 4 ++-- .../brooklyn/util/http/HttpToolResponse.java | 4 ++-- .../org/apache/brooklyn/util/pool/BasicPool.java | 4 ++-- .../util/javalang/MemoryUsageTrackerTest.java | 4 ++-- 55 files changed, 122 insertions(+), 106 deletions(-) diff --git a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java index c938b9658a..31a4da2846 100644 --- a/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java +++ b/camp/camp-server/src/main/java/org/apache/brooklyn/camp/server/dto/ApiErrorDto.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Throwables; @@ -110,7 +111,7 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("message", message) .add("details", details) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java index d3ce7ac854..1be4e18b82 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogBundleDto.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.core.catalog.internal; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; @@ -68,7 +69,7 @@ public String getUrl() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("symbolicName", symbolicName) .add("version", version) .add("url", url) diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java index 14b9fea663..c1c6b17d41 100644 --- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java +++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogDto.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; @@ -105,7 +105,7 @@ public static CatalogDto newDtoFromCatalogItems(Collection> en @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("name", name) .add("id", id) diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java index 8b8d5b3abf..0fe1776ce7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/UrlsExternalConfigSupplier.java @@ -24,7 +24,7 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.util.core.ResourceUtils; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Maps; @@ -70,7 +70,7 @@ public UrlsExternalConfigSupplier(ManagementContext managementContext, String na @Override public String toString() { - return Objects.toStringHelper(this).add("name", getName()).toString(); + return MoreObjects.toStringHelper(this).add("name", getName()).toString(); } @Override diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/BasicParameterType.java b/core/src/main/java/org/apache/brooklyn/core/effector/BasicParameterType.java index 5dd6211dc7..264459f471 100644 --- a/core/src/main/java/org/apache/brooklyn/core/effector/BasicParameterType.java +++ b/core/src/main/java/org/apache/brooklyn/core/effector/BasicParameterType.java @@ -23,6 +23,7 @@ import org.apache.brooklyn.api.effector.ParameterType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public class BasicParameterType implements ParameterType { @@ -94,7 +95,7 @@ public boolean hasDefaultValue() { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("name", name).add("description", description).add("type", getParameterClassName()) .add("defaultValue", defaultValue) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java index f840db53c7..ce86c5350e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAndAttribute.java @@ -23,6 +23,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.sensor.AttributeSensor; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Supplier; @@ -84,7 +85,7 @@ public T get() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("entity", entity) .add("attribute", attribute) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadRequirement.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadRequirement.java index 0a1106bd71..99aa0888fe 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadRequirement.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadRequirement.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadRequirement; import org.apache.brooklyn.util.collections.MutableMap; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; public class BasicDownloadRequirement implements DownloadRequirement { @@ -80,6 +80,6 @@ public String getAddonName() { @Override public String toString() { - return Objects.toStringHelper(this).add("driver", entityDriver).add("addon", addonName).omitNullValues().toString(); + return MoreObjects.toStringHelper(this).add("driver", entityDriver).add("addon", addonName).omitNullValues().toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadResolver.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadResolver.java index aed8f0bedb..c934acbb5e 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadResolver.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadResolver.java @@ -24,7 +24,7 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; public class BasicDownloadResolver implements DownloadResolver { @@ -60,7 +60,7 @@ public String getUnpackedDirectoryName(String defaultVal) { @Override public String toString() { - return Objects.toStringHelper(this).add("targets", targets).add("filename", filename) + return MoreObjects.toStringHelper(this).add("targets", targets).add("filename", filename) .add("unpackDirName", unpackDirectoryName).omitNullValues().toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadTargets.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadTargets.java index d8e6599210..b8a7466975 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadTargets.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/BasicDownloadTargets.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolverManager.DownloadTargets; import org.apache.brooklyn.util.collections.MutableList; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -115,7 +115,7 @@ public boolean canContinueResolving() { @Override public String toString() { - return Objects.toStringHelper(this).add("primaries", primaries).add("fallbacks", fallbacks) + return MoreObjects.toStringHelper(this).add("primaries", primaries).add("fallbacks", fallbacks) .add("canContinueResolving", canContinueResolving).toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadSubstituters.java b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadSubstituters.java index 64a081c2da..c1b9b03283 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadSubstituters.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/drivers/downloads/DownloadSubstituters.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; @@ -166,7 +166,7 @@ public DownloadTargets apply(DownloadRequirement input) { } @Override public String toString() { - return Objects.toStringHelper(this).add("basevalue", basevalueProducer).add("subs", subsProducer).toString(); + return MoreObjects.toStringHelper(this).add("basevalue", basevalueProducer).add("subs", subsProducer).toString(); } } } diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/PolicyDescriptor.java b/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/PolicyDescriptor.java index ee063cbcb9..e0e8716abd 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/PolicyDescriptor.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/lifecycle/PolicyDescriptor.java @@ -21,6 +21,7 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.core.entity.AbstractEntity; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** Emitted as part of {@link AbstractEntity#POLICY_ADDED} and {@link AbstractEntity#POLICY_REMOVED} */ @@ -63,6 +64,6 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("type", type).add("name", name).omitNullValues().toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("type", type).add("name", name).omitNullValues().toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java index 3ecb481e35..1a29c48c82 100644 --- a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java +++ b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** @@ -210,6 +210,6 @@ protected boolean isEmpty() { @Override public String toString() { - return Objects.toStringHelper(this).add("entity", entity).toString(); + return MoreObjects.toStringHelper(this).add("entity", entity).toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java index 9924a90dc8..0126e238cf 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynProperties.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Supplier; @@ -183,7 +183,7 @@ public static Builder fromProperties(BrooklynProperties brooklynProperties) { @Override @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("originalProperties", originalProperties) .add("defaultLocationMetadataUrl", defaultLocationMetadataUrl) diff --git a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java index 0faa5b5f4e..31f0b0b87b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/internal/BrooklynPropertiesImpl.java @@ -50,7 +50,7 @@ import com.google.common.annotations.Beta; import com.google.common.base.CharMatcher; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Throwables; import com.google.common.collect.Maps; @@ -192,7 +192,7 @@ public static Builder fromProperties(BrooklynPropertiesImpl brooklynProperties) @Override @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("originalProperties", originalProperties) .add("defaultLocationMetadataUrl", defaultLocationMetadataUrl) diff --git a/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java index 6fc9920f91..ee4ee9f66c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/AggregatingMachineProvisioningLocation.java @@ -32,7 +32,7 @@ import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.stream.Streams; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -71,7 +71,7 @@ public void init() { @Override public String toVerboseString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", getId()).add("name", getDisplayName()) .add("provisioners", provisioners) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicHardwareDetails.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicHardwareDetails.java index f666268159..a476b98ace 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicHardwareDetails.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicHardwareDetails.java @@ -20,10 +20,10 @@ import javax.annotation.concurrent.Immutable; -import com.google.common.base.Objects; - import org.apache.brooklyn.api.location.HardwareDetails; +import com.google.common.base.MoreObjects; + @Immutable public class BasicHardwareDetails implements HardwareDetails { @@ -47,7 +47,7 @@ public Integer getRam() { @Override public String toString() { - return Objects.toStringHelper(HardwareDetails.class) + return MoreObjects.toStringHelper(HardwareDetails.class) .omitNullValues() .add("cpuCount", cpuCount) .add("ram", ram) diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineDetails.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineDetails.java index 93374c4103..f8a7cce698 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineDetails.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineDetails.java @@ -48,7 +48,7 @@ import com.google.common.base.CharMatcher; import com.google.common.base.Function; import com.google.common.base.Joiner; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Splitter; import com.google.common.base.Throwables; @@ -82,7 +82,7 @@ public OsDetails getOsDetails() { @Override public String toString() { - return Objects.toStringHelper(MachineDetails.class) + return MoreObjects.toStringHelper(MachineDetails.class) .add("os", osDetails) .add("hardware", hardwareDetails) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java index e8e49be473..fd0891f783 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicMachineMetadata.java @@ -18,10 +18,11 @@ */ package org.apache.brooklyn.core.location; -import com.google.common.base.Objects; - import org.apache.brooklyn.api.location.MachineManagementMixins; +import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; + public class BasicMachineMetadata implements MachineManagementMixins.MachineMetadata { final String id, name, primaryIp; @@ -83,7 +84,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("originalMetadata", originalMetadata).toString(); + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("originalMetadata", originalMetadata).toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java index 806056231a..6a62bc0605 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/BasicOsDetails.java @@ -23,10 +23,10 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import com.google.common.base.Objects; - import org.apache.brooklyn.api.location.OsDetails; +import com.google.common.base.MoreObjects; + @Immutable public class BasicOsDetails implements OsDetails { @@ -87,7 +87,7 @@ public boolean is64bit() { @Override public String toString() { - return Objects.toStringHelper(OsDetails.class) + return MoreObjects.toStringHelper(OsDetails.class) .omitNullValues() .add("name", name) .add("version", version) diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java index e375f3939d..f27836b00c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortForwardManager.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.core.config.ConfigKeys; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.net.HostAndPort; @@ -85,7 +85,7 @@ public int getPrivatePort() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("publicIpId", publicIpId) .add("publicEndpoint", publicEndpoint) .add("location", location) diff --git a/core/src/main/java/org/apache/brooklyn/core/location/access/PortMapping.java b/core/src/main/java/org/apache/brooklyn/core/location/access/PortMapping.java index 06d92cb023..a6e6d2c5c0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/access/PortMapping.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/access/PortMapping.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.location.Location; import com.google.common.annotations.Beta; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.net.HostAndPort; @@ -75,7 +76,7 @@ public int getPrivatePort() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("publicIpId", publicIpId+":"+publicPort) .add("publicEndpoint", (publicEndpoint == null ? publicPort : publicEndpoint)) .add("targetLocation", target) diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/BasicEntitlementClassDefinition.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/BasicEntitlementClassDefinition.java index ed93fc7966..fbdb589487 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/BasicEntitlementClassDefinition.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/entitlement/BasicEntitlementClassDefinition.java @@ -20,7 +20,7 @@ import org.apache.brooklyn.api.mgmt.entitlement.EntitlementClass; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.reflect.TypeToken; @@ -51,6 +51,6 @@ public TypeToken entitlementClassArgumentType() { @Override public String toString() { - return Objects.toStringHelper(this).add("identitifier", identifier).add("argumentType", argumentType).toString(); + return MoreObjects.toStringHelper(this).add("identitifier", identifier).add("argumentType", argumentType).toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java index 4396eb9c4b..6e1aecddbb 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/BasicManagementNodeSyncRecord.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.util.time.Time; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * Represents the state of a management node within the Brooklyn management plane @@ -165,14 +165,14 @@ public Long getRemoteTimestamp() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("nodeId", getNodeId()) .add("status", getStatus()).toString(); } @Override public String toVerboseString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("brooklynVersion", getBrooklynVersion()) .add("nodeId", getNodeId()) diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java index f800f25bfc..7322427b80 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/dto/ManagementPlaneSyncRecordImpl.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord; import org.apache.brooklyn.util.collections.MutableMap; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -97,7 +97,7 @@ public Map getManagementNodes() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("masterNodeId", masterNodeId) .add("nodes", managementNodes.keySet()) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java index 4e1420713a..2e9238f869 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java @@ -75,7 +75,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -153,7 +153,7 @@ public void setManagementContext(ManagementContextInternal val) { @Override public String toString() { - return Objects.toStringHelper(this).add("entity", entity.getId()).add("mode", mode).toString(); + return MoreObjects.toStringHelper(this).add("entity", entity.getId()).add("mode", mode).toString(); } public void setMode(NonDeploymentManagementContextMode mode) { diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedObjectStore.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedObjectStore.java index 9e6621af2f..20326a1493 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedObjectStore.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedObjectStore.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; @@ -173,7 +173,7 @@ public void close() { @Override public String toString() { - return Objects.toStringHelper(this).add("basedir", basedir).toString(); + return MoreObjects.toStringHelper(this).add("basedir", basedir).toString(); } @Override diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java index fba3d39abf..0f398d34e9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/AbstractMemento.java @@ -27,14 +27,13 @@ import org.apache.brooklyn.api.mgmt.rebind.mementos.Memento; import org.apache.brooklyn.core.BrooklynVersion; import org.apache.brooklyn.core.config.Sanitizer; +import org.apache.brooklyn.util.collections.MutableList; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import org.apache.brooklyn.util.collections.MutableList; public abstract class AbstractMemento implements Memento, Serializable { @@ -201,7 +200,7 @@ public Object getCustomField(String name) { @Override public String toString() { - return Objects.toStringHelper(this).add("type", getType()).add("id", getId()).toString(); + return MoreObjects.toStringHelper(this).add("type", getType()).add("id", getId()).toString(); } @Override diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/usage/ApplicationUsage.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/usage/ApplicationUsage.java index 9db02af6d1..856063cc55 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/usage/ApplicationUsage.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/usage/ApplicationUsage.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -80,7 +81,7 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper(this).add("date", date).add("state", state).add("entitlementContext", user).toString(); + return MoreObjects.toStringHelper(this).add("date", date).add("state", state).add("entitlementContext", user).toString(); } } diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java index 69e51e6e13..462c649347 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -541,7 +541,7 @@ public void setUniqueTag(String uniqueTag) { @Override public String toString() { - return Objects.toStringHelper(getClass()).omitNullValues() + return MoreObjects.toStringHelper(getClass()).omitNullValues() .add("name", name) .add("uniqueTag", uniqueTag) .add("running", isRunning()) diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctType.java b/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctType.java index ce3d42cbc9..2366a791fb 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctType.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AdjunctType.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; @@ -101,7 +102,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return Objects.toStringHelper(name) + return MoreObjects.toStringHelper(name) .add("configKeys", configKeys) .toString(); } diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java index 55a2f990a3..51b03586cf 100644 --- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java +++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Enrichers.java @@ -40,9 +40,10 @@ import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.collections.QuorumCheck; import org.apache.brooklyn.util.core.flags.TypeCoercions; + import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Supplier; @@ -324,7 +325,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("aggregating", aggregating) .add("keySensor", keySensor) @@ -426,7 +427,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("combining", combining) .add("publishing", publishing) @@ -485,7 +486,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("publishing", publishing) .add("transforming", transforming) @@ -569,7 +570,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("fromEntity", fromEntity) .add("fromEntitySupplier", fromEntitySupplier) @@ -629,7 +630,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("publishing", targetSensor) .add("fromSensor", fromSensor) @@ -705,7 +706,7 @@ public EnricherSpec build() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("publishing", publishing) .add("transforming", transforming) diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java b/core/src/main/java/org/apache/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java index 990ea713d5..588ae38bd7 100644 --- a/core/src/main/java/org/apache/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java +++ b/core/src/main/java/org/apache/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetector.java @@ -21,7 +21,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.util.time.Duration; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Ticker; public class ProportionalZoneFailureDetector extends AbstractZoneFailureDetector { @@ -60,7 +60,7 @@ protected boolean doHasFailed(Location loc, ZoneHistory zoneHistory) { @Override public String toString(){ - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("minDatapoints", minDatapoints) .add("timeToConsider", timeToConsider) .add("maxProportionFailures", maxProportionFailures) diff --git a/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java index cd4b5be711..87b83f8928 100644 --- a/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java @@ -53,7 +53,7 @@ import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -200,7 +200,7 @@ public void init() { @Override public String toVerboseString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", getId()).add("name", getDisplayName()) .add("machinesAvailable", getAvailable()).add("machinesInUse", getInUse()) .toString(); diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java index 43709a057f..167d83ec65 100644 --- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java @@ -105,7 +105,7 @@ import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -950,7 +950,7 @@ public String toString() { @Override public String toVerboseString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", getId()).add("name", getDisplayName()) .add("user", getUser()).add("address", getAddress()).add("port", getPort()) .add("parentLocation", getParent()) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java index d160a931e1..6fd9b67f70 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java @@ -43,6 +43,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -211,7 +212,7 @@ public boolean isValuePresent() { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("flag", flagName) .add("configKey", configKey) .add("flagValue", flagValue.orNull()) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjClientConnection.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjClientConnection.java index 03a4ed0509..22a5d7091e 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjClientConnection.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjClientConnection.java @@ -34,6 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.net.HostAndPort; @@ -269,7 +270,7 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("hostAndPort", hostAndPort) .add("user", username) .add("ssh", ssh != null ? ssh.hashCode() : null) diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java index f565aa06b3..83b9eabb8d 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskInternal.java @@ -29,7 +29,7 @@ import com.google.common.annotations.Beta; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.util.concurrent.ExecutionList; import com.google.common.util.concurrent.ListenableFuture; @@ -156,7 +156,7 @@ private TaskCancellationMode(boolean mayInterruptIfRunning, boolean interruptSub @Override public String toString() { - return Objects.toStringHelper(this).add("interruptTask", allowedToInterruptTask) + return MoreObjects.toStringHelper(this).add("interruptTask", allowedToInterruptTask) .add("interruptDependentSubmitted", allowedToInterruptDependentSubmittedTasks) .add("interruptAllSubmitted", allowedToInterruptAllSubmittedTasks) .toString(); diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java index 3d673378ea..af2eba1465 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java @@ -39,6 +39,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -299,7 +300,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return Objects.toStringHelper(this).add("type", type).add("entity", entity).toString(); + return MoreObjects.toStringHelper(this).add("type", type).add("entity", entity).toString(); } } diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java index 74050751c4..c84e016bba 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java @@ -59,7 +59,7 @@ import org.testng.annotations.Test; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Stopwatch; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableList; @@ -445,7 +445,7 @@ public void testEffectorTasksGcedForMaxPerTag() throws Exception { } private String taskToVerboseString(Task t) { - return Objects.toStringHelper(t) + return MoreObjects.toStringHelper(t) .add("id", t.getId()) .add("displayName", t.getDisplayName()) .add("submitTime", t.getSubmitTimeUtc()) diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java index 327cea907f..7a407cf163 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java @@ -48,6 +48,7 @@ import org.testng.annotations.Test; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -303,7 +304,7 @@ static class ExpectedFlagConfigKeyAndValueRecord { } @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("flag", flagName) .add("configKey", configKey) .add("flagValue", flagValue.orNull()) diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java index 82524d3974..0ea220add4 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Strings; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -66,7 +67,7 @@ public ExecParams(Map constructorProps, Map props, List @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("constructorProps", constructorProps) .add("props", props) .add("commands", commands) @@ -120,7 +121,7 @@ public static class ExecCmd { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("summaryForLogging", summaryForLogging) .add("commands", commands) .add("env", env) diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java index a6ba3ead71..38494f0ad9 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java @@ -38,7 +38,7 @@ import org.apache.brooklyn.util.text.Strings; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.FluentIterable; @@ -186,7 +186,7 @@ public void close() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("blobStoreContext", context) .add("basedir", containerNameFirstPart) .toString(); 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 efeacc8c3e..a7010833e9 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 @@ -160,6 +160,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -286,7 +287,7 @@ public String toString() { @Override public String toVerboseString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", getId()).add("name", getDisplayName()).add("identity", getIdentity()) .add("description", config().getLocalBag().getDescription()).add("provider", getProvider()) .add("region", getRegion()).add("endpoint", getEndpoint()) diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java index 302f8f5751..127cfc65df 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; @@ -128,7 +128,7 @@ public void rebind() { @Override public String toVerboseString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", getId()).add("name", getDisplayName()) .add("user", getUser()) .add("address", getAddress()) diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/RebindToMachinePredicate.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/RebindToMachinePredicate.java index 5cb6e64a94..0cc0fc2391 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/RebindToMachinePredicate.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/RebindToMachinePredicate.java @@ -23,7 +23,7 @@ import org.jclouds.compute.domain.ComputeMetadata; import org.jclouds.compute.domain.NodeMetadata; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; /** @@ -75,7 +75,7 @@ public boolean apply(ComputeMetadata input) { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("id", rawId) .add("hostname", rawHostname) diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/MaxPoolSizeReachedEvent.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/MaxPoolSizeReachedEvent.java index 6e97771453..a245e681a9 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/MaxPoolSizeReachedEvent.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/MaxPoolSizeReachedEvent.java @@ -20,7 +20,7 @@ import java.io.Serializable; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; public class MaxPoolSizeReachedEvent implements Serializable { private static final long serialVersionUID = 1602627701360505190L; @@ -96,7 +96,7 @@ public long getTimeWindow() { @Override public String toString() { - return Objects.toStringHelper(this).add("maxAllowed", maxAllowed).add("currentPoolSize", currentPoolSize) + return MoreObjects.toStringHelper(this).add("maxAllowed", maxAllowed).add("currentPoolSize", currentPoolSize) .add("currentUnbounded", currentUnbounded).add("maxUnbounded", maxUnbounded) .add("timeWindow", timeWindow).toString(); } diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java index b9c587bf76..d9b2a5bc34 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/SizeHistory.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.util.collections.TimestampedValue; import org.apache.brooklyn.util.time.Duration; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * Using a {@link TimeWindowedList}, tracks the recent history of values to allow a summary of @@ -61,7 +61,7 @@ public WindowSummary(long latest, long min, long max, boolean stableForGrowth, b @Override public String toString() { - return Objects.toStringHelper(this).add("latest", latest).add("min", min).add("max", max) + return MoreObjects.toStringHelper(this).add("latest", latest).add("min", min).add("max", max) .add("stableForGrowth", stableForGrowth).add("stableForShrinking", stableForShrinking).toString(); } } diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/HASensors.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/HASensors.java index 6ba1a08e21..7573338e01 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/HASensors.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/HASensors.java @@ -20,7 +20,7 @@ import org.apache.brooklyn.core.sensor.BasicNotificationSensor; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; public class HASensors { @@ -56,7 +56,7 @@ public String getDescription() { @Override public String toString() { - return Objects.toStringHelper(this).add("component", component).add("description", description).toString(); + return MoreObjects.toStringHelper(this).add("component", component).add("description", description).toString(); } } } diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EffectorSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EffectorSummary.java index daa0e3b337..3e09c73f3f 100644 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EffectorSummary.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/EffectorSummary.java @@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; @@ -96,7 +97,7 @@ public int hashCode() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("name", name) .add("type", type) diff --git a/software/winrm/src/test/java/org/apache/brooklyn/util/core/internal/winrm/RecordingWinRmTool.java b/software/winrm/src/test/java/org/apache/brooklyn/util/core/internal/winrm/RecordingWinRmTool.java index a7f4854f6d..116dc7d56d 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/util/core/internal/winrm/RecordingWinRmTool.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/util/core/internal/winrm/RecordingWinRmTool.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.util.stream.Streams; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -59,7 +59,7 @@ public ExecParams(ExecType type, Map constructorProps, List comman @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("type", type) .add("constructorProps", constructorProps) .add("commands", commands) diff --git a/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestDescriptor.java b/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestDescriptor.java index a274fc7fe1..c81d66c7ee 100644 --- a/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestDescriptor.java +++ b/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestDescriptor.java @@ -29,7 +29,7 @@ import org.apache.commons.io.FileUtils; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * For building up a description of what to measure. @@ -211,7 +211,7 @@ public void seal() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("summary", summary) .add("duration", duration) diff --git a/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestResult.java b/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestResult.java index ee7362eae1..7d3dbb608b 100644 --- a/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestResult.java +++ b/test-support/src/main/java/org/apache/brooklyn/test/performance/PerformanceTestResult.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.util.time.Duration; import com.google.common.annotations.Beta; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; /** * The results of a performance test. @@ -45,7 +45,7 @@ public class PerformanceTestResult { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .omitNullValues() .add("summary", summary) .add("duration", duration) diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/http/HttpToolResponse.java b/utils/common/src/main/java/org/apache/brooklyn/util/http/HttpToolResponse.java index 27dc237017..75b92167cd 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/http/HttpToolResponse.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/http/HttpToolResponse.java @@ -36,7 +36,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -204,7 +204,7 @@ public Maybe getResponse() { @Override public String toString() { - return Objects.toStringHelper(getClass()) + return MoreObjects.toStringHelper(getClass()) .add("responseCode", responseCode) .toString(); } diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/pool/BasicPool.java b/utils/common/src/main/java/org/apache/brooklyn/util/pool/BasicPool.java index 8efa316070..0066b9a681 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/pool/BasicPool.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/pool/BasicPool.java @@ -32,7 +32,7 @@ import com.google.common.base.Function; import com.google.common.base.Functions; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Supplier; @@ -100,7 +100,7 @@ private BasicPool(Builder builder) { @Override public String toString() { - return Objects.toStringHelper(this).add("name", name).toString(); + return MoreObjects.toStringHelper(this).add("name", name).toString(); } @Override diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/MemoryUsageTrackerTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/MemoryUsageTrackerTest.java index fb7fd17f8e..281b289105 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/javalang/MemoryUsageTrackerTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/javalang/MemoryUsageTrackerTest.java @@ -31,7 +31,7 @@ import org.testng.Assert; import org.testng.annotations.Test; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.collect.Range; public class MemoryUsageTrackerTest { @@ -139,7 +139,7 @@ private static class MemoryUsageSummary { } @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("total", Strings.makeSizeString(total)) .add("free", Strings.makeSizeString(free)) .add("used", Strings.makeSizeString(used))