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 2016/04/14 12:51:52 UTC
jena git commit: JENA-1163 : Don't include @type for rdf:langString
or xsd:string.
Repository: jena
Updated Branches:
refs/heads/master 7b5b48a29 -> 22e619d5d
JENA-1163 : Don't include @type for rdf:langString or xsd:string.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/22e619d5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/22e619d5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/22e619d5
Branch: refs/heads/master
Commit: 22e619d5d85497801117a2c2fc215b0d63a5e6f8
Parents: 7b5b48a
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 14 11:51:38 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 14 11:51:38 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/out/JsonLDWriter.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/22e619d5/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
index 9d50d87..68ebc0f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/JsonLDWriter.java
@@ -26,6 +26,13 @@ import java.util.* ;
import java.util.Map.Entry;
import java.util.function.Consumer;
+import com.fasterxml.jackson.core.JsonGenerationException ;
+import com.fasterxml.jackson.databind.JsonMappingException ;
+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 org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Chars ;
@@ -33,6 +40,7 @@ import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
+import static org.apache.jena.rdf.model.impl.Util.* ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFFormat ;
import org.apache.jena.riot.RiotException ;
@@ -42,13 +50,6 @@ import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.vocabulary.RDF ;
-import com.fasterxml.jackson.core.JsonGenerationException ;
-import com.fasterxml.jackson.databind.JsonMappingException ;
-import com.github.jsonldjava.core.JsonLdError ;
-import com.github.jsonldjava.core.JsonLdOptions ;
-import com.github.jsonldjava.core.JsonLdProcessor ;
-import com.github.jsonldjava.utils.JsonUtils ;
-
public class JsonLDWriter extends WriterDatasetRIOTBase
{
private final RDFFormat format ;
@@ -154,7 +155,10 @@ public class JsonLDWriter extends WriterDatasetRIOTBase
// typed literal)
Map<String, Object> x2 = new LinkedHashMap<>() ;
x2.put("@id", p.getURI()) ;
- x2.put("@type", literalDatatypeURI) ;
+ x2.put("@id", p.getURI()) ;
+ if (! isLangString(o) && ! isSimpleString(o) )
+ // RDF 1.1 : Skip if rdf:langString or xsd:string.
+ x2.put("@type", literalDatatypeURI) ;
ctx.put(x, x2) ;
} else {
// add property as an untyped attribute (the object is