WICKET-6287 Switch from json.org to open-json - 7.x * Fixed clirr issues
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5348b3e0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5348b3e0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5348b3e0 Branch: refs/heads/wicket-7.x Commit: 5348b3e00518e5636126e724f1e62ea1aebbd8b6 Parents: 6b1d53b Author: Tobias Soloschenko <[email protected]> Authored: Wed Dec 7 12:11:37 2016 +0100 Committer: Tobias Soloschenko <[email protected]> Committed: Tue Jan 3 17:51:08 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/ajax/json/CDL.java | 53 +++++++++++++++ .../org/apache/wicket/ajax/json/Cookie.java | 27 ++++++++ .../org/apache/wicket/ajax/json/CookieList.java | 18 +++++ .../java/org/apache/wicket/ajax/json/HTTP.java | 20 ++++++ .../apache/wicket/ajax/json/HTTPTokener.java | 19 ++++++ .../org/apache/wicket/ajax/json/JSONArray.java | 18 +++++ .../org/apache/wicket/ajax/json/JSONML.java | 38 +++++++++++ .../org/apache/wicket/ajax/json/JSONObject.java | 62 ++++++++++++++++++ .../apache/wicket/ajax/json/JSONStringer.java | 2 +- .../apache/wicket/ajax/json/JSONTokener.java | 22 ++++++- .../org/apache/wicket/ajax/json/JSONWriter.java | 69 ++++++++++++++++++++ .../apache/wicket/ajax/json/JsonConstants.java | 15 +++++ .../wicket/ajax/json/JsonSequenceStringer.java | 35 ++++++++++ .../java/org/apache/wicket/ajax/json/README | 10 +-- .../java/org/apache/wicket/ajax/json/XML.java | 56 ++++++++++++++++ .../org/apache/wicket/ajax/json/XMLTokener.java | 56 ++++++++++++++++ 16 files changed, 512 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/CDL.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..772f564 --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/Cookie.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..0f7a20b --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/CookieList.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..4cb8398 --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTP.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..13b17eb --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/HTTPTokener.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..8920885 --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONArray.java ---------------------------------------------------------------------- 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 index 65279d8..081686d 100644 --- 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 class JSONArray { // 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); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONML.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..437cafa --- /dev/null +++ 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); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java ---------------------------------------------------------------------- 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 index 67dfa75..3f94a86 100644 --- 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 @@ package org.apache.wicket.ajax.json; 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 class JSONObject { } 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); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONStringer.java ---------------------------------------------------------------------- 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 index 431af66..5085995 100644 --- 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 @@ import java.util.List; * 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. http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONTokener.java ---------------------------------------------------------------------- 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 index 58a46d9..bc3e68a 100644 --- 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 @@ package org.apache.wicket.ajax.json; // 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 @@ public class JSONTokener { 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 class JSONTokener { * 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 class JSONTokener { 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); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONWriter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONWriter.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONWriter.java new file mode 100644 index 0000000..1079628 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONWriter.java @@ -0,0 +1,69 @@ +package org.apache.wicket.ajax.json; + +import java.io.Writer; + +import org.apache.wicket.WicketRuntimeException; + +@SuppressWarnings("javadoc") +public class JSONWriter +{ + + protected char mode; + + protected Writer writer; + + public JSONWriter(){ + // NOOP - required by JSONStringer for clirr checks + } + + public JSONWriter(Writer w) + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter array() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter endArray() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter endObject() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter key(String string) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter object() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + + public JSONWriter value(boolean b) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter value(double d) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter value(long l) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public JSONWriter value(Object object) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonConstants.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonConstants.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonConstants.java new file mode 100644 index 0000000..64da627 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonConstants.java @@ -0,0 +1,15 @@ +package org.apache.wicket.ajax.json; + +/** + * This class is used to provide a unified constant information like exceptions + * + * @author Tobias Soloschenko + * + */ +public class JsonConstants +{ + /** + * Exception message for unsupported JSON function calls + */ + public static final String OPEN_JSON_EXCEPTION = "This call is not supported any longer, because of the change to open-json (https://github.com/tdunning/open-json) due to license issues. (See https://www.apache.org/legal/resolved#category-x)"; +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java new file mode 100644 index 0000000..9207a37 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JsonSequenceStringer.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.ajax.json; + +import org.apache.wicket.WicketRuntimeException; +import org.apache.wicket.util.io.StringBufferWriter; + +@SuppressWarnings("javadoc") +public class JsonSequenceStringer extends JSONWriter +{ + public JsonSequenceStringer() + { + super(new StringBufferWriter()); + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public CharSequence toCharSequence() + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/README ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/README b/wicket-core/src/main/java/org/apache/wicket/ajax/json/README index ebfe78d..a0ff919 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/README +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/README @@ -1,5 +1,7 @@ -All JSON** classes are copied from https://github.com/tdunning/open-json. -Last update: November 25 2016 +Information regarding JSON Implementation: +* JsonFunction is borrowed from https://github.com/ivaynberg/wicket-select2. +* All JSON** classes are copied from https://github.com/tdunning/open-json. +* Json** are our custom classes +* Methods not supported anymore due to license issues with JSON.org and the switch to open-json throwing a runtime exception. -Json** are our custom, used in JSONStringer#L261 -JsonFunction is borrowed from https://github.com/ivaynberg/wicket-select2. \ No newline at end of file +Last update: December 07 2016 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/XML.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/XML.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/XML.java new file mode 100644 index 0000000..bb4d9a0 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/XML.java @@ -0,0 +1,56 @@ +package org.apache.wicket.ajax.json; + +import org.apache.wicket.WicketRuntimeException; + +@SuppressWarnings("javadoc") +public class XML +{ + + public static final Character AMP = new Character('&'); + + public static final Character APOS = new Character('\''); + + public static final Character BANG = new Character('!'); + + public static final Character EQ = new Character('='); + + public static final Character GT = new Character('>'); + + public static final Character LT = new Character('<'); + + public static final Character QUEST = new Character('?'); + + public static final Character QUOT = new Character('"'); + + public static final Character SLASH = new Character('/'); + + public static String escape(String string) + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public static void noSpace(String string) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public static Object stringToValue(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(Object object) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public static String toString(Object object, String tagName) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/5348b3e0/wicket-core/src/main/java/org/apache/wicket/ajax/json/XMLTokener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/XMLTokener.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/XMLTokener.java new file mode 100644 index 0000000..a1d8ed7 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/XMLTokener.java @@ -0,0 +1,56 @@ +package org.apache.wicket.ajax.json; + +import org.apache.wicket.WicketRuntimeException; + +@SuppressWarnings({ "javadoc", "rawtypes", "unchecked" }) +public class XMLTokener extends JSONTokener +{ + + public static final java.util.HashMap entity; + + static + { + entity = new java.util.HashMap(8); + entity.put("amp", XML.AMP); + entity.put("apos", XML.APOS); + entity.put("gt", XML.GT); + entity.put("lt", XML.LT); + entity.put("quot", XML.QUOT); + } + + public XMLTokener(String s) + { + super(s); + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public String nextCDATA() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public Object nextContent() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public Object nextEntity(char ampersand) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public Object nextMeta() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public Object nextToken() throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } + + public boolean skipPast(String to) throws JSONException + { + throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); + } +}
