ZOOKEEPER-655. StringBuffer -> StringBuilder - conversion of references as necessary (Kay Kay via henry)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@902690 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -247,6 +247,8 @@ IMPROVEMENTS:
 
   ZOOKEEPER-626. ensure the c/java cli's print xid/sessionid/etc... in hex (pat via mahadev)
 
+  ZOOKEEPER-655. StringBuffer -> StringBuilder - conversion of references as necessary (Kay Kay via henry)
+
 NEW FEATURES:
   ZOOKEEPER-539. generate eclipse project via ant target. (phunt via mahadev)
 

src/contrib/bookkeeper/benchmark/org/apache/bookkeeper/benchmark/MySqlClient.java

@@ -84,7 +84,7 @@ public class MySqlClient {
 	 */
 	public static void main(String[] args) throws ClassNotFoundException, SQLException {		
 		int lenght = Integer.parseInt(args[1]);
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		while(lenght-- > 0){
 			sb.append('a');
 		}

src/contrib/bookkeeper/benchmark/org/apache/bookkeeper/benchmark/TestClient.java

@@ -127,7 +127,7 @@ public class TestClient
     public static void main(String[] args) {
         
         int lenght = Integer.parseInt(args[1]);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         while(lenght-- > 0){
             sb.append('a');
         }
@@ -135,7 +135,7 @@ public class TestClient
         Integer selection = Integer.parseInt(args[0]);
         switch(selection){
         case 0:           
-            StringBuffer servers_sb = new StringBuffer();
+            StringBuilder servers_sb = new StringBuilder();
             for (int i = 4; i < args.length; i++){
                 servers_sb.append(args[i] + " ");
             }

src/java/main/org/apache/jute/CsvInputArchive.java

@@ -50,7 +50,7 @@ class CsvInputArchive implements InputArchive {
     
     private String readField(String tag) throws IOException {
         try {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             while (true) {
                 char c = (char) stream.read();
                 switch (c) {

src/java/main/org/apache/jute/Utils.java

@@ -64,7 +64,7 @@ public class Utils {
         if (s == null)
             return "";
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int idx = 0; idx < s.length(); idx++) {
           char ch = s.charAt(idx);
           if (ch == '<') {
@@ -101,7 +101,7 @@ public class Utils {
      * @return 
      */
     static String fromXMLString(String s) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int idx = 0; idx < s.length();) {
           char ch = s.charAt(idx++);
           if (ch == '%') {
@@ -126,7 +126,7 @@ public class Utils {
         if (s == null)
             return "";
 
-        StringBuffer sb = new StringBuffer(s.length()+1);
+        StringBuilder sb = new StringBuilder(s.length()+1);
         sb.append('\'');
         int len = s.length();
         for (int i = 0; i < len; i++) {
@@ -168,7 +168,7 @@ public class Utils {
             throw new IOException("Error deserializing string.");
         }
         int len = s.length();
-        StringBuffer sb = new StringBuffer(len-1);
+        StringBuilder sb = new StringBuilder(len-1);
         for (int i = 1; i < len; i++) {
             char c = s.charAt(i);
             if (c == '%') {
@@ -198,7 +198,7 @@ public class Utils {
         if (barr == null || barr.length == 0) {
             return "";
         }
-        StringBuffer sb = new StringBuffer(2*barr.length);
+        StringBuilder sb = new StringBuilder(2*barr.length);
         for (int idx = 0; idx < barr.length; idx++) {
             sb.append(Integer.toHexString(barr[idx]));
         }
@@ -235,7 +235,7 @@ public class Utils {
         if (barr == null || barr.length == 0) {
             return "";
         }
-        StringBuffer sb = new StringBuffer(barr.length + 1);
+        StringBuilder sb = new StringBuilder(barr.length + 1);
         sb.append('#');
         for(int idx = 0; idx < barr.length; idx++) {
             sb.append(Integer.toHexString(barr[idx]));

src/java/main/org/apache/jute/XmlOutputArchive.java

@@ -37,7 +37,7 @@ class XmlOutputArchive implements OutputArchive {
     private Stack<String> compoundStack;
     
     private void putIndent() {
-        StringBuffer sb = new StringBuffer("");
+        StringBuilder sb = new StringBuilder("");
         for (int idx = 0; idx < indent; idx++) {
             sb.append("  ");
         }

src/java/main/org/apache/jute/compiler/JBuffer.java

@@ -55,7 +55,7 @@ public class JBuffer extends JCompType {
     }
     
     public String genJavaCompareTo(String fname, String other) {
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       sb.append("    {\n");
       sb.append("      byte[] my = "+fname+";\n");
       sb.append("      byte[] ur = "+other+";\n");
@@ -80,7 +80,7 @@ public class JBuffer extends JCompType {
     }
     
     public String genJavaSlurpBytes(String b, String s, String l) {
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       sb.append("        {\n");
       sb.append("           int i = org.apache.jute.Utils.readVInt("+b+", "+s+");\n");
       sb.append("           int z = WritableUtils.getVIntSize(i);\n");
@@ -90,7 +90,7 @@ public class JBuffer extends JCompType {
     }
     
     public String genJavaCompareBytes() {
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       sb.append("        {\n");
       sb.append("           int i1 = org.apache.jute.Utils.readVInt(b1, s1);\n");
       sb.append("           int i2 = org.apache.jute.Utils.readVInt(b2, s2);\n");

src/java/main/org/apache/jute/compiler/JMap.java

@@ -56,7 +56,7 @@ public class JMap extends JCompType {
     }
     
     public String genJavaReadWrapper(String fname, String tag, boolean decl) {
-        StringBuffer ret = new StringBuffer("");
+        StringBuilder ret = new StringBuilder("");
         if (decl) {
             ret.append("    java.util.TreeMap "+fname+";\n");
         }
@@ -80,7 +80,7 @@ public class JMap extends JCompType {
     }
     
     public String genJavaWriteWrapper(String fname, String tag) {
-        StringBuffer ret = new StringBuffer("    {\n");
+        StringBuilder ret = new StringBuilder("    {\n");
         incrLevel();
         ret.append("      a_.startMap("+fname+",\""+tag+"\");\n");
         ret.append("      java.util.Set "+getId("es")+" = "+fname+".entrySet();\n");

src/java/main/org/apache/jute/compiler/JRecord.java

@@ -73,7 +73,7 @@ public class JRecord extends JCompType {
     }
 
     public String getSignature() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("L").append(mName).append("(");
         for (Iterator<JField> i = mFields.iterator(); i.hasNext();) {
             String s = i.next().getSignature();
@@ -92,7 +92,7 @@ public class JRecord extends JCompType {
     }
 
     public String genJavaReadWrapper(String fname, String tag, boolean decl) {
-        StringBuffer ret = new StringBuffer("");
+        StringBuilder ret = new StringBuilder("");
         if (decl) {
             ret.append("    "+getJavaFQName()+" "+fname+";\n");
         }

src/java/main/org/apache/jute/compiler/JVector.java

@@ -51,7 +51,7 @@ public class JVector extends JCompType {
     }
     
     public String genJavaReadWrapper(String fname, String tag, boolean decl) {
-        StringBuffer ret = new StringBuffer("");
+        StringBuilder ret = new StringBuilder("");
         if (decl) {
             ret.append("      java.util.List "+fname+";\n");
         }
@@ -76,7 +76,7 @@ public class JVector extends JCompType {
     }
     
     public String genJavaWriteWrapper(String fname, String tag) {
-        StringBuffer ret = new StringBuffer("    {\n");
+        StringBuilder ret = new StringBuilder("    {\n");
         incrLevel();
         ret.append("      a_.startVector("+fname+",\""+tag+"\");\n");
         ret.append("      if ("+fname+"!= null) {");

src/java/main/org/apache/zookeeper/ClientCnxn.java

@@ -167,7 +167,7 @@ public class ClientCnxn {
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         SocketAddress local = getLocalSocketAddress();
         SocketAddress remote = getRemoteSocketAddress();
@@ -279,7 +279,7 @@ public class ClientCnxn {
 
         @Override
         public String toString() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
             sb.append("clientPath:" + clientPath);
             sb.append(" serverPath:" + serverPath);

src/java/main/org/apache/zookeeper/ZooKeeperMain.java

@@ -535,7 +535,7 @@ public class ZooKeeperMain {
         // now create the direct children
         // and the stat and quota nodes
         String[] splits = path.split("/");
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(quotaPath);
         for (int i=1; i<splits.length; i++) {
             sb.append("/" + splits[i]);
@@ -791,7 +791,7 @@ public class ZooKeeperMain {
     }
 
     private static String getPermString(int perms) {
-        StringBuffer p = new StringBuffer();
+        StringBuilder p = new StringBuilder();
         if ((perms & ZooDefs.Perms.CREATE) != 0) {
             p.append('c');
         }

src/java/main/org/apache/zookeeper/common/PathTrie.java

@@ -169,7 +169,7 @@ public class PathTrie {
          * for this node
          */
         public String toString() {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append("Children of trienode: ");
             synchronized(children) {
                 for (String str: children.keySet()) {
@@ -259,7 +259,7 @@ public class PathTrie {
         }
         int i = 1;
         String part = null;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         int lastindex = -1;
         while((i < pathComponents.length)) {
             if (parent.getChild(pathComponents[i]) != null) {

src/java/main/org/apache/zookeeper/server/DataTree.java

@@ -1076,7 +1076,7 @@ public class DataTree {
 
     public String dumpEphemerals() {
         Set<Long> keys = ephemerals.keySet();
-        StringBuffer sb = new StringBuffer("Sessions with Ephemerals ("
+        StringBuilder sb = new StringBuilder("Sessions with Ephemerals ("
                 + keys.size() + "):\n");
         for (long k : keys) {
             sb.append("0x" + Long.toHexString(k));

src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java

@@ -333,7 +333,7 @@ public class FinalRequestProcessor implements RequestProcessor {
             // log at error level as we are returning a marshalling
             // error to the user
             LOG.error("Failed to process " + request, e);
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             ByteBuffer bb = request.request;
             bb.rewind();
             while (bb.hasRemaining()) {

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -796,7 +796,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 sendBuffer(ByteBuffer.wrap("ZooKeeper not active \n"
                         .getBytes()));
             } else {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 sb.append("SessionTracker dump: \n");
                 sb.append(zk.sessionTracker.toString()).append("\n");
                 sb.append("ephemeral nodes dump:\n");
@@ -811,7 +811,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                     + sock.socket().getRemoteSocketAddress());
             packetReceived();
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             if (zk != null){
                 sb.append("Zookeeper version: ").append(Version.getFullVersion())
                     .append("\n");
@@ -839,7 +839,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                     + sock.socket().getRemoteSocketAddress());
             packetReceived();
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             if (zk != null){
                 synchronized(factory.cnxns){
                     for(NIOServerCnxn c : factory.cnxns){
@@ -859,7 +859,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                     + sock.socket().getRemoteSocketAddress());
             packetReceived();
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
 
             List<Environment.Entry> env = Environment.list();
 

src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java

@@ -412,7 +412,7 @@ public class PrepRequestProcessor extends Thread implements RequestProcessor {
             // error to the user
             LOG.error("Failed to process " + request, e);
 
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             ByteBuffer bb = request.request;
             if(bb != null){
                 bb.rewind();

src/java/main/org/apache/zookeeper/server/Request.java

@@ -182,7 +182,7 @@ public class Request {
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("sessionid:0x").append(Long.toHexString(sessionId))
             .append(" type:").append(op2String(type))
             .append(" cxid:0x").append(Long.toHexString(cxid))

src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java

@@ -105,7 +105,7 @@ public class SessionTrackerImpl extends Thread implements SessionTracker {
 
     @Override
     synchronized public String toString() {
-        StringBuffer sb = new StringBuffer("Session Sets (")
+        StringBuilder sb = new StringBuilder("Session Sets (")
                 .append(sessionSets.size()).append("):\n");
         ArrayList<Long> keys = new ArrayList<Long>(sessionSets.keySet());
         Collections.sort(keys);

src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java

@@ -43,7 +43,7 @@ public class DigestAuthenticationProvider implements AuthenticationProvider {
     }
 
     static final private String base64Encode(byte b[]) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < b.length;) {
             int pad = 0;
             int v = (b[i++] & 0xff) << 16;

src/java/main/org/apache/zookeeper/server/quorum/Follower.java

@@ -44,7 +44,7 @@ public class Follower extends Learner{
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("Follower ").append(sock);
         sb.append(" lastQueuedZxid:").append(lastQueued);
         sb.append(" pendingRevalidationCount:")

src/java/main/org/apache/zookeeper/server/quorum/Leader.java

@@ -20,7 +20,6 @@ package org.apache.zookeeper.server.quorum;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.StringBuffer;
 import java.net.BindException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -309,7 +308,7 @@ public class Leader {
                 if (self.tick > self.initLimit) {
                     // Followers aren't syncing fast enough,
                     // renounce leadership!
-                    StringBuffer ackToString = new StringBuffer();
+                    StringBuilder ackToString = new StringBuilder();
                     for(Long id : newLeaderProposal.ackSet)
                         ackToString.append(id + ": ");
                     

src/java/main/org/apache/zookeeper/server/quorum/LeaderBean.java

@@ -43,7 +43,7 @@ public class LeaderBean extends ZooKeeperServerBean implements LeaderMXBean {
     }
     
     public String followerInfo() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (LearnerHandler handler : leader.learners) {
             sb.append(handler.toString()).append("\n");
         }

src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java

@@ -91,7 +91,7 @@ public class LearnerHandler extends Thread {
     
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("LearnerHandler ").append(sock);
         sb.append(" tickOfLastAck:").append(tickOfLastAck());
         sb.append(" synced?:").append(synced());

src/java/main/org/apache/zookeeper/server/quorum/Observer.java

@@ -47,7 +47,7 @@ public class Observer extends Learner{
 
     @Override
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("Observer ").append(sock);        
         sb.append(" pendingRevalidationCount:")
             .append(pendingRevalidations.size());

src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java

@@ -553,7 +553,7 @@ public class DataTreeV1 {
 
     public String dumpEphemerals() {
         Set<Long> keys = ephemerals.keySet();
-        StringBuffer sb = new StringBuffer("Sessions with Ephemerals ("
+        StringBuilder sb = new StringBuilder("Sessions with Ephemerals ("
                 + keys.size() + "):\n");
         for (long k : keys) {
             sb.append("0x" + Long.toHexString(k));

src/java/test/org/apache/zookeeper/test/AsyncOps.java

@@ -220,7 +220,7 @@ public class AsyncOps {
         }
         
         public String toString(List<ACL> acls) {
-            StringBuffer result = new StringBuffer();
+            StringBuilder result = new StringBuilder();
             for(ACL acl : acls) {
                 result.append(acl.getPerms() + "::");
             }

src/java/test/org/apache/zookeeper/test/ClientBase.java

@@ -200,7 +200,7 @@ public abstract class ClientBase extends TestCase {
             reader =
                 new BufferedReader(
                         new InputStreamReader(sock.getInputStream()));
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             String line;
             while((line = reader.readLine()) != null) {
                 sb.append(line + "\n");
@@ -456,7 +456,7 @@ public abstract class ClientBase extends TestCase {
     }
 
     private static void logAllStackTraces() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("Starting logAllStackTraces()\n");
         Map<Thread, StackTraceElement[]> threads = Thread.getAllStackTraces();
         for (Entry<Thread, StackTraceElement[]> e: threads.entrySet()) {