Repository: wicket Updated Branches: refs/heads/wicket-7.x daecdc6c4 -> fab4998db
WICKET-6391 Deprecate the classes and methods which now throw runtime exception after the switch to OpenJson (cherry picked from commit 4b2eae7b03909946aeb123eafb52e9867e01ee1e) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fab4998d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fab4998d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fab4998d Branch: refs/heads/wicket-7.x Commit: fab4998dbc36513a3f169e658098a05ab262d41c Parents: daecdc6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sun Jun 4 23:12:10 2017 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sun Jun 4 23:12:49 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/ajax/json/CDL.java | 4 ++ .../org/apache/wicket/ajax/json/Cookie.java | 4 ++ .../org/apache/wicket/ajax/json/CookieList.java | 4 ++ .../java/org/apache/wicket/ajax/json/HTTP.java | 4 ++ .../apache/wicket/ajax/json/HTTPTokener.java | 4 ++ .../org/apache/wicket/ajax/json/JSONArray.java | 13 +++- .../org/apache/wicket/ajax/json/JSONML.java | 4 ++ .../org/apache/wicket/ajax/json/JSONObject.java | 73 +++++++++++++++++--- .../apache/wicket/ajax/json/JSONTokener.java | 8 +++ .../org/apache/wicket/ajax/json/JSONWriter.java | 4 ++ .../wicket/ajax/json/JsonSequenceStringer.java | 4 ++ .../java/org/apache/wicket/ajax/json/XML.java | 6 +- .../org/apache/wicket/ajax/json/XMLTokener.java | 4 ++ 13 files changed, 123 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 772f564..9d0d9d8 100644 --- 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 @@ -2,7 +2,11 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ @SuppressWarnings("javadoc") +@Deprecated public class CDL { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 0f7a20b..95cf655 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class Cookie { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 4cb8398..de22881 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class CookieList { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 13b17eb..9eb371e 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class HTTP { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 8920885..dfd1da5 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class HTTPTokener extends JSONTokener { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 17b69bf..854d3da 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 @@ -770,15 +770,26 @@ public class JSONArray { } // Methods removed due to switch to open-json - + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public Writer write(Writer writer){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONArray put(Map<?, ?> map){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONArray put(int integer, Map<?, ?> map){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 437cafa..b614bd8 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class JSONML { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 8a9d0d1..39f56c5 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 @@ -1016,55 +1016,106 @@ public class JSONObject { } // Methods removed due to switch to open-json - + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public Writer write(Writer writer){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public String valueToString(Object object){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public void testValidity(Object object){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public Object stringToValue(String string){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public Writer quote(String string, Writer writer){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject putOnce(String string, Object object){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject put(String string, Map map){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject put(String string, Collection collection){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject increment(String string){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public String[] getNames(Object object){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public String doubleToString(double dou){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } - + + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject(String string, Locale locale){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONObject(Object object, String[] stringarr){ throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 d2ebc0d..439f838 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 @@ -765,11 +765,19 @@ public class JSONTokener // Methods removed due to switch to open-json + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public boolean end() { throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } + /** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ + @Deprecated public JSONTokener(InputStream inputStream) { throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 1079628..64143c2 100644 --- 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 @@ -4,7 +4,11 @@ import java.io.Writer; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. Use {@link JSONStringer} instead. + */ @SuppressWarnings("javadoc") +@Deprecated public class JSONWriter { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index 9207a37..023e647 100644 --- 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 @@ -19,6 +19,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.io.StringBufferWriter; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class JsonSequenceStringer extends JSONWriter { http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index bb4d9a0..f3228aa 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings("javadoc") public class XML { @@ -53,4 +57,4 @@ public class XML { throw new WicketRuntimeException(JsonConstants.OPEN_JSON_EXCEPTION); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/fab4998d/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 index a1d8ed7..d5fa2d1 100644 --- 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 @@ -2,6 +2,10 @@ package org.apache.wicket.ajax.json; import org.apache.wicket.WicketRuntimeException; +/** + * @deprecated since 6.27.0/7.7.0 for legal reasons. + */ +@Deprecated @SuppressWarnings({ "javadoc", "rawtypes", "unchecked" }) public class XMLTokener extends JSONTokener {
