SOLR-971 -- Replace StringBuffer with StringBuilder for instances that do not require thread-safety

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@741262 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -168,6 +168,9 @@ Optimizations
     with reusable priority queue entries to reduce the amount of
     generated garbage during searching.  (Mark Miller via yonik)
 
+ 6. SOLR-971: Replace StringBuffer with StringBuilder for instances that do not require thread-safety.
+    (Kay Kay via shalin)
+
 Bug Fixes
 ----------------------
  1. SOLR-774: Fixed logging level display (Sean Timm via Otis Gospodnetic)

contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataConfig.java

@@ -163,7 +163,7 @@ public class DataConfig {
 
     public Script(Element e) {
       this.language = getStringAttribute(e, "language", "JavaScript");
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       String script = getTxt(e, buffer);
       if (script != null)
         this.script = script.trim();
@@ -268,8 +268,7 @@ public class DataConfig {
     return m;
   }
 
-  public static String getTxt(Node elem, StringBuffer buffer) {
-
+  public static String getTxt(Node elem, StringBuilder buffer) {
     if (elem.getNodeType() != Node.CDATA_SECTION_NODE) {
       NodeList childs = elem.getChildNodes();
       for (int i = 0; i < childs.getLength(); i++) {

contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java

@@ -136,7 +136,7 @@ public class DataImporter {
     }
 
     if (!errors.isEmpty()) {
-      StringBuffer sb = new StringBuffer("There are errors in the Schema\n");
+      StringBuilder sb = new StringBuilder("There are errors in the Schema\n");
       for (String error : errors) {
         sb.append(error).append("\n");
       }

contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java

@@ -129,7 +129,7 @@ public class SqlEntityProcessor extends EntityProcessorBase {
     if(deltaImportQuery != null){
       return resolver.replaceTokens(deltaImportQuery);
     }
-    StringBuffer sb = new StringBuffer(queryString);
+    StringBuilder sb = new StringBuilder(queryString);
     if (SELECT_WHERE_PATTERN.matcher(queryString).find()) {
       sb.append(" and ");
     } else {

contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateString.java

@@ -86,7 +86,7 @@ public class TemplateString {
       s[i] = val == null ? "" : getObjectAsString(val);
     }
 
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < pcs.size(); i++) {
       sb.append(pcs.get(i));
       if (i < s.length) {

contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java

@@ -107,7 +107,7 @@ public class VariableResolverImpl extends VariableResolver {
   private String mergeAll(String[] parts, int i) {
     if (i == parts.length - 1)
       return parts[parts.length - 1];
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int j = i; j < parts.length; j++) {
       sb.append(parts[j]);
       if (j < parts.length - 1)

contrib/javascript/example/reuters/importer/java/org/apache/solr/solrjs/ReutersService.java

@@ -235,7 +235,7 @@ public class ReutersService {
 	 * @throws java.io.IOException
 	 */
 	private static String readFileAsString(File file) throws java.io.IOException {
-        StringBuffer fileData = new StringBuffer(1000);
+        StringBuilder fileData = new StringBuilder(1000);
         BufferedReader reader = new BufferedReader(new FileReader(file));
         char[] buf = new char[1024];
         int numRead=0;

src/common/org/apache/solr/common/util/DOMUtil.java

@@ -287,7 +287,7 @@ public class DOMUtil {
     List<String> propertyRefs = new ArrayList<String>();
     parsePropertyString(value, fragments, propertyRefs);
 
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     Iterator<String> i = fragments.iterator();
     Iterator<String> j = propertyRefs.iterator();
 

src/common/org/apache/solr/common/util/NamedList.java

@@ -198,7 +198,7 @@ public class NamedList<T> implements Cloneable, Serializable, Iterable<Map.Entry
   }
 
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append('{');
     int sz = size();
     for (int i=0; i<sz; i++) {

src/java/org/apache/solr/analysis/BaseCharFilter.java

@@ -63,7 +63,7 @@ public abstract class BaseCharFilter extends CharFilter {
     }
 
     public String toString(){
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       sb.append('(');
       sb.append(pos);
       sb.append(',');

src/java/org/apache/solr/search/ConstantScorePrefixQuery.java

@@ -49,7 +49,7 @@ public class ConstantScorePrefixQuery extends Query {
   /** Prints a user-readable version of this query. */
   public String toString(String field)
   {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!prefix.field().equals(field)) {
       buffer.append(prefix.field());
       buffer.append(":");

src/java/org/apache/solr/util/TestHarness.java

@@ -263,7 +263,7 @@ public class TestHarness {
   public String validateAddDoc(String... fieldsAndValues)
     throws XPathExpressionException, SAXException, IOException {
 
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     buf.append("<add>");
     appendSimpleDoc(buf, fieldsAndValues);
     buf.append("</add>");
@@ -389,10 +389,22 @@ public class TestHarness {
     }
   }
 
+  /**
+   * A helper that adds an xml &lt;doc&gt; containing all of the
+   * fields and values specified (odds are fields, evens are values)
+   * to a StringBuilder
+   */
+  public void appendSimpleDoc(StringBuilder buf, String... fieldsAndValues)
+    throws IOException {
+
+    buf.append(makeSimpleDoc(fieldsAndValues));
+  }
+
   /**
    * A helper that adds an xml &lt;doc&gt; containing all of the
    * fields and values specified (odds are fields, evens are values)
    * to a StringBuffer.
+   * @deprecated see {@link #appendSimpleDoc(StringBuilder, String...)}
    */
   public void appendSimpleDoc(StringBuffer buf, String... fieldsAndValues)
     throws IOException {

src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java

@@ -176,7 +176,7 @@ public class ClientUtils
    * See: http://lucene.apache.org/java/docs/queryparsersyntax.html#Escaping Special Characters
    */
   public static String escapeQueryChars(String s) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
       // These characters are part of the query syntax and must be escaped

src/test/org/apache/solr/analysis/BaseTokenTestCase.java

@@ -34,7 +34,7 @@ import junit.framework.TestCase;
 public abstract class BaseTokenTestCase extends AnalysisTestCase
 {
   public static String tsToString(TokenStream in) throws IOException {
-    StringBuffer out = new StringBuffer();
+    StringBuilder out = new StringBuilder();
     Token t = in.next();
     if (null != t)
       out.append(new String(t.termBuffer(), 0, t.termLength()));

src/test/org/apache/solr/common/util/IteratorChainTest.java

@@ -96,7 +96,7 @@ public class IteratorChainTest extends TestCase {
   
   /** dump the contents of it to a String */
   private String getString(Iterator<String> it) {
-    final StringBuffer sb = new StringBuffer();
+    final StringBuilder sb = new StringBuilder();
     sb.append("");
     while(it.hasNext()) {
       sb.append(it.next());