HADOOP-14382 Remove usages of MoreObjects.toStringHelper. Contributed by Andrew Wang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e6bbd04 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e6bbd04 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e6bbd04 Branch: refs/heads/HDFS-10467 Commit: 4e6bbd049dead7008942bda09dfd54542c407f48 Parents: 97c2e57 Author: Steve Loughran <ste...@apache.org> Authored: Fri May 5 13:03:09 2017 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri May 5 13:03:09 2017 +0100 ---------------------------------------------------------------------- .../apache/hadoop/metrics2/AbstractMetric.java | 16 +++++++++------- .../org/apache/hadoop/metrics2/MetricsTag.java | 13 +++++++------ .../metrics2/impl/AbstractMetricsRecord.java | 16 ++++++++-------- .../org/apache/hadoop/metrics2/impl/MsInfo.java | 9 +++++---- .../hadoop/metrics2/lib/MetricsInfoImpl.java | 11 +++++++---- .../hadoop/metrics2/lib/MetricsRegistry.java | 20 +++++++++++--------- .../hadoop/metrics2/source/JvmMetricsInfo.java | 9 +++++---- .../hadoop/metrics2/util/MetricsCache.java | 18 +++++++++--------- .../hadoop/metrics2/impl/TestKafkaMetrics.java | 8 +++++--- 9 files changed, 66 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java index 0605156..e2574f6 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/AbstractMetric.java @@ -18,13 +18,14 @@ package org.apache.hadoop.metrics2; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.*; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import java.util.StringJoiner; + +import static com.google.common.base.Preconditions.checkNotNull; + /** * The immutable metric */ @@ -84,10 +85,11 @@ public abstract class AbstractMetric implements MetricsInfo { return Objects.hashCode(info, value()); } - @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("info", info) - .add("value", value()) + @Override + public String toString() { + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("info=" + info) + .add("value=" + value()) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java index 68b0737..db8a5d9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsTag.java @@ -18,13 +18,14 @@ package org.apache.hadoop.metrics2; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.*; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; +import java.util.StringJoiner; + +import static com.google.common.base.Preconditions.checkNotNull; + /** * Immutable tag for metrics (for grouping on host/queue/username etc.) */ @@ -81,9 +82,9 @@ public class MetricsTag implements MetricsInfo { } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("info", info) - .add("value", value()) + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("info=" + info) + .add("value=" + value()) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java index fec29c2..a4632c6 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java @@ -18,12 +18,12 @@ package org.apache.hadoop.metrics2.impl; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Iterables; - import org.apache.hadoop.metrics2.MetricsRecord; +import java.util.StringJoiner; + abstract class AbstractMetricsRecord implements MetricsRecord { @Override public boolean equals(Object obj) { @@ -44,12 +44,12 @@ abstract class AbstractMetricsRecord implements MetricsRecord { } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("timestamp", timestamp()) - .add("name", name()) - .add("description", description()) - .add("tags", tags()) - .add("metrics", Iterables.toString(metrics())) + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("timestamp=" + timestamp()) + .add("name=" + name()) + .add("description=" + description()) + .add("tags=" + tags()) + .add("metrics=" + Iterables.toString(metrics())) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java index 5de7edc..0bf5c78 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java @@ -18,11 +18,11 @@ package org.apache.hadoop.metrics2.impl; -import com.google.common.base.MoreObjects; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; +import java.util.StringJoiner; + /** * Metrics system related metrics info instances */ @@ -48,8 +48,9 @@ public enum MsInfo implements MetricsInfo { } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("name", name()).add("description", desc) + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("name=" + name()) + .add("description=" + desc) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java index 054f211..e3adc82 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java @@ -18,11 +18,13 @@ package org.apache.hadoop.metrics2.lib; -import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import static com.google.common.base.Preconditions.*; import org.apache.hadoop.metrics2.MetricsInfo; +import java.util.StringJoiner; + +import static com.google.common.base.Preconditions.checkNotNull; + /** * Making implementing metric info a little easier */ @@ -56,8 +58,9 @@ class MetricsInfoImpl implements MetricsInfo { } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("name", name).add("description", description) + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("name=" + name) + .add("description=" + description) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java index 7070869..9727954 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java @@ -18,20 +18,19 @@ package org.apache.hadoop.metrics2.lib; -import java.util.Collection; -import java.util.Map; - import com.google.common.collect.Maps; -import com.google.common.base.MoreObjects; - import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsException; +import org.apache.hadoop.metrics2.MetricsInfo; import org.apache.hadoop.metrics2.MetricsRecordBuilder; import org.apache.hadoop.metrics2.MetricsTag; import org.apache.hadoop.metrics2.impl.MsInfo; +import java.util.Collection; +import java.util.Map; +import java.util.StringJoiner; + /** * An optional metrics registry class for creating and maintaining a * collection of MetricsMutables, making writing metrics source easier. @@ -440,9 +439,12 @@ public class MetricsRegistry { } } - @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("info", metricsInfo).add("tags", tags()).add("metrics", metrics()) + @Override + public String toString() { + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("info=" + metricsInfo.toString()) + .add("tags=" + tags()) + .add("metrics=" + metrics()) .toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java index 59a79fd..8da6785 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java @@ -21,7 +21,7 @@ package org.apache.hadoop.metrics2.source; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.metrics2.MetricsInfo; -import com.google.common.base.MoreObjects; +import java.util.StringJoiner; /** * JVM and logging related metrics info instances @@ -60,8 +60,9 @@ public enum JvmMetricsInfo implements MetricsInfo { @Override public String description() { return desc; } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("name", name()).add("description", desc) - .toString(); + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("name=" + name()) + .add("description=" + desc) + .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java index 753e307..cfd126c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/util/MetricsCache.java @@ -18,11 +18,7 @@ package org.apache.hadoop.metrics2.util; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; @@ -31,8 +27,11 @@ import org.apache.hadoop.metrics2.AbstractMetric; import org.apache.hadoop.metrics2.MetricsRecord; import org.apache.hadoop.metrics2.MetricsTag; -import com.google.common.base.MoreObjects; -import com.google.common.collect.Maps; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.StringJoiner; /** * A metrics cache for sinks that don't support sparse updates. @@ -127,8 +126,9 @@ public class MetricsCache { } @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("tags", tags).add("metrics", metrics) + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("tags=" + tags) + .add("metrics=" + metrics) .toString(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e6bbd04/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java index bee6aaa..cd40ac8 100644 --- a/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java +++ b/hadoop-tools/hadoop-kafka/src/test/java/org/apache/hadoop/metrics2/impl/TestKafkaMetrics.java @@ -18,7 +18,6 @@ package org.apache.hadoop.metrics2.impl; -import com.google.common.base.MoreObjects; import com.google.common.collect.Lists; import org.apache.commons.configuration2.SubsetConfiguration; import org.apache.hadoop.metrics2.AbstractMetric; @@ -40,6 +39,7 @@ import org.slf4j.LoggerFactory; import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.StringJoiner; import java.util.concurrent.Future; import static org.junit.Assert.assertEquals; @@ -74,8 +74,10 @@ public class TestKafkaMetrics { @Override public String toString() { - return MoreObjects.toStringHelper(this).add("name", name()) - .add("description", desc).toString(); + return new StringJoiner(", ", this.getClass().getSimpleName() + "{", "}") + .add("name=" + name()) + .add("description=" + desc) + .toString(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org