From 5e6185353d6629f95f40415c1c5f3c2a93c262f7 Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Fri, 15 Sep 2017 09:33:14 +0100
Subject: [PATCH] [VIVO-1317] Remove Glassfish JSON library

---
 .../datatools/dumprestore/DumpNode.java           | 11 +++++------
 dependencies/pom.xml                              | 15 +++++----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
index 95f4875a8..11dc2b3d9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
@@ -5,8 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.json.JsonObject;
-import javax.json.JsonString;
+import com.fasterxml.jackson.databind.JsonNode;
 
 import org.apache.jena.atlas.lib.EscapeStr;
 
@@ -16,7 +15,7 @@ import org.apache.jena.atlas.lib.EscapeStr;
  * able to write to a different format.
  */
 public abstract class DumpNode {
-	public static DumpNode fromJson(JsonObject json) throws BadNodeException {
+	public static DumpNode fromJson(JsonNode json) throws BadNodeException {
 		if (json == null) {
 			return new DumpNullNode();
 		}
@@ -74,9 +73,9 @@ public abstract class DumpNode {
 		return (s == null) ? null : EscapeStr.unescapeStr(s);
 	}
 
-	private static String getString(JsonObject json, String name) {
-		JsonString jsString = json.getJsonString(name);
-		return (jsString == null) ? null : json.getString(name);
+	private static String getString(JsonNode json, String name) {
+		JsonNode node = json.get(name);
+		return node == null ? null : node.asText();
 	}
 
 	public abstract String getValue();
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 5583e87e9..ae9b83161 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -203,6 +203,11 @@
             <artifactId>jackson-core</artifactId>
             <version>2.7.4</version>
         </dependency>
+        <!-- dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr353</artifactId>
+            <version>2.7.4</version>
+        </dependency -->
         <!-- Needed for ORCID? -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -254,11 +259,6 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.23</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>1.0.4</version>
-        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>jtidy</artifactId>
@@ -297,11 +297,6 @@
             <version>1.2.1</version>
         </dependency>
 
-        <!-- dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>1.0</version>
-        </dependency -->
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>