From 08c2b8fb2b536fd2f8c2073d6bd0413abec1687e Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Mon, 22 Oct 2018 10:36:16 +0100
Subject: [PATCH] Jackson deserialization for ReconMatchSpecificTopicOperation

---
 .../ReconMatchSpecificTopicOperation.java     | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java b/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
index 3e7f85ccf..709146811 100644
--- a/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
+++ b/main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
@@ -37,7 +37,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.json.JSONArray;
 import org.json.JSONObject;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -58,6 +57,7 @@ import com.google.refine.model.Row;
 import com.google.refine.model.changes.CellChange;
 import com.google.refine.model.changes.ReconChange;
 import com.google.refine.operations.EngineDependentMassCellOperation;
+import com.google.refine.util.ParsingUtilities;
 
 public class ReconMatchSpecificTopicOperation extends EngineDependentMassCellOperation {
     
@@ -92,34 +92,20 @@ public class ReconMatchSpecificTopicOperation extends EngineDependentMassCellOpe
     final protected String schemaSpace;
 
     static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception {
-        JSONObject engineConfig = obj.getJSONObject("engineConfig");
-        
-        JSONObject match = obj.getJSONObject("match");
-        
-        JSONArray types = match.getJSONArray("types");
-        String[] typeIDs = new String[types.length()];
-        for (int i = 0; i < typeIDs.length; i++) {
-            typeIDs[i] = types.getString(i);
-        }
-        
-        return new ReconMatchSpecificTopicOperation(
-            EngineConfig.reconstruct(engineConfig),
-            obj.getString("columnName"),
-            new ReconItem(
-                match.getString("id"),
-                match.getString("name"),
-                typeIDs
-            ),
-            obj.getString("identifierSpace"),
-            obj.getString("schemaSpace")
-        );
+        return ParsingUtilities.mapper.readValue(obj.toString(), ReconMatchSpecificTopicOperation.class);
     }
     
+    @JsonCreator
     public ReconMatchSpecificTopicOperation(
+        @JsonProperty("engineConfig")
         EngineConfig engineConfig, 
+        @JsonProperty("columnName")
         String columnName, 
+        @JsonProperty("match")
         ReconItem match,
+        @JsonProperty("identifierSpace")
         String identifierSpace,
+        @JsonProperty("schemaSpace")
         String schemaSpace
     ) {
         super(engineConfig, columnName, false);