%hh sequences to single characters, and
* convert plus to space.
+ *
* @param string A string that may contain
- * + (plus) and
- * %hh sequences.
+ * + (plus) and
+ * %hh sequences.
* @return The unescaped string.
*/
public static String unescape(String string) {
@@ -158,7 +163,7 @@ public class Cookie {
int d = JSONTokener.dehexchar(string.charAt(i + 1));
int e = JSONTokener.dehexchar(string.charAt(i + 2));
if (d >= 0 && e >= 0) {
- c = (char)(d * 16 + e);
+ c = (char) (d * 16 + e);
i += 2;
}
}
diff --git a/src/main/java/ch/m4th1eu/json/CookieList.java b/src/main/java/ch/m4th1eu/json/CookieList.java
index 57388d5..5f558d8 100644
--- a/src/main/java/ch/m4th1eu/json/CookieList.java
+++ b/src/main/java/ch/m4th1eu/json/CookieList.java
@@ -26,6 +26,7 @@ SOFTWARE.
/**
* Convert a web browser cookie list string to a JSONObject and back.
+ *
* @author JSON.org
* @version 2015-12-09
*/
@@ -36,11 +37,12 @@ public class CookieList {
* of name/value pairs. The names are separated from the values by '='.
* The pairs are separated by ';'. The names and the values
* will be unescaped, possibly converting '+' and '%' sequences.
- *
+ * * To add a cookie to a cookie list, * cookielistJSONObject.put(cookieJSONObject.getString("name"), - * cookieJSONObject.getString("value")); - * @param string A cookie list string + * cookieJSONObject.getString("value")); + * + * @param string A cookie list string * @return A JSONObject * @throws JSONException */ @@ -61,12 +63,13 @@ public class CookieList { * of name/value pairs. The names are separated from the values by '='. * The pairs are separated by ';'. The characters '%', '+', '=', and ';' * in the names and values are replaced by "%hh". + * * @param jo A JSONObject * @return A cookie list string * @throws JSONException */ public static String toString(JSONObject jo) throws JSONException { - boolean b = false; + boolean b = false; final StringBuilder sb = new StringBuilder(); // Don't use the new entrySet API to maintain Android support for (final String key : jo.keySet()) { diff --git a/src/main/java/ch/m4th1eu/json/HTTP.java b/src/main/java/ch/m4th1eu/json/HTTP.java index d490cf4..400d275 100644 --- a/src/main/java/ch/m4th1eu/json/HTTP.java +++ b/src/main/java/ch/m4th1eu/json/HTTP.java @@ -28,12 +28,15 @@ import java.util.Locale; /** * Convert an HTTP header to a JSONObject and back. + * * @author JSON.org * @version 2015-12-09 */ public class HTTP { - /** Carriage return/line feed. */ + /** + * Carriage return/line feed. + */ public static final String CRLF = "\r\n"; /** @@ -63,15 +66,16 @@ public class HTTP { * ...} * It does no further checking or conversion. It does not parse dates. * It does not do '%' transforms on URLs. + * * @param string An HTTP header string. * @return A JSONObject containing the elements and attributes * of the XML string. * @throws JSONException */ public static JSONObject toJSONObject(String string) throws JSONException { - JSONObject jo = new JSONObject(); - HTTPTokener x = new HTTPTokener(string); - String token; + JSONObject jo = new JSONObject(); + HTTPTokener x = new HTTPTokener(string); + String token; token = x.nextToken(); if (token.toUpperCase(Locale.ROOT).startsWith("HTTP")) { @@ -119,13 +123,14 @@ public class HTTP { * } * Any other members of the JSONObject will be output as HTTP fields. * The result will end with two CRLF pairs. + * * @param jo A JSONObject * @return An HTTP header string. * @throws JSONException if the object does not contain enough - * information. + * information. */ public static String toString(JSONObject jo) throws JSONException { - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(); if (jo.has("Status-Code") && jo.has("Reason-Phrase")) { sb.append(jo.getString("HTTP-Version")); sb.append(' '); @@ -147,9 +152,9 @@ public class HTTP { // Don't use the new entrySet API to maintain Android support for (final String key : jo.keySet()) { String value = jo.optString(key); - if (!"HTTP-Version".equals(key) && !"Status-Code".equals(key) && + if (!"HTTP-Version".equals(key) && !"Status-Code".equals(key) && !"Reason-Phrase".equals(key) && !"Method".equals(key) && - !"Request-URI".equals(key) && !JSONObject.NULL.equals(value)) { + !"Request-URI".equals(key) && !JSONObject.NULL.equals(value)) { sb.append(key); sb.append(": "); sb.append(jo.optString(key)); diff --git a/src/main/java/ch/m4th1eu/json/HTTPTokener.java b/src/main/java/ch/m4th1eu/json/HTTPTokener.java index 2fcf50f..1a8b9d7 100644 --- a/src/main/java/ch/m4th1eu/json/HTTPTokener.java +++ b/src/main/java/ch/m4th1eu/json/HTTPTokener.java @@ -27,6 +27,7 @@ SOFTWARE. /** * The HTTPTokener extends the JSONTokener to provide additional methods * for the parsing of HTTP headers. + * * @author JSON.org * @version 2015-12-09 */ @@ -34,6 +35,7 @@ public class HTTPTokener extends JSONTokener { /** * Construct an HTTPTokener from a string. + * * @param string A source string. */ public HTTPTokener(String string) { @@ -43,8 +45,9 @@ public class HTTPTokener extends JSONTokener { /** * Get the next token or string. This is used in parsing HTTP headers. - * @throws JSONException + * * @return A String. + * @throws JSONException */ public String nextToken() throws JSONException { char c; @@ -55,7 +58,7 @@ public class HTTPTokener extends JSONTokener { } while (Character.isWhitespace(c)); if (c == '"' || c == '\'') { q = c; - for (;;) { + for (; ; ) { c = next(); if (c < ' ') { throw syntaxError("Unterminated string."); @@ -66,7 +69,7 @@ public class HTTPTokener extends JSONTokener { sb.append(c); } } - for (;;) { + for (; ; ) { if (c == 0 || Character.isWhitespace(c)) { return sb.toString(); } diff --git a/src/main/java/ch/m4th1eu/json/JSONArray.java b/src/main/java/ch/m4th1eu/json/JSONArray.java index a8066de..11462aa 100644 --- a/src/main/java/ch/m4th1eu/json/JSONArray.java +++ b/src/main/java/ch/m4th1eu/json/JSONArray.java @@ -30,11 +30,7 @@ import java.io.Writer; import java.lang.reflect.Array; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -98,17 +94,15 @@ public class JSONArray implements Iterable