You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/05/22 13:05:20 UTC
svn commit: r1596813 - in /jena/trunk:
jena-arq/src/main/java/org/apache/jena/riot/lang/
jena-arq/src/main/java/org/apache/jena/riot/out/ jena-parent/
Author: andy
Date: Thu May 22 11:05:19 2014
New Revision: 1596813
URL: http://svn.apache.org/r1596813
Log:
Upgrade from jsonld-java 0.3 to 0.4
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
jena/trunk/jena-parent/pom.xml
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java?rev=1596813&r1=1596812&r2=1596813&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java Thu May 22 11:05:19 2014
@@ -34,7 +34,7 @@ import org.apache.jena.riot.RiotExceptio
import org.apache.jena.riot.system.* ;
import com.github.jsonldjava.core.* ;
-import com.github.jsonldjava.utils.JSONUtils ;
+import com.github.jsonldjava.utils.JsonUtils ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
@@ -59,7 +59,7 @@ public class JsonLDReader implements Rea
if ( parserProfile == null )
parserProfile = RiotLib.profile(RDFLanguages.JSONLD, baseURI, errorHandler) ;
try {
- Object jsonObject = JSONUtils.fromReader(reader) ;
+ Object jsonObject = JsonUtils.fromReader(reader) ;
read$(jsonObject, baseURI, ct, output, context) ;
}
catch (IOException e) {
@@ -72,7 +72,7 @@ public class JsonLDReader implements Rea
if ( parserProfile == null )
parserProfile = RiotLib.profile(RDFLanguages.JSONLD, baseURI, errorHandler) ;
try {
- Object jsonObject = JSONUtils.fromInputStream(in) ;
+ Object jsonObject = JsonUtils.fromInputStream(in) ;
read$(jsonObject, baseURI, ct, output, context) ;
}
catch (IOException e) {
@@ -82,7 +82,7 @@ public class JsonLDReader implements Rea
private void read$(Object jsonObject, String baseURI, ContentType ct, final StreamRDF output, Context context) {
try {
- JSONLDTripleCallback callback = new JSONLDTripleCallback() {
+ JsonLdTripleCallback callback = new JsonLdTripleCallback() {
@Override
// public Object call(Map<String, Object> dataset) {
public Object call(RDFDataset dataset) {
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java?rev=1596813&r1=1596812&r2=1596813&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java Thu May 22 11:05:19 2014
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
-/** Convert from JSON-LD syntax to JSON-LD internal representation of a daatset, using Jena Quads/Nodes etc */
+/** Convert from JSON-LD syntax to JSON-LD internal representation of a dataset, using Jena Quads/Nodes etc */
class JenaRDF2JSONLD implements com.github.jsonldjava.core.RDFParser {
NodeToLabel labels = SyntaxLabels.createNodeToLabel() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java?rev=1596813&r1=1596812&r2=1596813&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java Thu May 22 11:05:19 2014
@@ -41,7 +41,7 @@ import com.fasterxml.jackson.databind.Js
import com.github.jsonldjava.core.JsonLdError ;
import com.github.jsonldjava.core.JsonLdOptions ;
import com.github.jsonldjava.core.JsonLdProcessor ;
-import com.github.jsonldjava.utils.JSONUtils ;
+import com.github.jsonldjava.utils.JsonUtils ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
@@ -96,9 +96,9 @@ public class JsonLDWriter extends Writer
obj = JsonLdProcessor.compact(obj, localCtx, opts) ;
if ( isPretty() )
- JSONUtils.writePrettyPrint(writer, obj) ;
+ JsonUtils.writePrettyPrint(writer, obj) ;
else
- JSONUtils.write(writer, obj) ;
+ JsonUtils.write(writer, obj) ;
}
catch (JsonLdError e) {
throw new RiotException(e) ;
Modified: jena/trunk/jena-parent/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-parent/pom.xml?rev=1596813&r1=1596812&r2=1596813&view=diff
==============================================================================
--- jena/trunk/jena-parent/pom.xml (original)
+++ jena/trunk/jena-parent/pom.xml Thu May 22 11:05:19 2014
@@ -55,7 +55,7 @@
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.11</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
- <ver.jsonldjava>0.3</ver.jsonldjava>
+ <ver.jsonldjava>0.4</ver.jsonldjava>
<ver.commons-fileupload>1.3.1</ver.commons-fileupload>
<!-- These are connected because solr4j depends on httpclient as well -->