From ae4bc51fefeb7a1948186134f59ede821e22f42b Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Mon, 11 Apr 2016 18:23:35 +0500 Subject: [PATCH] Fixing squid:S1149 - Synchronized classes Vector, Hashtable, Stack and StringBuffer should not be used. --- src/main/java/us/monoid/json/CDL.java | 8 ++++---- src/main/java/us/monoid/json/Cookie.java | 6 +++--- src/main/java/us/monoid/json/CookieList.java | 2 +- src/main/java/us/monoid/json/HTTP.java | 2 +- src/main/java/us/monoid/json/HTTPTokener.java | 2 +- src/main/java/us/monoid/json/JSONArray.java | 4 ++-- src/main/java/us/monoid/json/JSONML.java | 4 ++-- src/main/java/us/monoid/json/JSONObject.java | 6 +++--- src/main/java/us/monoid/json/JSONTokener.java | 8 ++++---- src/main/java/us/monoid/json/XML.java | 4 ++-- src/main/java/us/monoid/json/XMLTokener.java | 14 +++++++------- .../us/monoid/web/jp/javacc/ParseException.java | 4 ++-- .../us/monoid/web/jp/javacc/TokenMgrError.java | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/us/monoid/json/CDL.java b/src/main/java/us/monoid/json/CDL.java index 63d3518..89f9dce 100644 --- a/src/main/java/us/monoid/json/CDL.java +++ b/src/main/java/us/monoid/json/CDL.java @@ -55,7 +55,7 @@ public class CDL { private static String getValue(JSONTokener x) throws JSONException { char c; char q; - StringBuffer sb; + StringBuilder sb; do { c = x.next(); } while (c == ' ' || c == '\t'); @@ -65,7 +65,7 @@ private static String getValue(JSONTokener x) throws JSONException { case '"': case '\'': q = c; - sb = new StringBuffer(); + sb = new StringBuilder(); for (;;) { c = x.next(); if (c == q) { @@ -205,7 +205,7 @@ public static JSONArray toJSONArray(JSONArray names, JSONTokener x) * @return A string ending in NEWLINE. */ public static String rowToString(JSONArray ja) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < ja.length(); i += 1) { if (i > 0) { sb.append(','); @@ -267,7 +267,7 @@ public static String toString(JSONArray names, JSONArray ja) if (names == null || names.length() == 0) { return null; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < ja.length(); i += 1) { JSONObject jo = ja.optJSONObject(i); if (jo != null) { diff --git a/src/main/java/us/monoid/json/Cookie.java b/src/main/java/us/monoid/json/Cookie.java index 4301b0f..9ceb569 100644 --- a/src/main/java/us/monoid/json/Cookie.java +++ b/src/main/java/us/monoid/json/Cookie.java @@ -48,7 +48,7 @@ public class Cookie { public static String escape(String string) { char c; String s = string.trim(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int len = s.length(); for (int i = 0; i < len; i += 1) { c = s.charAt(i); @@ -117,7 +117,7 @@ public static JSONObject toJSONObject(String string) throws JSONException { * @throws JSONException */ public static String toString(JSONObject o) throws JSONException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(escape(o.getString("name"))); sb.append("="); @@ -150,7 +150,7 @@ public static String toString(JSONObject o) throws JSONException { */ public static String unescape(String s) { int len = s.length(); - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); for (int i = 0; i < len; ++i) { char c = s.charAt(i); if (c == '+') { diff --git a/src/main/java/us/monoid/json/CookieList.java b/src/main/java/us/monoid/json/CookieList.java index 30e7666..a36f7ed 100644 --- a/src/main/java/us/monoid/json/CookieList.java +++ b/src/main/java/us/monoid/json/CookieList.java @@ -72,7 +72,7 @@ public static String toString(JSONObject o) throws JSONException { boolean b = false; Iterator keys = o.keys(); String s; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (keys.hasNext()) { s = keys.next().toString(); if (!o.isNull(s)) { diff --git a/src/main/java/us/monoid/json/HTTP.java b/src/main/java/us/monoid/json/HTTP.java index f96deaa..de7acc5 100644 --- a/src/main/java/us/monoid/json/HTTP.java +++ b/src/main/java/us/monoid/json/HTTP.java @@ -127,7 +127,7 @@ public static JSONObject toJSONObject(String string) throws JSONException { public static String toString(JSONObject o) throws JSONException { Iterator keys = o.keys(); String s; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (o.has("Status-Code") && o.has("Reason-Phrase")) { sb.append(o.getString("HTTP-Version")); sb.append(' '); diff --git a/src/main/java/us/monoid/json/HTTPTokener.java b/src/main/java/us/monoid/json/HTTPTokener.java index f0952d0..5d998b9 100644 --- a/src/main/java/us/monoid/json/HTTPTokener.java +++ b/src/main/java/us/monoid/json/HTTPTokener.java @@ -50,7 +50,7 @@ public HTTPTokener(String s) { public String nextToken() throws JSONException { char c; char q; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); do { c = next(); } while (Character.isWhitespace(c)); diff --git a/src/main/java/us/monoid/json/JSONArray.java b/src/main/java/us/monoid/json/JSONArray.java index 9d20356..05be7ec 100644 --- a/src/main/java/us/monoid/json/JSONArray.java +++ b/src/main/java/us/monoid/json/JSONArray.java @@ -353,7 +353,7 @@ public boolean isNull(int index) { */ public String join(String separator) throws JSONException { int len = length(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < len; i += 1) { if (i > 0) { @@ -885,7 +885,7 @@ String toString(int indentFactor, int indent) throws JSONException { return "[]"; } int i; - StringBuffer sb = new StringBuffer("["); + StringBuilder sb = new StringBuilder("["); if (len == 1) { sb.append(JSONObject.valueToString(this.myArrayList.get(0), indentFactor, indent)); } else { diff --git a/src/main/java/us/monoid/json/JSONML.java b/src/main/java/us/monoid/json/JSONML.java index e94cfb5..27e0c7e 100644 --- a/src/main/java/us/monoid/json/JSONML.java +++ b/src/main/java/us/monoid/json/JSONML.java @@ -313,7 +313,7 @@ public static String toString(JSONArray ja) throws JSONException { String k; Iterator keys; int length; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String tagName; String v; @@ -390,7 +390,7 @@ public static String toString(JSONArray ja) throws JSONException { * @throws JSONException */ public static String toString(JSONObject jo) throws JSONException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); Object e; int i; JSONArray ja; diff --git a/src/main/java/us/monoid/json/JSONObject.java b/src/main/java/us/monoid/json/JSONObject.java index a8f00e9..7e74ba4 100644 --- a/src/main/java/us/monoid/json/JSONObject.java +++ b/src/main/java/us/monoid/json/JSONObject.java @@ -1591,7 +1591,7 @@ public static String quote(String string) { char c = 0; int i; int len = string.length(); - StringBuffer sb = new StringBuffer(len + 4); + StringBuilder sb = new StringBuilder(len + 4); String t; sb.append('"'); @@ -1785,7 +1785,7 @@ public JSONArray toJSONArray(JSONArray names) throws JSONException { public String toString() { try { Iterator keys = sortedKeys(); - StringBuffer sb = new StringBuffer("{"); + StringBuilder sb = new StringBuilder("{"); while (keys.hasNext()) { if (sb.length() > 1) { @@ -1844,7 +1844,7 @@ String toString(int indentFactor, int indent) throws JSONException { return "{}"; } Iterator keys = sortedKeys(); - StringBuffer sb = new StringBuffer("{"); + StringBuilder sb = new StringBuilder("{"); int newindent = indent + indentFactor; Object o; if (n == 1) { diff --git a/src/main/java/us/monoid/json/JSONTokener.java b/src/main/java/us/monoid/json/JSONTokener.java index 11ffcac..17e5649 100644 --- a/src/main/java/us/monoid/json/JSONTokener.java +++ b/src/main/java/us/monoid/json/JSONTokener.java @@ -239,7 +239,7 @@ public char nextClean() throws JSONException { */ public String nextString(char quote) throws JSONException { char c; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { c = next(); switch (c) { @@ -295,7 +295,7 @@ public String nextString(char quote) throws JSONException { * @return A string. */ public String nextTo(char d) throws JSONException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { char c = next(); if (c == d || c == 0 || c == '\n' || c == '\r') { @@ -317,7 +317,7 @@ public String nextTo(char d) throws JSONException { */ public String nextTo(String delimiters) throws JSONException { char c; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { c = next(); if (delimiters.indexOf(c) >= 0 || c == 0 || @@ -365,7 +365,7 @@ public Object nextValue() throws JSONException { * formatting character. */ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) { sb.append(c); c = next(); diff --git a/src/main/java/us/monoid/json/XML.java b/src/main/java/us/monoid/json/XML.java index 291e9ca..7edc3a5 100644 --- a/src/main/java/us/monoid/json/XML.java +++ b/src/main/java/us/monoid/json/XML.java @@ -74,7 +74,7 @@ public class XML { * @return The escaped string. */ public static String escape(String string) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0, len = string.length(); i < len; i++) { char c = string.charAt(i); switch (c) { @@ -329,7 +329,7 @@ public static String toString(Object o) throws JSONException { */ public static String toString(Object o, String tagName) throws JSONException { - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); int i; JSONArray ja; JSONObject jo; diff --git a/src/main/java/us/monoid/json/XMLTokener.java b/src/main/java/us/monoid/json/XMLTokener.java index 10e5467..11a205a 100644 --- a/src/main/java/us/monoid/json/XMLTokener.java +++ b/src/main/java/us/monoid/json/XMLTokener.java @@ -64,7 +64,7 @@ public XMLTokener(String s) { public String nextCDATA() throws JSONException { char c; int i; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { c = next(); if (end()) { @@ -92,7 +92,7 @@ public String nextCDATA() throws JSONException { */ public Object nextContent() throws JSONException { char c; - StringBuffer sb; + StringBuilder sb; do { c = next(); } while (Character.isWhitespace(c)); @@ -102,7 +102,7 @@ public Object nextContent() throws JSONException { if (c == '<') { return XML.LT; } - sb = new StringBuffer(); + sb = new StringBuilder(); for (;;) { if (c == '<' || c == 0) { back(); @@ -126,7 +126,7 @@ public Object nextContent() throws JSONException { * @throws JSONException If missing ';' in XML entity. */ public Object nextEntity(char a) throws JSONException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { char c = next(); if (Character.isLetterOrDigit(c) || c == '#') { @@ -220,7 +220,7 @@ public Object nextMeta() throws JSONException { public Object nextToken() throws JSONException { char c; char q; - StringBuffer sb; + StringBuilder sb; do { c = next(); } while (Character.isWhitespace(c)); @@ -245,7 +245,7 @@ public Object nextToken() throws JSONException { case '"': case '\'': q = c; - sb = new StringBuffer(); + sb = new StringBuilder(); for (;;) { c = next(); if (c == 0) { @@ -264,7 +264,7 @@ public Object nextToken() throws JSONException { // Name - sb = new StringBuffer(); + sb = new StringBuilder(); for (;;) { sb.append(c); c = next(); diff --git a/src/main/java/us/monoid/web/jp/javacc/ParseException.java b/src/main/java/us/monoid/web/jp/javacc/ParseException.java index 0520528..ed75501 100644 --- a/src/main/java/us/monoid/web/jp/javacc/ParseException.java +++ b/src/main/java/us/monoid/web/jp/javacc/ParseException.java @@ -89,7 +89,7 @@ private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); - StringBuffer expected = new StringBuffer(); + StringBuilder expected = new StringBuilder(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { if (maxSize < expectedTokenSequences[i].length) { @@ -139,7 +139,7 @@ private static String initialise(Token currentToken, * string literal. */ static String add_escapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) diff --git a/src/main/java/us/monoid/web/jp/javacc/TokenMgrError.java b/src/main/java/us/monoid/web/jp/javacc/TokenMgrError.java index 84dfd1f..5f277f9 100644 --- a/src/main/java/us/monoid/web/jp/javacc/TokenMgrError.java +++ b/src/main/java/us/monoid/web/jp/javacc/TokenMgrError.java @@ -48,7 +48,7 @@ public class TokenMgrError extends Error * equivalents in the given string */ protected static final String addEscapes(String str) { - StringBuffer retval = new StringBuffer(); + StringBuilder retval = new StringBuilder(); char ch; for (int i = 0; i < str.length(); i++) { switch (str.charAt(i))