From 76e726b5209a9ffba903d53532e02f7eabc4a829 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 5 Jun 2020 20:29:39 +0100 Subject: [PATCH] switch to the Groovy json library --- webui/src/main/java/com/muwire/webui/Util.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java index ae497d02..4d82a5d4 100644 --- a/webui/src/main/java/com/muwire/webui/Util.java +++ b/webui/src/main/java/com/muwire/webui/Util.java @@ -4,8 +4,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import org.json.simple.JSONObject; - +import groovy.json.JsonOutput; import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; @@ -199,11 +198,7 @@ public class Util { if (!s.equals(tx)) map.put(s, tx); } - try { - return JSONObject.toJSONString(map); - } catch (NoClassDefFoundError json2) { - return "{}"; // TODO: upgrade to json-simple 2.x - } + return JsonOutput.toJson(map); }