From a76d88122a41c5b71cdf322bb277214d06026f1a Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Tue, 20 Nov 2018 16:17:42 +0000
Subject: [PATCH] Migrate ApplyOperationsCommand

---
 .../history/ApplyOperationsCommand.java       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/main/src/com/google/refine/commands/history/ApplyOperationsCommand.java b/main/src/com/google/refine/commands/history/ApplyOperationsCommand.java
index 8fbfeab44..2ed9298be 100644
--- a/main/src/com/google/refine/commands/history/ApplyOperationsCommand.java
+++ b/main/src/com/google/refine/commands/history/ApplyOperationsCommand.java
@@ -40,10 +40,8 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.commands.Command;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
@@ -59,12 +57,14 @@ public class ApplyOperationsCommand extends Command {
         Project project = getProject(request);
         String jsonString = request.getParameter("operations");
         try {
-            JSONArray a = ParsingUtilities.evaluateJsonStringToArray(jsonString);
-            int count = a.length();
+            ArrayNode a = ParsingUtilities.evaluateJsonStringToArrayNode(jsonString);
+            int count = a.size();
             for (int i = 0; i < count; i++) {
-                JSONObject obj = a.getJSONObject(i);
-                
-                reconstructOperation(project, obj);
+            	if (a.get(i) instanceof ObjectNode) {
+	                ObjectNode obj = (ObjectNode) a.get(i);
+	                
+	                reconstructOperation(project, obj);
+            	}
             }
 
             if (project.processManager.hasPending()) {
@@ -72,13 +72,13 @@ public class ApplyOperationsCommand extends Command {
             } else {
                 respond(response, "{ \"code\" : \"ok\" }");
             }
-        } catch (JSONException e) {
+        } catch (IOException e) {
             respondException(response, e);
         }
     }
     
-    protected void reconstructOperation(Project project, JSONObject obj) throws IOException {
-        AbstractOperation operation = ParsingUtilities.mapper.readValue(obj.toString(), AbstractOperation.class);
+    protected void reconstructOperation(Project project, ObjectNode obj) throws IOException {
+        AbstractOperation operation = ParsingUtilities.mapper.convertValue(obj, AbstractOperation.class);
         if (operation != null) {
             try {
                 Process process = operation.createProcess(project, new Properties());