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 2017/04/11 10:05:42 UTC
[15/17] jena git commit: JENA-1251: Always use the ParseProfile to
make nodes
JENA-1251: Always use the ParseProfile to make nodes
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7df447a2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7df447a2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7df447a2
Branch: refs/heads/master
Commit: 7df447a24e3573626c3df59bf7ae6d4f0a4d4aa9
Parents: 1033133
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 9 15:05:24 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 9 15:35:22 2017 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/lang/JsonLDReader.java | 21 ++++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7df447a2/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
index 2a62690..07a216b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
@@ -165,8 +165,6 @@ public class JsonLDReader implements ReaderRIOT
output.finish() ;
}
- private LabelToNode labels = SyntaxLabels.createLabelToNode() ;
-
public static String LITERAL = "literal" ;
public static String BLANK_NODE = "blank node" ;
public static String IRI = "IRI" ;
@@ -185,7 +183,7 @@ public class JsonLDReader implements ReaderRIOT
if ( type.equals(IRI) )
return createURI(lex) ;
else if ( type.equals(BLANK_NODE) )
- return labels.get(null, lex) ; //??
+ return createBlankNode(lex);
else if ( type.equals(LITERAL) ) {
String lang = (String)map.get("language") ;
String datatype = (String)map.get("datatype") ;
@@ -203,19 +201,16 @@ public class JsonLDReader implements ReaderRIOT
throw new InternalErrorException("Node is not a IRI, bNode or a literal: " + type) ;
}
+ private Node createBlankNode(String str) {
+ if ( str.startsWith("_:") )
+ str = str.substring(2);
+ return profile.createBlankNode(null, str, -1,-1);
+ }
+
private Node createURI(String str) {
if ( str.startsWith("_:") )
- return labels.get(null, str) ;
+ return createBlankNode(str);
else
return profile.createURI(str, -1, -1) ;
}
-
- private Node createLiteral(String lex, String datatype, String lang) {
- if ( lang == null && datatype == null )
- return NodeFactory.createLiteral(lex) ;
- if ( lang != null )
- return NodeFactory.createLiteral(lex, lang) ;
- RDFDatatype dt = NodeFactory.getType(datatype) ;
- return NodeFactory.createLiteral(lex, dt) ;
- }
}