From ba7879621db25f829d6d6cda677ad7ed9fe84b11 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Sun, 21 Oct 2018 17:53:19 +0100 Subject: [PATCH] Jackson deserialization for Project --- main/src/com/google/refine/model/Project.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/main/src/com/google/refine/model/Project.java b/main/src/com/google/refine/model/Project.java index 113e591d9..fee610280 100644 --- a/main/src/com/google/refine/model/Project.java +++ b/main/src/com/google/refine/model/Project.java @@ -40,7 +40,6 @@ import java.io.LineNumberReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import java.lang.reflect.Method; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -48,7 +47,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -217,13 +215,10 @@ public class Project { Class klass = s_overlayModelClasses.get(modelName); try { - Method loadMethod = klass.getMethod("load", Project.class, JSONObject.class); - JSONObject obj = ParsingUtilities.evaluateJsonStringToObject(value); - - OverlayModel overlayModel = (OverlayModel) loadMethod.invoke(null, project, obj); + OverlayModel overlayModel = ParsingUtilities.mapper.readValue(value, klass); project.overlayModels.put(modelName, overlayModel); - } catch (Exception e) { + } catch (IOException e) { logger.error("Failed to load overlay model " + modelName); } }