WICKET-6287 Switch from json.org to open-json - 6.x

* Fixed clirr issues
apache · Jan 3, 2017 · a6bf0e2 · a6bf0e2
1 parent 6f76414
commit a6bf0e2
Show file tree

Hide file tree

Showing 16 changed files with 512 additions and 8 deletions.
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/CDL.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/CDL.java
@@ -0,0 +1,53 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class CDL
+{
+
+	public static JSONArray rowToJSONArray(JSONTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String rowToString(JSONArray ja)
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONArray toJSONArray(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONArray toJSONArray(JSONTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONArray toJSONArray(JSONArray names, String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONArray toJSONArray(JSONArray names, JSONTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONArray ja) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONArray names, JSONArray ja) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/Cookie.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/Cookie.java
@@ -0,0 +1,27 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class Cookie
+{
+	public static String escape(String string)
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONObject toJSONObject(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONObject jo) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String unescape(String string)
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/CookieList.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/CookieList.java
@@ -0,0 +1,18 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class CookieList
+{
+
+	public static JSONObject toJSONObject(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONObject jo) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTP.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTP.java
@@ -0,0 +1,20 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class HTTP
+{
+
+	public static final String CRLF = "\r\n";
+
+	public static JSONObject toJSONObject(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONObject jo) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTPTokener.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTPTokener.java
@@ -0,0 +1,19 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class HTTPTokener extends JSONTokener
+{
+
+	public HTTPTokener(String string)
+	{
+		super(string);
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public String nextToken() throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java
@@ -16,10 +16,14 @@
 
 package org.apache.wicket.ajax.json;
 
+import java.io.Writer;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.WicketRuntimeException;
 
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 
@@ -756,4 +760,18 @@ public int hashCode() {
         // diverge from the original, which doesn't implement hashCode
         return values.hashCode();
     }
+
+    // Methods removed due to switch to open-json
+
+    public Writer write(Writer writer){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONArray put(Map map){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONArray put(int integer, Map map){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
 }
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONML.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONML.java
@@ -0,0 +1,38 @@
+package org.apache.wicket.ajax.json;
+
+import org.apache.wicket.WicketRuntimeException;
+
+@SuppressWarnings("javadoc")
+public class JSONML
+{
+
+	public static JSONArray toJSONArray(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONArray toJSONArray(XMLTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONObject toJSONObject(XMLTokener x) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static JSONObject toJSONObject(String string) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONArray ja) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+
+	public static String toString(JSONObject jo) throws JSONException
+	{
+		throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
@@ -19,16 +19,20 @@
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
+import java.io.Writer;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 
+import org.apache.wicket.WicketRuntimeException;
+
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 
 /**
@@ -966,4 +970,62 @@ public static Object wrap(Object o) {
         }
         return null;
     }
+
+    // Methods removed due to switch to open-json
+
+    public Writer write(Writer writer){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public String valueToString(Object object){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public void testValidity(Object object){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public Object stringToValue(String string){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public Writer quote(String string, Writer writer){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject putOnce(String string, Object object){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject put(String string, Map map){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject put(String string, Collection collection){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject increment(String string){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public String[] getNames(Object object){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public String[] getNames(JSONObject jsonObject){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public String doubleToString(double dou){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject(String string, Locale locale){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONObject(Object object, String[] stringarr){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
 }
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java
@@ -58,7 +58,7 @@
  * Item 17, "Design and Document or inheritance or else prohibit it" for further
  * information.
  */
-public class JSONStringer {
+public class JSONStringer extends JSONWriter{
 
     /**
      * The output data, containing at most one top-level array or object.

diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONTokener.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONTokener.java
@@ -19,7 +19,11 @@
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
+import java.util.Collection;
+
+import org.apache.wicket.WicketRuntimeException;
 
 /**
  * Parses a JSON (<a href="http://www.ietf.org/rfc/rfc4627.txt">RFC 4627</a>)
@@ -434,13 +438,13 @@ private JSONArray readArray() throws JSONException {
                     throw syntaxError("Unterminated array");
                 case ']':
                     if (hasTrailingSeparator) {
-                        result.put(null);
+                        result.put((Collection<?>)null);
                     }
                     return result;
                 case ',':
                 case ';':
                     /* A separator without a value first means "null". */
-                    result.put(null);
+                    result.put((Collection<?>)null);
                     hasTrailingSeparator = true;
                     continue;
                 default:
@@ -602,10 +606,12 @@ public String nextTo(char excluded) {
      * input is exhausted.
      *
      * @param thru The string to skip over.
+     * @return boolean 
      */
-    public void skipPast(String thru) {
+    public boolean skipPast(String thru) {
         int thruStart = in.indexOf(thru, pos);
         pos = thruStart == -1 ? in.length() : (thruStart + thru.length());
+        return true;
     }
 
     /**
@@ -655,4 +661,14 @@ public static int dehexchar(char hex) {
             return -1;
         }
     }
+
+    // Methods removed due to switch to open-json
+
+    public boolean end(){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
+
+    public JSONTokener(InputStream inputStream){
+    	throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION);
+    }
 }