litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1317] Remove Glassfish JSON library

Browse source
This commit is contained in:
Graham Triggs 2017-09-15 09:33:14 +01:00
parent 04f61c466f
commit 5e6185353d
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java
View file

@ -5,8 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.json.JsonObject; import com.fasterxml.jackson.databind.JsonNode;
import javax.json.JsonString;
import org.apache.jena.atlas.lib.EscapeStr; 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. * able to write to a different format.
*/ */
public abstract class DumpNode { public abstract class DumpNode {
public static DumpNode fromJson(JsonObject json) throws BadNodeException { public static DumpNode fromJson(JsonNode json) throws BadNodeException {
if (json == null) { if (json == null) {
return new DumpNullNode(); return new DumpNullNode();
} }
@ -74,9 +73,9 @@ public abstract class DumpNode {
return (s == null) ? null : EscapeStr.unescapeStr(s); return (s == null) ? null : EscapeStr.unescapeStr(s);
} }
private static String getString(JsonObject json, String name) { private static String getString(JsonNode json, String name) {
JsonString jsString = json.getJsonString(name); JsonNode node = json.get(name);
return (jsString == null) ? null : json.getString(name); return node == null ? null : node.asText();
} }
public abstract String getValue(); public abstract String getValue();

15
dependencies/pom.xml vendored
View file

@ -203,6 +203,11 @@
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.7.4</version> <version>2.7.4</version>
</dependency> </dependency>
<!-- dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr353</artifactId>
<version>2.7.4</version>
</dependency -->
<!-- Needed for ORCID? --> <!-- Needed for ORCID? -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
@ -254,11 +259,6 @@
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<version>2.3.23</version> <version>2.3.23</version>
</dependency> </dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.0.4</version>
</dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>jtidy</artifactId> <artifactId>jtidy</artifactId>
@ -297,11 +297,6 @@
<version>1.2.1</version> <version>1.2.1</version>
</dependency> </dependency>
<!-- dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.0</version>
</dependency -->
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>