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

datatables-parent/datatables-examples/src/main/java/org/wicketstuff/datatables/demo/infiniteScroll/VirtualScrollDemoResourceReference.java

@@ -1,6 +1,6 @@
 package org.wicketstuff.datatables.demo.infiniteScroll;
 
-import org.apache.wicket.ajax.json.JSONObject;
+import org.json.JSONObject;
 import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.wicketstuff.datatables.demo.PeopleDataProvider;

datatables-parent/datatables/src/main/java/org/wicketstuff/datatables/virtualscroll/AbstractVirtualScrollResourceReference.java

@@ -1,7 +1,7 @@
 package org.wicketstuff.datatables.virtualscroll;
 
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.request.mapper.parameter.PageParameters;

gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/geocoder/Geocoder.java

@@ -22,7 +22,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 
-import org.apache.wicket.ajax.json.JSONException;
+import org.json.JSONException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.wicketstuff.gmap.GMap;

offline-mode-parent/offline-mode/src/main/java/org/wicketstuff/offline/mode/ServiceWorker.java

@@ -21,8 +21,8 @@
 
 import org.apache.wicket.Page;
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.request.IRequestHandler;

pom.xml

@@ -698,7 +698,12 @@
 			<dependency>
 			  <groupId>com.google.code.gson</groupId>
 			  <artifactId>gson</artifactId>
-			  <version>2.2.4</version>
+			  <version>2.8.0</version>
+			</dependency>
+			<dependency>
+			  <groupId>com.fasterxml.jackson.core</groupId>
+			  <artifactId>jackson-databind</artifactId>
+                    	  <version>2.8.5</version>
 			</dependency>
 			<dependency>
 			  <groupId>de.agilecoders.wicket</groupId>

select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java

@@ -22,8 +22,6 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.IRequestListener;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONWriter;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
@@ -40,6 +38,8 @@
 import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.util.string.AppendingStringBuffer;
 import org.apache.wicket.util.string.Strings;
+import org.json.JSONException;
+import org.json.JSONStringer;
 
 /**
  * Base class for Select2 components
@@ -369,7 +369,7 @@ public static <T> void generateJSON(String queryParam, ChoiceProvider<T> provide
 		// jsonize and write out the choices to the response
 
 		OutputStreamWriter out = new OutputStreamWriter(outputStream, request.getCharset());
-		JSONWriter json = new JSONWriter(out);
+		JSONStringer json = new JSONStringer();
 
 		try
 		{
@@ -383,8 +383,10 @@ public static <T> void generateJSON(String queryParam, ChoiceProvider<T> provide
 			}
 			json.endArray();
 			json.key("more").value(response.getHasMore()).endObject();
+
+			out.write(json.toString());
 		}
-		catch (JSONException e) 
+		catch (JSONException | IOException e) 
 		{
 			throw new RuntimeException("Could not write Json response", e);
 		}

select2-parent/select2/src/main/java/org/wicketstuff/select2/AjaxSettings.java

@@ -14,8 +14,8 @@
 
 import java.io.Serializable;
 
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONWriter;
+import org.json.JSONException;
+import org.json.JSONStringer;
 import org.wicketstuff.select2.json.Json;
 
 /**
@@ -34,16 +34,16 @@ public final class AjaxSettings implements Serializable
 	/** whether or not to use traditional parameter encoding. */
 	private boolean cache;
 
-	public void toJson(JSONWriter writer) throws JSONException
+	public void toJson(JSONStringer stringer) throws JSONException
 	{
-		writer.object();
-		Json.writeFunction(writer, "data", data);
-		Json.writeObject(writer, "dataType", dataType);
-		Json.writeObject(writer, "delay", delay);
-		Json.writeFunction(writer, "processResults", processResults);
-		Json.writeObject(writer, "url", url);
-		Json.writeObject(writer, "cache", cache);
-		writer.endObject();
+		stringer.object();
+		Json.writeFunction(stringer, "data", data);
+		Json.writeObject(stringer, "dataType", dataType);
+		Json.writeObject(stringer, "delay", delay);
+		Json.writeFunction(stringer, "processResults", processResults);
+		Json.writeObject(stringer, "url", url);
+		Json.writeObject(stringer, "cache", cache);
+		stringer.endObject();
 	}
 
 	public void setUrl(CharSequence url)

select2-parent/select2/src/main/java/org/wicketstuff/select2/ChoiceProvider.java

@@ -14,9 +14,9 @@
 
 import java.util.Collection;
 
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONWriter;
 import org.apache.wicket.model.IDetachable;
+import org.json.JSONException;
+import org.json.JSONStringer;
 
 /**
  * <p>
@@ -105,12 +105,12 @@ public abstract class ChoiceProvider<T> implements IDetachable
 	 * 
 	 * @param choice
 	 *            choice to convert
-	 * @param writer
+	 * @param stringer
 	 *            Json writer that should be used to covnert the choice
 	 * @throws JSONException
 	 */
-	protected void toJson(T choice, JSONWriter writer) throws JSONException {
-		writer.key("id").value(getIdValue(choice)).key("text").value(getDisplayValue(choice));
+	protected void toJson(T choice, JSONStringer stringer) throws JSONException {
+		stringer.key("id").value(getIdValue(choice)).key("text").value(getDisplayValue(choice));
 	}
 
 	/**

select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java

@@ -12,19 +12,19 @@
  */
 package org.wicketstuff.select2;
 
+import static org.apache.wicket.util.string.Strings.defaultIfEmpty;
+
 import java.io.Serializable;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.Session;
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONStringer;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.util.string.Strings;
+import org.json.JSONException;
+import org.json.JSONStringer;
 import org.wicketstuff.select2.json.Json;
 
-import static org.apache.wicket.util.string.Strings.defaultIfEmpty;
-
 /**
  * Select2 settings. Refer to the Select2 documentation for what these options mean.
  * 

select2-parent/select2/src/main/java/org/wicketstuff/select2/json/Json.java

@@ -12,8 +12,9 @@
  */
 package org.wicketstuff.select2.json;
 
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONWriter;
+import org.apache.wicket.ajax.json.JSONFunction;
+import org.json.JSONException;
+import org.json.JSONStringer;
 
 /**
  * Json utilities
@@ -27,42 +28,42 @@ private Json()
 	/**
 	 * Writes a key/value pair into the {@code writer} if the value is not {@code null}
 	 * 
-	 * @param writer
+	 * @param stringer
 	 *            json writer
 	 * @param key
 	 *            key
 	 * @param value
 	 *            value
 	 * @throws JSONException
 	 */
-	public static void writeObject(JSONWriter writer, String key, Object value)
+	public static void writeObject(JSONStringer stringer, String key, Object value)
 		throws JSONException
 	{
 		if (value != null)
 		{
-			writer.key(key);
-			writer.value(value);
+			stringer.key(key);
+			stringer.value(value);
 		}
 	}
 
 	/**
 	 * Writes a key/value pair into the {@code writer} where {@code value} represents a javascript
 	 * function and should be written out unencoded if the value is not {@code null}
 	 * 
-	 * @param writer
+	 * @param stringer
 	 *            json writer
 	 * @param key
 	 *            key
 	 * @param value
 	 *            value
 	 * @throws JSONException
 	 */
-	public static void writeFunction(JSONWriter writer, String key, String value)
+	public static void writeFunction(JSONStringer stringer, String key, String value)
 		throws JSONException
 	{
 		if (value != null)
 		{
-			writer.key(key).value(new JsonFunction(value));
+			stringer.key(key).value(new JSONFunction(value));
 		}
 	}
 

tinymce3-parent/tinymce3/src/main/java/wicket/contrib/tinymce/settings/JazzySpellChecker.java

@@ -30,10 +30,10 @@
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONObject;
-import org.apache.wicket.ajax.json.JSONTokener;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.http.WebResponse;

tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/settings/JazzySpellChecker.java

@@ -34,10 +34,10 @@
 import java.util.Set;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.ajax.json.JSONArray;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONObject;
-import org.apache.wicket.ajax.json.JSONTokener;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.http.WebResponse;

urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/UrlParametersReceivingBehavior.java

@@ -21,9 +21,6 @@
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONStringer;
-import org.apache.wicket.ajax.json.JSONWriter;
 import org.apache.wicket.behavior.Behavior;
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
@@ -32,6 +29,8 @@
 import org.apache.wicket.request.IRequestParameters;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.PackageResourceReference;
+import org.json.JSONException;
+import org.json.JSONStringer;
 
 /**
  * Reads URL fragment parameters. This {@link Behavior} will execute an AJAX call to itself with the
@@ -98,7 +97,7 @@ private String optionsJsonString()
 		String optionsJsonString = "";
 		try
 		{
-			JSONWriter writer = new JSONStringer().object();
+			JSONStringer writer = new JSONStringer().object();
 			for (String key : options.keySet())
 			{
 				writer.key(key).value(options.get(key));