Author: jbellis Date: Mon Dec 27 17:24:28 2010 New Revision: 1053113 URL: http://svn.apache.org/viewvc?rev=1053113&view=rev Log: replace ad-hoc toString(Map) w/ guava MapJoiner patch by jbellis
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1053113&r1=1053112&r2=1053113&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Mon Dec 27 17:24:28 2010 @@ -36,6 +36,7 @@ import java.util.concurrent.atomic.Atomi import java.util.concurrent.atomic.AtomicLong; import com.google.common.base.Charsets; +import com.google.common.base.Joiner; import org.apache.commons.collections.iterators.CollatingIterator; import org.apache.commons.lang.ArrayUtils; import org.slf4j.Logger; @@ -643,14 +644,8 @@ public class FBUtilities public static String toString(Map<?,?> map) { - // wtf, why isn't something like this in guava or commons collections? - StringBuilder sb = new StringBuilder("{"); - for (Map.Entry<?,?> entry : map.entrySet()) - { - sb.append(toString(entry.getKey())).append(": ").append(toString(entry.getValue())).append(", "); - } - sb.append("}"); - return sb.toString(); + Joiner.MapJoiner joiner = Joiner.on(",").withKeyValueSeparator(":"); + return joiner.join(map); } /** slow! */