diff --git a/common/src/main/java/com/genexus/CommonUtil.java b/common/src/main/java/com/genexus/CommonUtil.java index f0383fd3a..c3bec6a30 100644 --- a/common/src/main/java/com/genexus/CommonUtil.java +++ b/common/src/main/java/com/genexus/CommonUtil.java @@ -179,7 +179,7 @@ public Object initialValue() public static String removeAllQuotes(String fileName) { - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); int len = fileName.length(); for (int i = 0; i < len; i++) if (fileName.charAt(i) != '"') @@ -1023,7 +1023,7 @@ public static String strReplace(String s, String subString, String replacement) return s; int index, start, subLength; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); subLength = subString.length(); for (start = 0, index = s.indexOf(subString, start); index >= 0; start = index + subLength, index = s.indexOf(subString, start)) @@ -1080,7 +1080,7 @@ public static String replicate (char character, int size) if (size <= 0) return ""; - StringBuffer ret = new StringBuffer(size); + StringBuilder ret = new StringBuilder(size); for (int i = 0; i < size; i++) { @@ -1095,7 +1095,7 @@ public static String replicate (String character, int size, int a) if (size <= 0) return ""; - StringBuffer ret = new StringBuffer(size); + StringBuilder ret = new StringBuilder(size); for (int i = 0; i < size; i++) { @@ -1218,7 +1218,7 @@ public static long lval(String text) } catch (Exception e) { - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); boolean first = true; int len = text.length(); @@ -1282,8 +1282,8 @@ public static BigDecimal decimalVal(String text, String sDSep) return BigDecimal.ZERO; } - private static StringBuffer extractNumericStringValue(String text, String sDSep) { - StringBuffer out = new StringBuffer(); + private static StringBuilder extractNumericStringValue(String text, String sDSep) { + StringBuilder out = new StringBuilder(); char dSep = (sDSep.length() > 0) ? sDSep.charAt(0) : '.'; boolean point = false; @@ -1861,7 +1861,7 @@ protected static boolean in(String text , char c) public static String getTimeFormat(String time) { - StringBuffer ret = new StringBuffer(time); + StringBuilder ret = new StringBuilder(time); char hora; boolean app = false; char append = ' '; @@ -2337,7 +2337,7 @@ public static boolean contains(Object []arr, Object item) public static String format(String value, String v1, String v2, String v3, String v4, String v5, String v6, String v7, String v8, String v9) { String[] vs = {v1, v2, v3, v4, v5, v6, v7, v8, v9}; - StringBuffer stringBuilder = new StringBuffer(); + StringBuilder stringBuilder = new StringBuilder(); int valueLength = value.length(); if (value != null && !value.equals("")) { @@ -2560,7 +2560,7 @@ public static String strUnexponentString(String num) int point = num.indexOf('.'); int scale = num.length() - (point == -1 ? num.length () : point + 1) - scaleAdj; - StringBuffer val = new StringBuffer(point == -1 ? num : num.substring(0, point) + num.substring (point + 1)); + StringBuilder val = new StringBuilder(point == -1 ? num : num.substring(0, point) + num.substring (point + 1)); // correct for negative scale as per BigDecimal javadoc for(; scale<0; scale++) @@ -2907,7 +2907,7 @@ public static String strori(double val, int digits, int decimals) if (decimals < 0) decimals = 0; if (digits < 0) digits = 0; - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); boolean hasSign = (val < 0); if (hasSign) @@ -3116,7 +3116,7 @@ public static String addLastPathSeparator(String dir) { } public static String quoteString(String in, boolean entities8bit, boolean encodeQuotes) { - StringBuffer out = new StringBuffer(); + StringBuilder out = new StringBuilder(); for (int i = 0; i < in.length(); i++) { char currentChar = in.charAt(i); @@ -3383,7 +3383,7 @@ public final static String hashtable2query(Hashtable hashtable) if (hashtable == null) return null; - StringBuffer qbuf = new StringBuffer(); + StringBuilder qbuf = new StringBuilder(); for (Enumeration en = hashtable.keys(); en.hasMoreElements();) { Object key = en.nextElement(); qbuf.append((key == null ? null : URLEncode((String)key,"UTF-8")) + "=" + diff --git a/common/src/main/java/json/org/json/JSONArray.java b/common/src/main/java/json/org/json/JSONArray.java index 7efc7d7a2..61a16dfe0 100644 --- a/common/src/main/java/json/org/json/JSONArray.java +++ b/common/src/main/java/json/org/json/JSONArray.java @@ -324,7 +324,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) { @@ -820,7 +820,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)); diff --git a/common/src/main/java/json/org/json/JSONObject.java b/common/src/main/java/json/org/json/JSONObject.java index e8cc843ce..7f1eb9d0e 100644 --- a/common/src/main/java/json/org/json/JSONObject.java +++ b/common/src/main/java/json/org/json/JSONObject.java @@ -130,9 +130,7 @@ public String toString() { * The hash map where the JSONObject's properties are kept. */ private HashMap myHashMap; - private ArrayList nameIndexList; - - + private ArrayList nameIndexList; /** * It is sometimes more convenient and less ambiguous to have a @@ -148,7 +146,7 @@ public String toString() { */ public JSONObject() { this.myHashMap = new HashMap<>(); - this.nameIndexList = new ArrayList<>(); + this.nameIndexList = new ArrayList<>(); } @@ -238,9 +236,9 @@ public JSONObject(Map map) { this.myHashMap = (map == null) ? new HashMap<>() : new HashMap<>(map); - this.nameIndexList = (map == null) ? - new ArrayList<>(): - new ArrayList<>(map.keySet()); + this.nameIndexList = (map == null) ? + new ArrayList<>(): + new ArrayList<>(map.keySet()); } @@ -533,7 +531,7 @@ public boolean isNull(String key) { * @return An iterator of the keys. */ public Iterator keys() { - return this.nameIndexList.iterator(); + return this.nameIndexList.iterator(); } @@ -552,7 +550,7 @@ public int length() { */ public void clear() { this.myHashMap.clear(); - this.nameIndexList.clear(); + this.nameIndexList.clear(); } @@ -945,7 +943,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('"'); @@ -993,8 +991,8 @@ public static String quote(String string) { * or null if there was no value. */ public Object remove(String key) { - if (this.nameIndexList.contains(key)) - this.nameIndexList.remove(key); + if (this.nameIndexList.contains(key)) + this.nameIndexList.remove(key); return this.myHashMap.remove(key); } @@ -1055,7 +1053,7 @@ public JSONArray toJSONArray(JSONArray names) throws JSONException { public String toString() { try { Iterator keys = keys(); - StringBuffer sb = new StringBuffer("{"); + StringBuilder sb = new StringBuilder("{"); while (keys.hasNext()) { if (sb.length() > 1) { @@ -1111,7 +1109,7 @@ String toString(int indentFactor, int indent) throws JSONException { return "{}"; } Iterator keys = keys(); - StringBuffer sb = new StringBuffer("{"); + StringBuilder sb = new StringBuilder("{"); int newindent = indent + indentFactor; Object o; if (n == 1) { diff --git a/common/src/main/java/json/org/json/JSONTokener.java b/common/src/main/java/json/org/json/JSONTokener.java index 849ac7967..23070a0c2 100644 --- a/common/src/main/java/json/org/json/JSONTokener.java +++ b/common/src/main/java/json/org/json/JSONTokener.java @@ -209,7 +209,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) { @@ -284,7 +284,7 @@ public String nextTo(char d) { */ public String nextTo(String delimiters) { char c; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (;;) { c = next(); if (delimiters.indexOf(c) >= 0 || c == 0 || @@ -331,7 +331,7 @@ public Object nextValue() throws JSONException { * formatting character. */ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); char b = c; while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) { sb.append(c); diff --git a/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java b/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java index 232d84c81..4ce3ff9e4 100644 --- a/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java +++ b/gxweb/src/main/java/com/genexus/internet/HttpAjaxContext.java @@ -868,7 +868,7 @@ public void ajax_rsp_assign_sdt_attri( String CmpContext, boolean IsMasterPage, { try { JSONObject obj = getGxObject(AttValues, CmpContext, IsMasterPage); - if (obj != null && (dynAjaxEventContext.isParmModified(AttName, SdtObj) || !isUndefinedOutParam( AttName, SdtObj))) + if (obj != null && (!isUndefinedOutParam( AttName, SdtObj) || dynAjaxEventContext.isParmModified(AttName, SdtObj))) { if (SdtObj instanceof IGxJSONAble) obj.put(AttName, ((IGxJSONAble)SdtObj).GetJSONObject()); diff --git a/java/src/main/java/com/genexus/internet/HttpRequestWeb.java b/java/src/main/java/com/genexus/internet/HttpRequestWeb.java index 76519c7c9..ac2ddc532 100644 --- a/java/src/main/java/com/genexus/internet/HttpRequestWeb.java +++ b/java/src/main/java/com/genexus/internet/HttpRequestWeb.java @@ -8,6 +8,7 @@ import com.genexus.PrivateUtilities; import com.genexus.WrapperUtils; import com.genexus.webpanels.HttpContextWeb; +import org.apache.commons.io.IOUtils; public class HttpRequestWeb extends HttpRequest { @@ -63,7 +64,7 @@ public String getString() if (httpContext.getRequest().getCharacterEncoding() != null && httpContext.getRequest().getCharacterEncoding().length() > 0) requestEncoding = httpContext.getRequest().getCharacterEncoding(); - return new String(PrivateUtilities.readToByteArray(is), requestEncoding); + return new String(IOUtils.toByteArray(is), requestEncoding); } catch (IOException e) {