Pool StringBuilders, close #777

Author: Stephane Landelle

src/main/java/com/ning/http/client/FluentCaseInsensitiveStringsMap.java

@@ -18,6 +18,8 @@
 
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 
+import com.ning.http.util.StringUtils;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -397,7 +399,7 @@ public String getJoinedValue(String key, String delimiter) {
         } else if (values.size() == 1) {
             return values.get(0);
         } else {
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = StringUtils.stringBuilder();
 
             for (String value : values) {
                 if (result.length() > 0) {
@@ -456,7 +458,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        StringBuilder result = new StringBuilder();
+        StringBuilder result = StringUtils.stringBuilder();
 
         for (Map.Entry<String, List<String>> entry : values.entrySet()) {
             if (result.length() > 0) {

src/main/java/com/ning/http/client/FluentStringsMap.java

@@ -18,6 +18,8 @@
 
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 
+import com.ning.http.util.StringUtils;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -335,7 +337,7 @@ public String getJoinedValue(String key, String delimiter) {
         } else if (values.size() == 1) {
             return values.get(0);
         } else {
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = StringUtils.stringBuilder();
 
             for (String value : values) {
                 if (result.length() > 0) {
@@ -406,7 +408,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        StringBuilder result = new StringBuilder();
+        StringBuilder result = StringUtils.stringBuilder();
 
         for (Map.Entry<String, List<String>> entry : values.entrySet()) {
             if (result.length() > 0) {

src/main/java/com/ning/http/client/Realm.java

@@ -21,6 +21,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.ning.http.client.uri.Uri;
+import com.ning.http.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
@@ -560,7 +561,8 @@ private void newResponse() throws UnsupportedEncodingException {
             } catch (NoSuchAlgorithmException e) {
                 throw new SecurityException(e);
             }
-            md.update(new StringBuilder(principal)
+            md.update(StringUtils.stringBuilder()
+                    .append(principal)
                     .append(":")
                     .append(realmName)
                     .append(":")
@@ -571,21 +573,24 @@ private void newResponse() throws UnsupportedEncodingException {
             md.reset();
 
             //HA2 if qop is auth-int is methodName:url:md5(entityBody)
-            md.update(new StringBuilder(methodName)
+            md.update(StringUtils.stringBuilder()
+                    .append(methodName)
                     .append(':')
                     .append(uri).toString().getBytes(ISO_8859_1));
             byte[] ha2 = md.digest();
 
             if(qop==null || qop.equals("")) {
-                 md.update(new StringBuilder(toBase16(ha1))
+                 md.update(StringUtils.stringBuilder()
+                    .append(toBase16(ha1))
                     .append(':')
                     .append(nonce)
                     .append(':')
                     .append(toBase16(ha2)).toString().getBytes(ISO_8859_1));
 
              } else {
                  //qop ="auth" or "auth-int"
-                 md.update(new StringBuilder(toBase16(ha1))
+                 md.update(StringUtils.stringBuilder()
+                    .append(toBase16(ha1))
                     .append(':')
                     .append(nonce)
                     .append(':')
@@ -604,7 +609,7 @@ private void newResponse() throws UnsupportedEncodingException {
         }
 
         private static String toHexString(byte[] data) {
-            StringBuilder buffer = new StringBuilder();
+            StringBuilder buffer = StringUtils.stringBuilder();
             for (int i = 0; i < data.length; i++) {
                 buffer.append(Integer.toHexString((data[i] & 0xf0) >>> 4));
                 buffer.append(Integer.toHexString(data[i] & 0x0f));
@@ -614,7 +619,7 @@ private static String toHexString(byte[] data) {
 
         private static String toBase16(byte[] bytes) {
             int base = 16;
-            StringBuilder buf = new StringBuilder();
+            StringBuilder buf = StringUtils.stringBuilder();
             for (byte b : bytes) {
                 int bi = 0xff & b;
                 int c = '0' + (bi / base) % base;

src/main/java/com/ning/http/client/RequestBuilderBase.java

@@ -25,6 +25,7 @@
 import com.ning.http.client.uri.Uri;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.QueryComputer;
+import com.ning.http.util.StringUtils;
 
 import java.io.File;
 import java.io.InputStream;
@@ -218,7 +219,7 @@ public List<Param> getQueryParams() {
 
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder(getUrl());
+            StringBuilder sb = StringUtils.stringBuilder().append(getUrl());
 
             sb.append("\t");
             sb.append(method);

src/main/java/com/ning/http/client/cookie/Cookie.java

@@ -12,6 +12,8 @@
  */
 package com.ning.http.client.cookie;
 
+import com.ning.http.util.StringUtils;
+
 public class Cookie {
 
     public static Cookie newValidCookie(String name, String value, String domain, String rawValue, String path, long expires, int maxAge, boolean secure, boolean httpOnly) {
@@ -142,7 +144,7 @@ public boolean isHttpOnly() {
 
     @Override
     public String toString() {
-        StringBuilder buf = new StringBuilder();
+        StringBuilder buf = StringUtils.stringBuilder();
         buf.append(name);
         buf.append("=");
         buf.append(rawValue);

src/main/java/com/ning/http/client/cookie/CookieDecoder.java

@@ -14,6 +14,7 @@
 
 import com.ning.http.client.date.CalendarTimeConverter;
 import com.ning.http.client.date.TimeConverter;
+import com.ning.http.util.StringUtils;
 
 public class CookieDecoder {
 
@@ -92,7 +93,7 @@ public static Cookie decode(String header, TimeConverter timeConverter) {
                         char c = header.charAt(i);
                         if (c == '"' || c == '\'') {
                             // NAME="VALUE" or NAME='VALUE'
-                            StringBuilder newValueBuf = new StringBuilder(header.length() - i);
+                            StringBuilder newValueBuf = StringUtils.stringBuilder();
 
                             int rawValueStart = i;
                             int rawValueEnd = i;

src/main/java/com/ning/http/client/cookie/CookieEncoder.java

@@ -12,6 +12,8 @@
  */
 package com.ning.http.client.cookie;
 
+import com.ning.http.util.StringUtils;
+
 import java.util.Collection;
 
 public final class CookieEncoder {
@@ -20,7 +22,7 @@ private CookieEncoder() {
     }
 
     public static String encode(Collection<Cookie> cookies) {
-        StringBuilder sb = new StringBuilder();
+        StringBuilder sb = StringUtils.stringBuilder();
 
         for (Cookie cookie : cookies) {
             add(sb, cookie.getName(), cookie.getRawValue());

src/main/java/com/ning/http/client/multipart/AbstractFilePart.java

@@ -14,6 +14,8 @@
 
 import static java.nio.charset.StandardCharsets.*;
 
+import com.ning.http.util.StringUtils;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -112,7 +114,7 @@ public String getFileName() {
 
     @Override
     public String toString() {
-        return new StringBuilder()//
+        return StringUtils.stringBuilder()//
                 .append(super.toString())//
                 .append(" filename=").append(fileName)//
                 .toString();

src/main/java/com/ning/http/client/multipart/MultipartUtils.java

@@ -16,12 +16,13 @@
 package com.ning.http.client.multipart;
 
 import static java.nio.charset.StandardCharsets.*;
-
 import static com.ning.http.client.multipart.Part.CRLF_BYTES;
 import static com.ning.http.client.multipart.Part.EXTRA_BYTES;
 import static com.ning.http.util.MiscUtils.isNonEmpty;
 
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
+import com.ning.http.util.StringUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -101,7 +102,7 @@ private static byte[] generateMultipartBoundary() {
     }
 
     private static String computeContentType(String base, byte[] multipartBoundary) {
-        StringBuilder buffer = new StringBuilder(base);
+        StringBuilder buffer = StringUtils.stringBuilder().append(base);
         if (!base.endsWith(";"))
             buffer.append(";");
         return buffer.append(" boundary=").append(new String(multipartBoundary, US_ASCII)).toString();

src/main/java/com/ning/http/client/multipart/PartBase.java

@@ -14,6 +14,8 @@
 
 import static java.nio.charset.StandardCharsets.*;
 
+import com.ning.http.util.StringUtils;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
@@ -187,7 +189,7 @@ public long length(byte[] boundary) {
     }
 
     public String toString() {
-        return new StringBuilder()//
+        return StringUtils.stringBuilder()//
                 .append(getClass().getSimpleName())//
                 .append(" name=").append(getName())//
                 .append(" contentType=").append(getContentType())//

src/main/java/com/ning/http/client/oauth/ConsumerKey.java

@@ -16,6 +16,8 @@
  */
 package com.ning.http.client.oauth;
 
+import com.ning.http.util.StringUtils;
+
 /**
  * Value class for OAuth consumer keys.
  */
@@ -38,7 +40,7 @@ public String getSecret() {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("{Consumer key, key=");
+        StringBuilder sb = StringUtils.stringBuilder().append("{Consumer key, key=");
         appendValue(sb, key);
         sb.append(", secret=");
         appendValue(sb, secret);

src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java

@@ -25,6 +25,7 @@
 import com.ning.http.client.SignatureCalculator;
 import com.ning.http.client.uri.Uri;
 import com.ning.http.util.Base64;
+import com.ning.http.util.StringUtils;
 import com.ning.http.util.UTF8UrlEncoder;
 
 import java.util.ArrayList;
@@ -95,7 +96,7 @@ public void calculateAndAddSignature(Request request, RequestBuilderBase<?> requ
      */
     public String calculateSignature(String method, Uri uri, long oauthTimestamp, String nonce,
                                      List<Param> formParams, List<Param> queryParams) {
-        StringBuilder signedText = new StringBuilder(100);
+        StringBuilder signedText = StringUtils.stringBuilder();
         signedText.append(method); // POST / GET etc (nothing to URL encode)
         signedText.append('&');
 
@@ -111,7 +112,7 @@ else if (scheme.equals("https"))
             if (port == 443)
                 port = -1;
 
-        StringBuilder sb = new StringBuilder().append(scheme).append("://").append(uri.getHost());
+        StringBuilder sb = StringUtils.stringBuilder().append(scheme).append("://").append(uri.getHost());
         if (port != -1)
             sb.append(':').append(port);
         if (isNonEmpty(uri.getPath()))
@@ -162,7 +163,7 @@ else if (scheme.equals("https"))
      * Method used for constructing
      */
     public String constructAuthHeader(String signature, String nonce, long oauthTimestamp) {
-        StringBuilder sb = new StringBuilder(200);
+        StringBuilder sb = StringUtils.stringBuilder();
         sb.append("OAuth ");
         sb.append(KEY_OAUTH_CONSUMER_KEY).append("=\"").append(consumerAuth.getKey()).append("\", ");
         if (userAuth.getKey() != null) {
@@ -217,7 +218,7 @@ public String sortAndConcat() {
             Arrays.sort(params);
 
             // and build parameter section using pre-encoded pieces:
-            StringBuilder encodedParams = new StringBuilder(100);
+            StringBuilder encodedParams = StringUtils.stringBuilder();
             for (Parameter param : params) {
                 if (encodedParams.length() > 0) {
                     encodedParams.append('&');

src/main/java/com/ning/http/client/oauth/RequestToken.java

@@ -16,6 +16,8 @@
  */
 package com.ning.http.client.oauth;
 
+import com.ning.http.util.StringUtils;
+
 /**
  * Value class used for OAuth tokens (request secret, access secret);
  * simple container with two parts, public id part ("key") and
@@ -40,7 +42,7 @@ public String getSecret() {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("{ key=");
+        StringBuilder sb = StringUtils.stringBuilder().append("{ key=");
         appendValue(sb, key);
         sb.append(", secret=");
         appendValue(sb, secret);

src/main/java/com/ning/http/client/oauth/ThreadSafeHMAC.java

@@ -18,6 +18,7 @@
 
 import static java.nio.charset.StandardCharsets.*;
 
+import com.ning.http.util.StringUtils;
 import com.ning.http.util.UTF8UrlEncoder;
 
 import javax.crypto.Mac;
@@ -38,7 +39,7 @@ public class ThreadSafeHMAC {
     private final Mac mac;
 
     public ThreadSafeHMAC(ConsumerKey consumerAuth, RequestToken userAuth) {
-        StringBuilder sb = new StringBuilder(consumerAuth.getSecret().length() + userAuth.getSecret().length() + 16);
+        StringBuilder sb =StringUtils.stringBuilder();
         UTF8UrlEncoder.appendEncoded(sb, consumerAuth.getSecret());
         sb.append('&');
         UTF8UrlEncoder.appendEncoded(sb, userAuth.getSecret());

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -119,6 +119,7 @@
 import com.ning.http.util.AuthenticatorUtils;
 import com.ning.http.util.ProxyUtils;
 import com.ning.http.util.SslUtils;
+import com.ning.http.util.StringUtils;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
@@ -1064,7 +1065,7 @@ private void addCookies(final Request request,
 
             final Collection<Cookie> cookies = request.getCookies();
             if (isNonEmpty(cookies)) {
-                StringBuilder sb = new StringBuilder(128);
+                StringBuilder sb = StringUtils.stringBuilder();
                 org.glassfish.grizzly.http.Cookie[] gCookies =
                         new org.glassfish.grizzly.http.Cookie[cookies.size()];
                 convertCookies(cookies, gCookies);
@@ -2011,7 +2012,7 @@ public boolean doHandle(final FilterChainContext ctx,
             }
 
             if (isNonEmpty(request.getFormParams())) {
-                StringBuilder sb = new StringBuilder(128);
+                StringBuilder sb = StringUtils.stringBuilder();
                 for (Param param : request.getFormParams()) {
                     String name = URLEncoder.encode(param.getName(), charset);
                     String value = URLEncoder.encode(param.getValue(), charset);

src/main/java/com/ning/http/client/providers/jdk/MultipartRequestEntity.java

@@ -22,6 +22,7 @@
 import com.ning.http.client.multipart.MultipartUtils;
 import com.ning.http.client.multipart.Part;
 import com.ning.http.client.multipart.RequestEntity;
+import com.ning.http.util.StringUtils;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -99,7 +100,7 @@ public MultipartRequestEntity(List<Part> parts, FluentCaseInsensitiveStringsMap
     }
 
     private String computeContentType(String base) {
-    	StringBuilder buffer = new StringBuilder(base);
+    	StringBuilder buffer = StringUtils.stringBuilder().append(base);
 		if (!base.endsWith(";"))
 			buffer.append(";");
         return buffer.append(" boundary=").append(new String(multipartBoundary, US_ASCII)).toString();