You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/11/25 17:26:23 UTC
[01/48] jena git commit: Fix javadoc warning.
Repository: jena
Updated Branches:
refs/heads/hadoop-rdf c7f8c89aa -> 80bccb965
Fix javadoc warning.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5e20d4fc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5e20d4fc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5e20d4fc
Branch: refs/heads/hadoop-rdf
Commit: 5e20d4fc1345e0fdb618dd85c6a45e6e99e5e8dd
Parents: 6c2c87c
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 11:37:13 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 11:37:13 2014 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5e20d4fc/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
index 0d163a7..52794b1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/ResultSetMgr.java
@@ -165,7 +165,7 @@ public class ResultSetMgr {
/** Write a SPARQL boolean result to the output stream in the specified language/syntax.
* @param out
- * @param resultSet
+ * @param result
* @param lang
*/
public static void write(OutputStream out, boolean result, Lang lang) {
[27/48] jena git commit: JENA-818 : Handle language strings,
and ^^rdf:langString without lang.
Posted by rv...@apache.org.
JENA-818 : Handle language strings, and ^^rdf:langString without lang.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4352b0f4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4352b0f4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4352b0f4
Branch: refs/heads/hadoop-rdf
Commit: 4352b0f481a33c19d9488b87847ce2dd58ad3286
Parents: 225eea9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 18:37:00 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 18:37:00 2014 +0000
----------------------------------------------------------------------
.../apache/jena/riot/out/NodeFormatterBase.java | 48 +++++++++++++------
.../jena/graph/impl/LiteralLabelFactory.java | 37 +++++++++++----
.../hpl/jena/graph/impl/LiteralLabelImpl.java | 8 ++--
.../com/hp/hpl/jena/rdf/model/impl/Util.java | 40 +++++++++-------
.../hpl/jena/rdfxml/xmloutput/impl/Basic.java | 20 ++++----
.../jena/rdfxml/xmloutput/impl/Unparser.java | 50 ++++++++------------
6 files changed, 119 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
index 6ea8dd7..1b4b5f9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
@@ -21,6 +21,7 @@ package org.apache.jena.riot.out;
import org.apache.jena.atlas.io.AWriter ;
import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -53,27 +54,46 @@ public abstract class NodeFormatterBase implements NodeFormatter
@Override
public void formatBNode(AWriter w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; }
+// /** A Node is a simple string if:
+// * <li>(RDF 1.0) No datatype and no language tag.
+// * <li>(RDF 1.1) xsd:string
+// */
+// private static boolean isSimpleString(Node n) {
+// RDFDatatype dt = n.getLiteralDatatype() ;
+// if ( dt == null )
+// return ! isLangString(n) ;
+// if ( JenaRuntime.isRDF11 )
+// return dt.equals(XSDDatatype.XSDstring) ;
+// return false ;
+// }
+//
+// /** A Node is a language string if it has a language tag. (RDF 1.0 and RDF 1.1) */
+// private static boolean isLangString(Node n) {
+// String lang = n.getLiteralLanguage() ;
+// if ( lang == null )
+// return false ;
+// return ! lang.equals("") ;
+// }
+
@Override
public void formatLiteral(AWriter w, Node n)
{
- String dt = n.getLiteralDatatypeURI() ;
+ RDFDatatype dt = n.getLiteralDatatype() ;
String lang = n.getLiteralLanguage() ;
String lex = n.getLiteralLexicalForm() ;
- // In RDF 1.1, print xsd:string and language strings without datatype explicitly.
- // dt should not be null for RDF 1.1 but let's play carefully.
- boolean shortString = JenaRuntime.isRDF11 ? (dt == null || dt.equals(XSDDatatype.XSDstring.getURI()))
- : (dt == null) ;
-
- if ( shortString )
- {
- if ( lang == null || lang.equals("") )
- formatLitString(w, lex) ;
- else
- formatLitLang(w, lex,lang) ;
+ if ( lang != null && ! lang.equals("") ) {
+ formatLitLang(w, lex, lang) ;
+ } else if ( dt == null ) {
+ // RDF 1.0, simple literal.
+ formatLitString(w, lex) ;
+ } else if ( JenaRuntime.isRDF11 && dt.equals(XSDDatatype.XSDstring) ) {
+ // RDF 1.1, xsd:string - outptu as short string.
+ formatLitString(w, lex) ;
+ } else {
+ // Datatype, no language tag, not short string.
+ formatLitDT(w, lex, dt.getURI()) ;
}
- else
- formatLitDT(w, lex, dt) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index 69c9ae1..97dfbf0 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -18,23 +18,39 @@
package com.hp.hpl.jena.graph.impl;
-import com.hp.hpl.jena.datatypes.DatatypeFormatException;
-import com.hp.hpl.jena.datatypes.RDFDatatype;
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.DatatypeFormatException ;
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.vocabulary.RDF ;
public class LiteralLabelFactory
{
+ private static final RDFDatatype dtSLangString = NodeFactory.getType(RDF.Nodes.langString.getURI()) ;
+
+ private static RDFDatatype fixDatatype(RDFDatatype dtype, String lang) {
+ if ( dtype != null )
+ return dtype ;
+ if ( JenaRuntime.isRDF11 )
+ dtype = (lang == null || lang.equals("")) ? XSDDatatype.XSDstring : dtSLangString ;
+ return dtype ;
+ }
+
public static LiteralLabel createLiteralLabel( String lex, String lang, RDFDatatype dtype )
throws DatatypeFormatException
- { return new LiteralLabelImpl( lex, lang, dtype ); }
+ {
+ dtype = fixDatatype(dtype, lang) ;
+ return new LiteralLabelImpl( lex, lang, dtype ); }
/**
* Build a plain literal label from its lexical form.
* @param lex the lexical form of the literal
* @param lang the optional language tag, only relevant for plain literals
*/
- public static LiteralLabel create(String lex, String lang)
- {
- return new LiteralLabelImpl(lex, lang, null);
+ public static LiteralLabel create(String lex, String lang) {
+ RDFDatatype dt = fixDatatype(null, lang) ;
+ return new LiteralLabelImpl(lex, lang, dt);
}
/**
@@ -46,6 +62,7 @@ public class LiteralLabelFactory
* @param dtype the type of the literal, null for old style "plain" literals
*/
public static LiteralLabel create(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException {
+ dtype = fixDatatype(dtype, lang) ;
return new LiteralLabelImpl(value, lang, dtype) ;
}
@@ -56,6 +73,8 @@ public class LiteralLabelFactory
* @param value the literal value to encapsulate
*/
public static LiteralLabel create(Object value) {
+ if ( value instanceof String )
+ create((String)value, null) ;
return new LiteralLabelImpl(value) ;
}
@@ -63,8 +82,10 @@ public class LiteralLabelFactory
* Creates either a plain literal or an XMLLiteral.
* @param xml If true then s is exclusive canonical XML of type rdf:XMLLiteral, and no checking will be invoked.
*/
- public static LiteralLabel create(String s, String lg, boolean xml) {
- return new LiteralLabelImpl(s, lg, xml) ;
+ public static LiteralLabel create(String s, String lang, boolean xml) {
+ if ( xml )
+ return new LiteralLabelImpl(s, lang, xml) ;
+ return create(s, lang) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
index c4c46b0..b31288c 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
@@ -182,14 +182,14 @@ final /*public*/ class LiteralLabelImpl implements LiteralLabel {
* @param xml If true then s is exclusive canonical XML of type rdf:XMLLiteral, and no checking will be invoked.
*/
- LiteralLabelImpl(String s, String lg, boolean xml) {
- setLiteralLabel_3(s, lg, xml) ;
+ LiteralLabelImpl(String s, String lang, boolean xml) {
+ setLiteralLabel_3(s, lang, xml) ;
}
- private void setLiteralLabel_3(String s, String lg, boolean xml) {
+ private void setLiteralLabel_3(String s, String lang, boolean xml) {
// Constructor extraction: Preparation for moving into Node_Literal.
this.lexicalForm = s;
- this.lang = (lg == null ? "" : lg);
+ this.lang = (lang == null ? "" : lang);
if (xml) {
// XML Literal
this.dtype = XMLLiteralType.theXMLLiteralType;
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
index ece5e9a..623174a 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
@@ -17,11 +17,15 @@
*/
package com.hp.hpl.jena.rdf.model.impl;
-import java.util.regex.*;
+import java.util.regex.Matcher ;
+import java.util.regex.Pattern ;
-import org.apache.xerces.util.XMLChar;
+import org.apache.xerces.util.XMLChar ;
-import com.hp.hpl.jena.shared.*;
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
+import com.hp.hpl.jena.rdf.model.Literal ;
+import com.hp.hpl.jena.shared.CannotEncodeCharacterException ;
/** Some utility functions.
*/
@@ -197,21 +201,21 @@ public class Util extends Object {
return result + s.substring(lastPos, s.length());
}
- /** Call System.getProperty and suppresses SecurityException, (simply returns null).
- *@return The property value, or null if none or there is a SecurityException.
- */
- public static String XgetProperty(String p) {
- return XgetProperty( p, null );
- }
- /** Call System.getProperty and suppresses SecurityException, (simply returns null).
- *@return The property value, or null if none or there is a SecurityException.
- */
- public static String XgetProperty(String p, String def) {
- try {
- return System.getProperty(p, def);
- } catch (SecurityException e) {
- return def;
+ /** Return true if the literal should be written as a string, without datatype or lang. (RDF 1.0 and RDF 1.1) */
+ public static boolean isSimpleString(Literal lit) {
+ if ( lit.getDatatypeURI() == null ) {
+ return ! isLangString(lit) ;
}
+ if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(XSDDatatype.XSDstring.getURI()) )
+ return true;
+ return false ;
+ }
+
+ /** Return true if the literals shodul be written with a language string. (RDF 1.0 and RDF 1.1) */
+ public static boolean isLangString(Literal lit) {
+ String lang = lit.getLanguage() ;
+ if ( lang == null )
+ return false ;
+ return ! lang.equals("") ;
}
-
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
index 8b3869c..73d03fe 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
@@ -163,20 +163,22 @@ public class Basic extends BaseXMLWriter
protected void writeLiteral( Literal l, PrintWriter writer ) {
String lang = l.getLanguage();
String form = l.getLexicalForm();
- if (!lang.equals("")) {
+ if (Util.isLangString(l)) {
writer.print(" xml:lang=" + attributeQuoted( lang ));
- }
- if (l.isWellFormedXML() && !blockLiterals) {
+ } else if (l.isWellFormedXML() && !blockLiterals) {
+ // RDF XML Literals inline.
writer.print(" " + rdfAt("parseType") + "=" + attributeQuoted( "Literal" )+">");
writer.print( form );
+ return ;
} else {
- // No lang.
- String dt = l.getDatatypeURI();
- if ( ! Unparser.isSimpleString(l) )
- writer.print( " " + rdfAt( "datatype" ) + "=" + substitutedAttribute( dt ) );
- writer.print(">");
- writer.print( Util.substituteEntitiesInElementContent( form ) );
+ // Datatype (if not xsd:string and RDF 1.1)
+ String dt = l.getDatatypeURI();
+ if ( ! Util.isSimpleString(l) )
+ writer.print( " " + rdfAt( "datatype" ) + "=" + substitutedAttribute( dt ) );
}
+ // Content.
+ writer.print(">");
+ writer.print( Util.substituteEntitiesInElementContent( form ) );
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/4352b0f4/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
index feab029..c523c70 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -115,24 +115,22 @@ package com.hp.hpl.jena.rdfxml.xmloutput.impl;
*
* [6.34] literal ::= (any well-formed XML)
*/
-import java.io.PrintWriter;
-import java.util.*;
-
-import org.apache.xerces.util.XMLChar;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jena.iri.IRI;
-
-import com.hp.hpl.jena.JenaRuntime ;
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
-import com.hp.hpl.jena.rdf.model.impl.Util;
-import com.hp.hpl.jena.shared.BrokenException;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.shared.PropertyNotFoundException;
-import com.hp.hpl.jena.util.iterator.*;
-import com.hp.hpl.jena.vocabulary.RDF;
+import java.io.PrintWriter ;
+import java.util.* ;
+
+import org.apache.jena.iri.IRI ;
+import org.apache.xerces.util.XMLChar ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.impl.PropertyImpl ;
+import com.hp.hpl.jena.rdf.model.impl.Util ;
+import com.hp.hpl.jena.shared.BrokenException ;
+import com.hp.hpl.jena.shared.JenaException ;
+import com.hp.hpl.jena.shared.PropertyNotFoundException ;
+import com.hp.hpl.jena.util.iterator.* ;
+import com.hp.hpl.jena.vocabulary.RDF ;
/**
* An Unparser will output a model in the abbreviated syntax. *
@@ -458,24 +456,14 @@ class Unparser {
return true;
}
- /** Return true if to be written as a string, without datatype or lang */
- /*package*/ static boolean isSimpleString(Literal lit) {
- if ( lit.getDatatypeURI() == null )
- return true;
- if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(XSDDatatype.XSDstring.getURI()) )
- return true;
- if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(RDF.langString.getId()) )
- return true;
-
- return false ;
- }
-
private boolean wPropertyEltDatatype(WType wt, Property prop, Statement s,
RDFNode r) {
if (! (r instanceof Literal) )
return false ;
Literal lit = ((Literal) r) ;
- if ( isSimpleString(lit) )
+ if ( Util.isSimpleString(lit) )
+ return false;
+ if ( Util.isLangString(lit) )
return false;
// print out with "datatype="
[38/48] jena git commit: Put message in exception.
Posted by rv...@apache.org.
Put message in exception.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c23422af
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c23422af
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c23422af
Branch: refs/heads/hadoop-rdf
Commit: c23422af18ac84cce2a540fab436471f8cc812a4
Parents: 7cf034e
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:58:04 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:58:04 2014 +0000
----------------------------------------------------------------------
.../org/apache/jena/riot/ErrorHandlerTestLib.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c23422af/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java b/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
index 2f739fe..9e48127 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
@@ -23,27 +23,28 @@ import java.util.List ;
import org.apache.jena.riot.system.ErrorHandler ;
+/** Error handled to convert anything to an exception */
public class ErrorHandlerTestLib
{
- public static class ExFatal extends RuntimeException {}
+ public static class ExFatal extends RuntimeException { ExFatal(String msg) { super(msg) ; } }
- public static class ExError extends RuntimeException {}
+ public static class ExError extends RuntimeException { ExError(String msg) { super(msg) ; } }
- public static class ExWarning extends RuntimeException {}
+ public static class ExWarning extends RuntimeException { ExWarning(String msg) { super(msg) ; } }
public static class ErrorHandlerEx implements ErrorHandler
{
@Override
public void warning(String message, long line, long col)
- { throw new ExWarning() ; }
+ { throw new ExWarning(message) ; }
@Override
public void error(String message, long line, long col)
- { throw new ExError() ; }
+ { throw new ExError(message) ; }
@Override
public void fatal(String message, long line, long col)
- { throw new ExFatal() ; }
+ { throw new ExFatal(message) ; }
}
// Error handler that records messages
@@ -61,7 +62,7 @@ public class ErrorHandlerTestLib
@Override
public void fatal(String message, long line, long col)
- { msgs.add(message) ; throw new ExFatal() ; }
+ { msgs.add(message) ; throw new ExFatal(message) ; }
}
}
[46/48] jena git commit: create(String, String) and create(String,
Datatype) for literals.
Posted by rv...@apache.org.
create(String, String) and create(String, Datatype) for literals.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e97b0dd6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e97b0dd6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e97b0dd6
Branch: refs/heads/hadoop-rdf
Commit: e97b0dd6c22c5d3c6531f4a3ddc40e7333ef6fc8
Parents: d3d43e9
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 23 18:13:35 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 23 18:13:35 2014 +0000
----------------------------------------------------------------------
.../main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e97b0dd6/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
index 66342a8..76ba693 100644
--- a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
+++ b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
@@ -243,16 +243,16 @@ public class SQLBridge2 extends SQLBridgeBase
case STRING:
return NodeFactory.createLiteral(lex, lang) ;
case XSDSTRING:
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDstring) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDstring) ;
case INTEGER:
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDinteger) ;
case DOUBLE:
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdouble) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdouble) ;
case DATETIME:
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdateTime) ;
case OTHER:
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(datatype);
- return NodeFactory.createLiteral(lex, null, dt) ;
+ return NodeFactory.createLiteral(lex, dt) ;
default:
log.warn("Unrecognized: ("+lex+", "+lang+", "+vType+")") ;
return NodeFactory.createLiteral("UNRECOGNIZED") ;
[05/48] jena git commit: Remove warning about a situation that can
now happen.
Posted by rv...@apache.org.
Remove warning about a situation that can now happen.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/02015dc3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/02015dc3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/02015dc3
Branch: refs/heads/hadoop-rdf
Commit: 02015dc379d493628a612b6ca382c74481561c7c
Parents: 890ff39
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 15:37:42 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 15:37:42 2014 +0000
----------------------------------------------------------------------
jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/02015dc3/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
index b8569b4..bbfc507 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
@@ -120,9 +120,9 @@ public class FileRef
{
Tuple<String> x = FileOps.splitDirFile(filename) ;
String key = x.get(1) ;
- if ( ! name2id.containsKey(key) )
- {
- Log.warn(FileRef.class, "File name not registered: "+filename) ;
+ if ( ! name2id.containsKey(key) ) {
+ //Log.warn(FileRef.class, "File name not registered: "+filename) ;
+ Log.debug(FileRef.class, "File name not registered: "+filename) ;
file(key) ;
}
[34/48] jena git commit: Reformat
Posted by rv...@apache.org.
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f6e1db0b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f6e1db0b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f6e1db0b
Branch: refs/heads/hadoop-rdf
Commit: f6e1db0b5c61e39ed4695ddbfebd4bf0bc4ae0ff
Parents: 3a345b0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:24:54 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:24:54 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/tokens/TestTokenForNode.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f6e1db0b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
index 22647c4..7531e97 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
@@ -78,16 +78,14 @@ public class TestTokenForNode extends BaseTest
@Test public void tokenForNode22()
{ test( "12e0", TokenType.DOUBLE, "12e0", null, null, null) ; }
- private static void test(String nodeStr,
- TokenType type, String image, String image2, Token subToken1, Token subToken2)
+ private static void test(String nodeStr, TokenType type, String image, String image2, Token subToken1, Token subToken2)
{
Node n = NodeFactoryExtra.parseNode(nodeStr) ;
test(n, type, image, image2, subToken1, subToken2) ;
}
- private static void test(Node node,
- TokenType type, String image, String image2, Token subToken1, Token subToken2)
+ private static void test(Node node, TokenType type, String image, String image2, Token subToken1, Token subToken2)
{
Token t = Token.tokenForNode(node, base, prefixMap) ;
assertEquals(type, t.getType()) ;
[03/48] jena git commit: JENA-813 : Add javadoc to note when
IteratorConcat is better.
Posted by rv...@apache.org.
JENA-813 : Add javadoc to note when IteratorConcat is better.
Prefer IteratroCons in Iter.append and note not good style for large
numbers of iterators. Consolidate other changes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5896fa62
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5896fa62
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5896fa62
Branch: refs/heads/hadoop-rdf
Commit: 5896fa623ff6b0beeffe4c5da7a33f223c38e69c
Parents: 5c280fa
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 12:10:59 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 12:10:59 2014 +0000
----------------------------------------------------------------------
jena-arq/ReleaseNotes.txt | 3 +-
.../jena/sparql/core/DatasetGraphBaseFind.java | 2 +-
.../jena/sparql/core/DatasetGraphCaching.java | 2 +-
.../org/apache/jena/atlas/iterator/Iter.java | 44 ++----
.../jena/atlas/iterator/IteratorConcat.java | 13 +-
.../jena/atlas/iterator/IteratorCons.java | 141 ++++++++++---------
.../java/org/apache/jena/atlas/lib/Map2.java | 2 +-
.../apache/jena/atlas/iterator/TestIter.java | 24 ++--
.../jena/atlas/iterator/TestIteratorPeek.java | 2 +-
9 files changed, 108 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/ReleaseNotes.txt
----------------------------------------------------------------------
diff --git a/jena-arq/ReleaseNotes.txt b/jena-arq/ReleaseNotes.txt
index ac092c6..12b0e08 100644
--- a/jena-arq/ReleaseNotes.txt
+++ b/jena-arq/ReleaseNotes.txt
@@ -4,8 +4,7 @@ ChangeLog for ARQ
==== Jena 2.12.2
-+ JENA-813 : Improve performance of DatasetGraphCollection, deprecate and remove usage of Iter.append() and
- IteratorCons in favour of Iter.concat() and IteratorConcat
++ JENA-813 : Improve performance of DatasetGraphCollection for large numbes of named graphs.
==== Jena 2.12.1
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java
index b08fa3a..e83f0c1 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java
@@ -73,7 +73,7 @@ abstract public class DatasetGraphBaseFind extends DatasetGraphBase
if ( iter1 == null && iter2 == null )
return Iter.nullIterator() ;
// Copes with null in either position.
- return Iter.concat(iter1, iter2) ;
+ return Iter.append(iter1, iter2) ;
}
protected abstract Iterator<Quad> findInDftGraph(Node s, Node p , Node o) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
index d69383e..a73591a 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCaching.java
@@ -177,7 +177,7 @@ abstract public class DatasetGraphCaching extends DatasetGraphTriplesQuads
for ( ; iter.hasNext() ; )
{
Node gn = iter.next() ;
- quads = Iter.concat(quads, findInSpecificNamedGraph(dsg, gn, s, p, o)) ;
+ quads = Iter.append(quads, findInSpecificNamedGraph(dsg, gn, s, p, o)) ;
}
return quads ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
index 9ae35eb..f46a631 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
@@ -443,18 +443,18 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
return Iter.operate(stream, action) ;
}
- /**
- * @deprecated Use {@link #concat(Iterable, Iterable)} instead which is much more performant
+ /** Join two iteratables
+ * If there, potentially, going to be many iterators, it is better to
+ * create an {@linkplain IteratorConcat} explicitly and add each iterator.
*/
- @Deprecated
- public static <T> Iterator<T> append(Iterable<T> iter1, Iterable<T> iter2) {
+ public static <T> Iterator<T> append(Iterable<? extends T> iter1, Iterable<? extends T> iter2) {
return IteratorCons.create(iterator(iter1), iterator(iter2)) ;
}
- /**
- * @deprecated Use {@link #concat(Iterator, Iterator)} instead which is much more performant
+ /** Join two iterator
+ * If there, potentially, going to be many iterators, it is better to
+ * create an {@linkplain IteratorConcat} explicitly and add each iterator.
*/
- @Deprecated
public static <T> Iterator<T> append(Iterator<? extends T> iter1, Iterator<? extends T> iter2) {
return IteratorCons.create(iter1, iter2) ;
}
@@ -754,7 +754,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
return iter2 ;
if ( iter2 == null )
return iter1 ;
- return iter1.concat(iter2) ;
+ return iter1.append(iter2) ;
}
public static <T> Iterator<T> concat(Iterator<T> iter1, Iterator<T> iter2) {
@@ -762,15 +762,7 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
return iter2 ;
if ( iter2 == null )
return iter1 ;
- return Iter.iter(iter1).concat(Iter.iter(iter2)) ;
- }
-
- public static <T> Iterator<T> concat(Iterable<T> iter1, Iterable<T> iter2) {
- if (iter1 == null)
- return iter2.iterator();
- if (iter2 == null)
- return iter1.iterator();
- return Iter.concat(iter1.iterator(), iter2.iterator());
+ return Iter.iter(iter1).append(Iter.iter(iter2)) ;
}
public static <T> T first(Iterator<T> iter, Filter<T> filter) {
@@ -901,17 +893,13 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
apply(iterator, action) ;
}
- /**
- * @deprecated Use {@link #concat(Iterator)} instead which is much more performant
+ /** Join on an iterator.
+ * If there are going to be many iterators, uit is better to create an {@linkplain IteratorConcat}
+ * and <tt>.add</tt> each iterator. The overheads are much lower.
*/
- @Deprecated
public Iter<T> append(Iterator<T> iter) {
return new Iter<>(IteratorCons.create(iterator, iter)) ;
}
-
- public Iter<T> concat(Iterator<T> iter) {
- return new Iter<>(IteratorConcat.concat(iterator, iter));
- }
/** Return an Iter that yields at most the first N items */
public Iter<T> take(int N) {
@@ -949,14 +937,6 @@ public class Iter<T> implements Iterable<T>, Iterator<T> {
// ---- Iterator
- // ----
- // Could merge in concatenated iterators - if used a lot there is reducable
- // cost.
- // Just putting in a slot is free (?) because objects of one or two slots
- // have
- // the same memory allocation.
- // And .. be an iterator framework for extension
-
@Override
public boolean hasNext() {
return iterator.hasNext() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
index 3d5958c..65e6430 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
@@ -24,13 +24,13 @@ import java.util.NoSuchElementException ;
import org.apache.jena.atlas.lib.DS ;
-/** Iterator of Iterators */
+/** Iterator of Iterators
+ * IteratorConcat is better when there are lots of iterators to be joined.
+ * IteratorCons is slightly better for two iterators.
+ */
public class IteratorConcat<T> implements Iterator<T>
{
- // No - we don't really need IteratorCons and IteratorConcat
- // Historical.
-
private List<Iterator<T>> iterators = DS.list();
int idx = -1 ;
private Iterator<T> current = null ;
@@ -38,7 +38,7 @@ public class IteratorConcat<T> implements Iterator<T>
boolean finished = false ;
/**
- * Usually better to create an IteratorConcat explicitly and add iterator if there are going to be many.
+ * Usually, it is better to create an IteratorConcat explicitly and add iterator if there are going to be many.
* @param iter1
* @param iter2
* @return Iterator
@@ -54,6 +54,9 @@ public class IteratorConcat<T> implements Iterator<T>
return c ;
}
+ public IteratorConcat() {}
+
+
public void add(Iterator<T> iter) { iterators.add(iter) ; }
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
index e86cdee..b3a5943 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
@@ -18,104 +18,105 @@
package org.apache.jena.atlas.iterator;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.Iterator ;
+import java.util.NoSuchElementException ;
-/**
- * IteratorCons : the concatenation of two iterators.
- * <p>
- * This has known performance issues when used with lots of iterators and so
- * should be avoided in favour of {@link IteratorConcat} which is much better
- * performing (see <a
- * href="https://issues.apache.org/jira/browse/JENA-813">JENA-813</a> for some
- * discussion)
- * </p>
- *
- * @deprecated Use the more performant {@link IteratorConcat} instead
+/** IteratorCons : the concatenation of two iterators.
+ * See also {@linkplain IteratorConcat}.
+ * If there potentially many iterators to be joined, it is better to
+ * create an IteratorConcat explicitly and add each iterator.
+ * IteratorCons is slightly better in the two iterator case.
*/
-@Deprecated
-public class IteratorCons<T> implements Iterator<T>, Iterable<T> {
+public class IteratorCons<T> implements Iterator<T>, Iterable<T>
+{
// No - we don't really need IteratorCons and IteratorConcat
- // Historical.
+ // Historical - IteratorCons came first.
+ // IteratorConcat is nearly as good as IteratorCons in the small when it
+ // it is hard to see when it woudl matter much.
+
+ private Iterator<? extends T> iter1 ;
+ private Iterator<? extends T> iter2 ;
+ private Iterator<? extends T> removeFrom ;
- private Iterator<? extends T> iter1;
- private Iterator<? extends T> iter2;
- private Iterator<? extends T> removeFrom;
-
- /**
- * @deprecated Use {@link IteratorConcat#concat(Iterator, Iterator)} instead which is much more performant
- */
- @Deprecated
- public static <X> Iterator<X> create(Iterator<? extends X> iter1, Iterator<? extends X> iter2) {
- if (iter1 == null && iter2 == null)
- return Iter.nullIter();
-
- // The casts are safe because an iterator can only return X, and does
- // not take an X an an assignment.
- if (iter1 == null) {
+ public static <X> Iterator<X> create(Iterator<? extends X> iter1, Iterator<? extends X> iter2)
+ {
+ if ( iter1 == null && iter2 == null )
+ return Iter.nullIter() ;
+
+ // The casts are safe because an iterator can only return X, and does not take an X an an assignment.
+ if ( iter1 == null )
+ {
@SuppressWarnings("unchecked")
- Iterator<X> x = (Iterator<X>) iter2;
- return x;
+ Iterator<X> x = (Iterator<X>)iter2 ;
+ return x ;
}
-
- if (iter2 == null) {
+
+ if ( iter2 == null )
+ {
@SuppressWarnings("unchecked")
- Iterator<X> x = (Iterator<X>) iter1;
- return x;
+ Iterator<X> x = (Iterator<X>)iter1 ;
+ return x ;
}
-
- return new IteratorCons<>(iter1, iter2);
+
+ return new IteratorCons<>(iter1, iter2) ;
}
-
- private IteratorCons(Iterator<? extends T> iter1, Iterator<? extends T> iter2) {
- this.iter1 = iter1;
- this.iter2 = iter2;
+
+ private IteratorCons(Iterator<? extends T> iter1, Iterator<? extends T> iter2)
+ {
+ this.iter1 = iter1 ;
+ this.iter2 = iter2 ;
}
@Override
- public boolean hasNext() {
- if (iter1 != null) {
- if (iter1.hasNext())
- return true;
+ public boolean hasNext()
+ {
+ if ( iter1 != null )
+ {
+ if ( iter1.hasNext() ) return true ;
// Iter1 ends
- iter1 = null;
+ iter1 = null ;
}
-
- if (iter2 != null) {
- if (iter2.hasNext())
- return true;
+
+ if ( iter2 != null )
+ {
+ if ( iter2.hasNext() ) return true ;
// Iter2 ends
- iter2 = null;
+ iter2 = null ;
}
- return false;
+ return false ;
}
@Override
- public T next() {
- if (!hasNext())
- throw new NoSuchElementException("Iterator2.next");
- if (iter1 != null) {
- removeFrom = iter1;
+ public T next()
+ {
+ if ( ! hasNext() )
+ throw new NoSuchElementException("Iterator2.next") ;
+ if ( iter1 != null )
+ {
+ removeFrom = iter1 ;
return iter1.next();
}
- if (iter2 != null) {
- removeFrom = iter2;
+ if ( iter2 != null )
+ {
+ removeFrom = iter2 ;
return iter2.next();
}
- throw new Error("Iterator2.next");
+ throw new Error("Iterator2.next") ;
}
@Override
- public void remove() {
- if (null == removeFrom)
- throw new IllegalStateException("no calls to next() since last call to remove()");
-
- removeFrom.remove();
- removeFrom = null;
+ public void remove()
+ {
+ if ( null == removeFrom )
+ throw new IllegalStateException("no calls to next() since last call to remove()") ;
+
+ removeFrom.remove() ;
+ removeFrom = null ;
}
@Override
- public Iterator<T> iterator() {
- return this;
+ public Iterator<T> iterator()
+ {
+ return this ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/main/java/org/apache/jena/atlas/lib/Map2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Map2.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Map2.java
index 3e3a254..75697e0 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Map2.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Map2.java
@@ -81,7 +81,7 @@ public class Map2<K, V> implements Iterable<K>
Iter<K> iter1 = Iter.iter(map1.keySet().iterator()) ;
if ( map2 == null )
return iter1 ;
- return iter1.concat(Iter.iter(map2.iterator())) ;
+ return iter1.append(map2.iterator()) ;
}
public boolean isEmpty()
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
index a8b9937..f611c03 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
@@ -37,29 +37,29 @@ public class TestIter
List<String> data3 = Arrays.asList(null, "x", null, null, null, "y", "z", null);
@Test
- public void concat_1()
+ public void append_1()
{
- Iterator<String> iter = Iter.concat(data1, data0) ;
+ Iterator<String> iter = Iter.append(data1, data0) ;
test(iter, "a") ;
}
@Test
- public void concat_2()
+ public void append_2()
{
- Iterator<String> iter = Iter.concat(data0, data1) ;
+ Iterator<String> iter = Iter.append(data0, data1) ;
test(iter, "a") ;
}
@Test
- public void concat_3()
+ public void append_3()
{
- Iterator<String> iter = Iter.concat(data1, data2) ;
+ Iterator<String> iter = Iter.append(data1, data2) ;
test(iter, "a", "x", "y", "z") ;
}
@Test
- public void concat_4()
+ public void append_4()
{
List<String> L = new ArrayList<>(3);
L.add("a");
@@ -71,7 +71,7 @@ public class TestIter
R.add("f");
- Iterator<String> LR = Iter.concat(L, R) ;
+ Iterator<String> LR = Iter.append(L, R) ;
while (LR.hasNext())
{
@@ -89,7 +89,7 @@ public class TestIter
}
@Test
- public void concat_5()
+ public void append_5()
{
List<String> L = new ArrayList<>(3);
L.add("a");
@@ -101,7 +101,7 @@ public class TestIter
R.add("f");
- Iterator<String> LR = Iter.concat(L, R) ;
+ Iterator<String> LR = Iter.append(L, R) ;
while (LR.hasNext())
{
@@ -119,7 +119,7 @@ public class TestIter
}
@Test
- public void concat_6()
+ public void append_6()
{
List<String> L = new ArrayList<>(3);
L.add("a");
@@ -131,7 +131,7 @@ public class TestIter
R.add("f");
- Iterator<String> LR = Iter.concat(L, R) ;
+ Iterator<String> LR = Iter.append(L, R) ;
while (LR.hasNext())
{
http://git-wip-us.apache.org/repos/asf/jena/blob/5896fa62/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
index 59b3dee..33f0b70 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
@@ -45,7 +45,7 @@ public class TestIteratorPeek extends BaseTest
@Test public void iter_01()
{
Iter<String> iter = Iter.iter(data2) ;
- iter = iter.concat(data2.iterator()) ;
+ iter = iter.append(data2.iterator()) ;
test(iter, "x", "y", "z", "x", "y", "z") ;
}
[20/48] jena git commit: Remove unused.
Posted by rv...@apache.org.
Remove unused.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/82128c27
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/82128c27
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/82128c27
Branch: refs/heads/hadoop-rdf
Commit: 82128c271bbc902eeb14373addea8fa10cf2334d
Parents: 985b99a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:57:20 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:57:20 2014 +0000
----------------------------------------------------------------------
.../jena/graph/impl/LiteralLabelFactory.java | 22 +-------------------
1 file changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/82128c27/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index 360514d..69c9ae1 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -49,24 +49,6 @@ public class LiteralLabelFactory
return new LiteralLabelImpl(value, lang, dtype) ;
}
-
-// /**
-// * Build a typed literal label supplying both value and lexical form.
-// * The caller guarantees that the lexical form is legal,
-// * and the value corresponds.
-// *
-// * @param lex the lexical form of the literal
-// * @param value the value of the literal
-// * @param lang the optional language tag, only relevant for plain literals
-// * @param dtype the type of the literal, null for old style "plain" literals
-// */
-// public static LiteralLabel create(String lex,
-// Object value,
-// String lang,
-// RDFDatatype dtype) {
-// return new LiteralLabelImpl(lex, value, lang, dtype) ;
-// }
-
/**
* Build a typed literal label from its value form using
* whatever datatype is currently registered as the the default
@@ -78,10 +60,8 @@ public class LiteralLabelFactory
}
/**
- * Old style constructor. Creates either a plain literal or an
- * XMLLiteral.
+ * Creates either a plain literal or an XMLLiteral.
* @param xml If true then s is exclusive canonical XML of type rdf:XMLLiteral, and no checking will be invoked.
-
*/
public static LiteralLabel create(String s, String lg, boolean xml) {
return new LiteralLabelImpl(s, lg, xml) ;
[15/48] jena git commit: Don't RAT files that are JSON (no comments)
Posted by rv...@apache.org.
Don't RAT files that are JSON (no comments)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9e69b396
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9e69b396
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9e69b396
Branch: refs/heads/hadoop-rdf
Commit: 9e69b3968852080ea7d63b10337f25f835d6177a
Parents: aa78d8a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 12:37:02 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 12:37:02 2014 +0000
----------------------------------------------------------------------
jena-parent/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9e69b396/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 32df4c4..2a3d2a3 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -395,7 +395,8 @@
<exclude>**/log4j-testing.properties</exclude>
<exclude>**/derby.log</exclude>
<exclude>**/DB/**/*</exclude>
-
+ <!-- TDB config files JSON - no comments allowed -->
+ <exclude>**/tdb*.cfg</exclude>
</excludes>
</configuration>
</plugin>
[40/48] jena git commit: JENA-816 : SPARQL for RDF 1.1 : "Argument
Compatibility Rules"
Posted by rv...@apache.org.
JENA-816 : SPARQL for RDF 1.1 : "Argument Compatibility Rules"
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/96476222
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/96476222
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/96476222
Branch: refs/heads/hadoop-rdf
Commit: 96476222d3bd9dd8c59e7e5ccde586fd3b124a7e
Parents: 707ecb9
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 17:31:52 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 17:31:52 2014 +0000
----------------------------------------------------------------------
.../hpl/jena/sparql/expr/nodevalue/NodeFunctions.java | 12 ++++++++++--
.../com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java | 13 +++++--------
.../com/hp/hpl/jena/sparql/expr/TestNodeValue.java | 10 +++++++---
3 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/96476222/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
index 94013ff..ff52250 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -30,11 +30,13 @@ import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
+
import com.hp.hpl.jena.sparql.expr.ExprEvalException ;
import com.hp.hpl.jena.sparql.expr.ExprTypeException ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
+import com.hp.hpl.jena.sparql.util.NodeUtils ;
import com.hp.hpl.jena.vocabulary.XSD ;
/**
@@ -52,9 +54,15 @@ public class NodeFunctions {
Node n = nv.asNode() ;
if ( !n.isLiteral() )
throw new ExprEvalException(label + ": Not a literal: " + nv) ;
- RDFDatatype dt = n.getLiteralDatatype() ;
String lang = n.getLiteralLanguage() ;
-
+
+ if ( NodeUtils.isLangString(n) )
+ // Language tag. Legal.
+ return n ;
+
+ // No language tag : either no datatype or a datatype of xsd:string
+ // Special case : rdf:langString and no language ==> Illegal
+ RDFDatatype dt = n.getLiteralDatatype() ;
if ( dt != null && !dt.equals(XSDDatatype.XSDstring) )
throw new ExprEvalException(label + ": Not a string literal: " + nv) ;
return n ;
http://git-wip-us.apache.org/repos/asf/jena/blob/96476222/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
index 3e0bd4e..af59b16 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.expr ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
@@ -32,13 +33,6 @@ public class TestNodeFunctions extends BaseTest {
private static final double accuracyExact = 0.0d ;
private static final double accuracyClose = 0.000001d ;
- // public static TestSuite suite()
- // {
- // TestSuite ts = new TestSuite(TestNodeFunctions.class) ;
- // ts.setName(Utils.classShortName(TestNodeFunctions.class)) ;
- // return ts ;
- // }
-
@Test public void testSameTerm1() {
Node n1 = NodeFactory.createLiteral("xyz") ;
Node n2 = NodeFactory.createLiteral("xyz") ;
@@ -60,7 +54,10 @@ public class TestNodeFunctions extends BaseTest {
@Test public void testSameTerm4() {
Node n1 = NodeFactory.createLiteral("xyz") ;
Node n2 = NodeFactory.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
- assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
+ if ( JenaRuntime.isRDF11 )
+ assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
+ else
+ assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm5() {
http://git-wip-us.apache.org/repos/asf/jena/blob/96476222/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
index 83b323b..f6d1296 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
@@ -26,6 +26,7 @@ import java.util.TimeZone ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
@@ -630,9 +631,12 @@ public class TestNodeValue extends BaseTest
assertTrue("Not a string: "+v, v.isString()) ;
assertTrue("Not a node: "+v, v.hasNode()) ;
String actualStr = v.asQuotedString() ;
- assertEquals("Print form mismatch",
- "\"string\"^^<"+XSDDatatype.XSDstring.getURI()+">",
- actualStr) ;
+ String rightAnswer = JenaRuntime.isRDF11
+ // RDF 1.1 -- appearance is a without ^^
+ ? "\"string\""
+ : "\"string\"^^<"+XSDDatatype.XSDstring.getURI()+">" ;
+
+ assertEquals("Print form mismatch", rightAnswer, actualStr) ;
}
// TODO testSameValueDecimal tests
[19/48] jena git commit: Jena-1/2 mention - now rather old.
Posted by rv...@apache.org.
Jena-1/2 mention - now rather old.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/985b99ae
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/985b99ae
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/985b99ae
Branch: refs/heads/hadoop-rdf
Commit: 985b99ae73c77730d6d590aa7b76c987e6b546e2
Parents: 8a8bf93
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:56:54 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:56:54 2014 +0000
----------------------------------------------------------------------
.../src/main/java/com/hp/hpl/jena/graph/NodeFactory.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/985b99ae/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
index 4918cc9..e62bab5 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
@@ -59,12 +59,11 @@ public class NodeFactory
@param isXml If true then lit is exclusive canonical XML of type
rdf:XMLLiteral, and no checking will be invoked.
*/
- public static Node createLiteral( String lit, String lang, boolean isXml )
- {
- if (lit == null) throw new NullPointerException
- ( "null for literals has been illegal since Jena 2.0" );
- return createLiteral( LiteralLabelFactory.create( lit, lang, isXml ) );
- }
+ public static Node createLiteral( String lex, String lang, boolean isXml )
+ {
+ if (lex == null) throw new NullPointerException( "null lexical form for literal" );
+ return createLiteral( LiteralLabelFactory.create( lex, lang, isXml ) );
+ }
/**
* Build a literal node from its lexical form. The
[04/48] jena git commit: Add Class log selector variants.
Posted by rv...@apache.org.
Add Class<?> log selector variants.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/890ff39b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/890ff39b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/890ff39b
Branch: refs/heads/hadoop-rdf
Commit: 890ff39b99c99eacb963b3dcacab6e34f1022597
Parents: 5896fa6
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 15:36:30 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 15:36:30 2014 +0000
----------------------------------------------------------------------
.../org/apache/jena/atlas/logging/FmtLog.java | 61 +++++++++++++++++++-
1 file changed, 59 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/890ff39b/jena-arq/src/main/java/org/apache/jena/atlas/logging/FmtLog.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/logging/FmtLog.java b/jena-arq/src/main/java/org/apache/jena/atlas/logging/FmtLog.java
index 640c83b..590c49e 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/logging/FmtLog.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/logging/FmtLog.java
@@ -21,6 +21,7 @@ package org.apache.jena.atlas.logging;
import java.util.IllegalFormatException ;
import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/** Logging with String.format (which can be a expensive)
* The formatting operations are not designed specifically for performance,
@@ -29,7 +30,9 @@ import org.slf4j.Logger ;
* required by level setting.
*
* An odd effect is order of the arguments - vararg arguments must be last
- * so the order is Logger/Format/Thorwable?/args
+ * so the order is Logger/Thorwable?/Format/args.
+ *
+ * Also support: Class object instead of logger to help ad hoc usage.
*/
public class FmtLog {
/* Log at 'trace' level. */
@@ -44,6 +47,16 @@ public class FmtLog {
log.trace(format(fmt, args), th) ;
}
+ /* Log at 'trace' level. */
+ public static void trace(Class<?> cls, String fmt, Object...args) {
+ trace(log(cls), fmt, args) ;
+ }
+
+ /* Log at 'trace' level. */
+ public static void trace(Class<?> cls, Throwable th, String fmt, Object...args) {
+ trace(log(cls), th, fmt, args) ;
+ }
+
/* Log at 'debug' level */
public static void debug(Logger log, String fmt, Object...args) {
if ( log.isDebugEnabled() )
@@ -56,6 +69,16 @@ public class FmtLog {
log.debug(format(fmt, args), th) ;
}
+ /* Log at 'debug' level */
+ public static void debug(Class<?> cls, String fmt, Object...args) {
+ debug(log(cls), fmt, args) ;
+ }
+
+ /* Log at 'debug' level */
+ public static void debug(Class<?> cls, Throwable th, String fmt, Object...args) {
+ debug(log(cls), th, fmt, args) ;
+ }
+
/* Log at 'info' level */
public static void info(Logger log, String fmt, Object...args) {
if ( log.isInfoEnabled() )
@@ -68,6 +91,15 @@ public class FmtLog {
log.info(format(fmt, args), th) ;
}
+ /* Log at 'info' level */
+ public static void info(Class<?> cls, String fmt, Object...args) {
+ info(log(cls), fmt, args) ;
+ }
+
+ /* Log at 'info' level */
+ public static void info(Class<?> cls, Throwable th, String fmt, Object...args) {
+ info(log(cls), th, fmt, args) ;
+ }
/* Log at 'warn' level */
public static void warn(Logger log, String fmt, Object...args) {
@@ -81,7 +113,17 @@ public class FmtLog {
log.warn(format(fmt, args), th) ;
}
- /* Log at 'error' level */
+ /* Log at 'warn' level */
+ public static void warn(Class<?> cls, String fmt, Object...args) {
+ warn(log(cls), fmt, args) ;
+ }
+
+ /* Log at 'warn' level */
+ public static void warn(Class<?> cls, Throwable th, String fmt, Object...args) {
+ warn(log(cls), th, fmt, args) ;
+ }
+
+ /* Log at 'error' level */
public static void error(Logger log, String fmt, Object...args) {
if ( log.isErrorEnabled() )
log.error(format(fmt, args)) ;
@@ -93,6 +135,17 @@ public class FmtLog {
log.error(format(fmt, args), th) ;
}
+ /* Log at 'error' level */
+ public static void error(Class<?> cls, String fmt, Object...args) {
+ error(log(cls), fmt, args) ;
+ }
+
+ /* Log at 'error' level */
+ public static void error(Class<?> cls, Throwable th, String fmt, Object...args) {
+ error(log(cls), th, fmt, args) ;
+ }
+
+
private static String format(String fmt, Object[] args) {
try {
return String.format(fmt, args) ;
@@ -101,5 +154,9 @@ public class FmtLog {
return fmt+" "+args ;
}
}
+
+ private static Logger log(Class<?> cls) {
+ return LoggerFactory.getLogger(cls) ;
+ }
}
[48/48] jena git commit: Merge branch 'master' into hadoop-rdf
Posted by rv...@apache.org.
Merge branch 'master' into hadoop-rdf
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/80bccb96
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/80bccb96
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/80bccb96
Branch: refs/heads/hadoop-rdf
Commit: 80bccb965067c99cf6d44ebce9a135124d733b2b
Parents: c7f8c89 a539ff0
Author: Rob Vesse <rv...@apache.org>
Authored: Tue Nov 25 16:25:56 2014 +0000
Committer: Rob Vesse <rv...@apache.org>
Committed: Tue Nov 25 16:25:56 2014 +0000
----------------------------------------------------------------------
jena-arq/ReleaseNotes.txt | 3 +-
.../jena/sparql/core/DatasetGraphBaseFind.java | 2 +-
.../jena/sparql/core/DatasetGraphCaching.java | 2 +-
.../com/hp/hpl/jena/sparql/expr/NodeValue.java | 17 +-
.../hpl/jena/sparql/expr/aggregate/AggSum.java | 3 +-
.../sparql/expr/nodevalue/NodeFunctions.java | 18 +-
.../sparql/expr/nodevalue/NodeValueDecimal.java | 2 +-
.../sparql/expr/nodevalue/NodeValueDouble.java | 2 +-
.../expr/nodevalue/NodeValueDuration.java | 2 +-
.../sparql/expr/nodevalue/NodeValueFloat.java | 2 +-
.../sparql/expr/nodevalue/NodeValueInteger.java | 2 +-
.../jena/sparql/expr/nodevalue/XSDFuncOp.java | 21 +--
.../hp/hpl/jena/sparql/graph/GraphMemPlain.java | 4 +-
.../com/hp/hpl/jena/sparql/graph/NodeConst.java | 16 +-
.../com/hp/hpl/jena/sparql/lang/ParserBase.java | 16 +-
.../sparql/resultset/JSONInputIterator.java | 2 +-
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 4 +-
.../com/hp/hpl/jena/sparql/util/FmtUtils.java | 67 ++++----
.../hpl/jena/sparql/util/NodeFactoryExtra.java | 18 +-
.../com/hp/hpl/jena/sparql/util/NodeUtils.java | 28 +++-
.../org/apache/jena/atlas/iterator/Iter.java | 44 ++---
.../jena/atlas/iterator/IteratorConcat.java | 13 +-
.../jena/atlas/iterator/IteratorCons.java | 141 ++++++++--------
.../java/org/apache/jena/atlas/lib/Map2.java | 2 +-
.../org/apache/jena/atlas/logging/FmtLog.java | 61 ++++++-
.../java/org/apache/jena/riot/ResultSetMgr.java | 2 +-
.../java/org/apache/jena/riot/RiotReader.java | 2 +-
.../jena/riot/checker/CheckerLiterals.java | 164 ++++++++++---------
.../org/apache/jena/riot/lang/JsonLDReader.java | 2 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 4 +-
.../apache/jena/riot/out/NodeFormatterBase.java | 24 ++-
.../process/normalize/CanonicalizeLiteral.java | 27 ++-
.../riot/process/normalize/NormalizeValue.java | 16 +-
.../riot/process/normalize/NormalizeValue2.java | 4 +-
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../jena/riot/system/ParserProfileBase.java | 4 +-
.../jena/riot/system/ParserProfileChecker.java | 4 +-
.../org/apache/jena/riot/system/RiotLib.java | 2 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 6 +-
.../java/org/apache/jena/riot/tokens/Token.java | 10 +-
.../apache/jena/riot/writer/TurtleShell.java | 14 +-
.../engine/iterator/TestQueryIterSort.java | 2 +-
.../hp/hpl/jena/sparql/expr/TestFunctions.java | 4 +-
.../hpl/jena/sparql/expr/TestNodeFunctions.java | 39 ++---
.../hp/hpl/jena/sparql/expr/TestNodeValue.java | 26 +--
.../hp/hpl/jena/sparql/expr/TestOrdering.java | 52 +++---
.../hpl/jena/sparql/syntax/TestSSE_Basic.java | 8 +-
.../hpl/jena/sparql/syntax/TestSSE_Forms.java | 2 +-
.../com/hp/hpl/jena/sparql/util/TestList.java | 10 +-
.../jena/atlas/data/TestDistinctDataBag.java | 2 +-
.../jena/atlas/data/TestDistinctDataNet.java | 2 +-
.../jena/atlas/data/TestSortedDataBag.java | 2 +-
.../apache/jena/atlas/iterator/TestIter.java | 24 +--
.../jena/atlas/iterator/TestIteratorPeek.java | 2 +-
.../apache/jena/riot/ErrorHandlerTestLib.java | 15 +-
.../org/apache/jena/riot/out/TestNodeFmt.java | 16 +-
.../apache/jena/riot/system/TestChecker.java | 1 +
.../jena/riot/tokens/TestTokenForNode.java | 6 +-
.../apache/jena/riot/writer/TestRDFJSON.java | 17 +-
jena-arq/testing/ARQ/GroupBy/agg-1.srj | 3 +-
jena-arq/testing/ARQ/GroupBy/agg-2.srj | 3 +-
.../main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
.../hp/hpl/jena/datatypes/xsd/XSDDatatype.java | 2 +-
.../datatypes/xsd/impl/XSDBaseStringType.java | 24 +--
.../java/com/hp/hpl/jena/graph/NodeFactory.java | 146 ++++++++++-------
.../hp/hpl/jena/graph/impl/CollectionGraph.java | 4 +-
.../jena/graph/impl/LiteralLabelFactory.java | 79 +++++----
.../hpl/jena/graph/impl/LiteralLabelImpl.java | 60 ++++---
.../hp/hpl/jena/rdf/model/ResourceFactory.java | 6 +-
.../hp/hpl/jena/rdf/model/SimpleSelector.java | 2 +-
.../com/hp/hpl/jena/rdf/model/impl/AltImpl.java | 2 +-
.../hpl/jena/rdf/model/impl/ContainerImpl.java | 2 +-
.../hp/hpl/jena/rdf/model/impl/ModelCom.java | 8 +-
.../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java | 2 +-
.../hpl/jena/rdf/model/impl/StatementBase.java | 9 +-
.../com/hp/hpl/jena/rdf/model/impl/Util.java | 56 +++----
.../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 4 +-
.../hpl/jena/rdfxml/xmloutput/impl/Basic.java | 18 +-
.../jena/rdfxml/xmloutput/impl/Unparser.java | 45 ++---
.../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 10 +-
.../java/com/hp/hpl/jena/vocabulary/RDF.java | 4 +
.../jena/graph/compose/test/TestDifference.java | 60 +++----
.../hp/hpl/jena/graph/test/NodeCreateUtils.java | 4 +-
.../hpl/jena/graph/test/TestLiteralLabels.java | 10 +-
.../com/hp/hpl/jena/graph/test/TestNode.java | 10 +-
.../hpl/jena/graph/test/TestTypedLiterals.java | 12 +-
.../rulesys/test/TestComparatorBuiltins.java | 20 +--
.../jena/reasoner/rulesys/test/TestFBRules.java | 58 +++----
.../apache/jena/fuseki/server/FusekiServer.java | 3 +-
.../apache/jena/fuseki/server/SystemState.java | 24 +++
jena-parent/pom.xml | 5 +-
.../com/hp/hpl/jena/sdb/layout2/SQLBridge2.java | 12 +-
jena-tdb/ReleaseNotes.txt | 4 +
.../hp/hpl/jena/tdb/solver/StageMatchTuple.java | 11 +-
.../java/com/hp/hpl/jena/tdb/store/NodeId.java | 8 +-
.../java/com/hp/hpl/jena/tdb/sys/FileRef.java | 6 +-
.../hp/hpl/jena/tdb/extra/T_TransSystem.java | 2 +-
.../tdb/extra/T_TransSystemMultiDatasets.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestNodeId.java | 6 +-
.../store/nodetable/AbstractTestNodeTable.java | 2 +-
jena-tdb/tdb-default.cfg | 20 +++
101 files changed, 978 insertions(+), 801 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/80bccb96/jena-parent/pom.xml
----------------------------------------------------------------------
[32/48] jena git commit: Class javadoc
Posted by rv...@apache.org.
Class javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/23b6784e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/23b6784e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/23b6784e
Branch: refs/heads/hadoop-rdf
Commit: 23b6784eeb967026313e8abdcdcda0923e7efe98
Parents: 782e002
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:23:52 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:23:52 2014 +0000
----------------------------------------------------------------------
jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/23b6784e/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
index d9d0278..5fbb5d2 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.shared.impl.JenaParameters ;
import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
+/** Tests for node Checker */
public class TestChecker
{
static Checker checker = new Checker(new ErrorHandlerTestLib.ErrorHandlerEx()) ;
[36/48] jena git commit: JENA-815 : Update LiteralFactory calls.
Posted by rv...@apache.org.
JENA-815 : Update LiteralFactory calls.
Replace LiteralFactory.create(lex,lang,false) with
Literalfactory.create(lex,lang)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0fd37f54
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0fd37f54
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0fd37f54
Branch: refs/heads/hadoop-rdf
Commit: 0fd37f5408d30827496b8265c279016ba3d039a9
Parents: a226343
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:34:29 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:34:29 2014 +0000
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java | 2 +-
jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java | 2 +-
jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0fd37f54/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java
index 4ae2f57..b8bf2f8 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInputIterator.java
@@ -548,7 +548,7 @@ public class JSONInputIterator extends QueryIteratorBase {
if (datatype != null) {
return NodeFactory.createLiteral(value, TypeMapper.getInstance().getSafeTypeByName(datatype));
} else if (lang != null) {
- return NodeFactory.createLiteral(value, lang, false);
+ return NodeFactory.createLiteral(value, lang);
} else {
return NodeFactory.createLiteral(value);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0fd37f54/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
index acd4b1f..6fd5875 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
@@ -174,7 +174,7 @@ public class LangRDFXML implements LangRIOT
private static Node convert(ALiteral lit) {
String dtURI = lit.getDatatypeURI();
if (dtURI == null)
- return NodeFactory.createLiteral(lit.toString(), lit.getLang(), false);
+ return NodeFactory.createLiteral(lit.toString(), lit.getLang());
if (lit.isWellFormedXML()) {
return NodeFactory.createLiteral(lit.toString(), null, true);
http://git-wip-us.apache.org/repos/asf/jena/blob/0fd37f54/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
index 527fd6c..66342a8 100644
--- a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
+++ b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
@@ -241,7 +241,7 @@ public class SQLBridge2 extends SQLBridgeBase
case URI:
return NodeFactory.createURI(lex) ;
case STRING:
- return NodeFactory.createLiteral(lex, lang, false) ;
+ return NodeFactory.createLiteral(lex, lang) ;
case XSDSTRING:
return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDstring) ;
case INTEGER:
[29/48] jena git commit: JENA-816 : SSE output for RDF 1.1
Posted by rv...@apache.org.
JENA-816 : SSE output for RDF 1.1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c3843a36
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c3843a36
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c3843a36
Branch: refs/heads/hadoop-rdf
Commit: c3843a36ee2e6e27cd244a0c36de0a08cc4c5869
Parents: 581cb41
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 19:57:49 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 19:57:49 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/util/FmtUtils.java | 67 +++++++++-----------
.../com/hp/hpl/jena/sparql/util/NodeUtils.java | 28 +++++++-
.../apache/jena/riot/out/NodeFormatterBase.java | 21 ------
3 files changed, 56 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c3843a36/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
index 0a348af..cd58728 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/FmtUtils.java
@@ -275,11 +275,15 @@ public class FmtUtils
stringEsc(result, s, true) ;
result.append("\"") ;
- // Format the language tag
- if ( lang != null && lang.length()>0)
- {
+ if ( NodeUtils.isSimpleString(literal) ) {
+ // No op.
+ return ;
+ }
+
+ if ( NodeUtils.isLangString(literal) ) {
result.append("@") ;
result.append(lang) ;
+ return ;
}
if ( datatype != null )
@@ -348,47 +352,34 @@ public class FmtUtils
public static void stringForNode(StringBuilder result, Node n, SerializationContext context)
{
- if ( n == null ) {
- result.append( "<<null>>");
- return;
+ if ( n == null ) {
+ result.append("<<null>>") ;
+ return ;
}
// mappable?
- if ( context != null && context.getBNodeMap() != null )
- {
- String str = context.getBNodeMap().asString(n) ;
- if ( str != null )
- {
- result.append( str);
- return;
+ if ( context != null && context.getBNodeMap() != null ) {
+ String str = context.getBNodeMap().asString(n) ;
+ if ( str != null ) {
+ result.append(str) ;
+ return ;
}
}
- if ( n.isBlank() )
- {
- result.append( "_:" ).append( n.getBlankNodeLabel() );
- }
- else if ( n.isLiteral() )
- {
- stringForLiteral( result, (Node_Literal) n, context );
- }
- else if ( n.isURI() )
- {
- String uri = n.getURI();
- stringForURI( result, uri, context );
- }
- else if ( n.isVariable() )
- {
- result.append( "?" ).append( n.getName() );
- }
- else if ( n.equals( Node.ANY ) )
- {
- result.append( "ANY" );
- }
- else
- {
- Log.warn( FmtUtils.class, "Failed to turn a node into a string: " + n );
- result.append( n.toString() );
+ if ( n.isBlank() ) {
+ result.append("_:").append(n.getBlankNodeLabel()) ;
+ } else if ( n.isLiteral() ) {
+ stringForLiteral(result, (Node_Literal)n, context) ;
+ } else if ( n.isURI() ) {
+ String uri = n.getURI() ;
+ stringForURI(result, uri, context) ;
+ } else if ( n.isVariable() ) {
+ result.append("?").append(n.getName()) ;
+ } else if ( n.equals(Node.ANY) ) {
+ result.append("ANY") ;
+ } else {
+ Log.warn(FmtUtils.class, "Failed to turn a node into a string: " + n) ;
+ result.append(n.toString()) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/c3843a36/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
index bdc2d47..a72dbdc 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
@@ -23,7 +23,7 @@ import java.util.HashSet ;
import java.util.Iterator ;
import java.util.Set ;
-
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.graph.NodeFactory ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.iri.IRI ;
+
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.expr.Expr ;
import com.hp.hpl.jena.sparql.expr.ExprEvalException ;
@@ -265,6 +266,31 @@ public class NodeUtils
return node.getLiteralDatatypeURI() == null &&
node.getLiteralLanguage().equals("") ;
}
+
+ /**
+ * A Node is a simple string if: <li>(RDF 1.0) No datatype and no language
+ * tag. <li>(RDF 1.1) xsd:string
+ */
+ public static boolean isSimpleString(Node n) {
+ RDFDatatype dt = n.getLiteralDatatype() ;
+ if ( dt == null )
+ return !isLangString(n) ;
+ if ( JenaRuntime.isRDF11 )
+ return dt.equals(XSDDatatype.XSDstring) ;
+ return false ;
+ }
+
+ /**
+ * A Node is a language string if it has a language tag.
+ * (RDF 1.0 and RDF 1.1)
+ */
+ public static boolean isLangString(Node n) {
+ String lang = n.getLiteralLanguage() ;
+ if ( lang == null )
+ return false ;
+ return !lang.equals("") ;
+ }
+
// This is term comparison.
public static EqualityTest sameTerm = new EqualityTest() {
http://git-wip-us.apache.org/repos/asf/jena/blob/c3843a36/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
index 1b4b5f9..dbcf620 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
@@ -54,27 +54,6 @@ public abstract class NodeFormatterBase implements NodeFormatter
@Override
public void formatBNode(AWriter w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; }
-// /** A Node is a simple string if:
-// * <li>(RDF 1.0) No datatype and no language tag.
-// * <li>(RDF 1.1) xsd:string
-// */
-// private static boolean isSimpleString(Node n) {
-// RDFDatatype dt = n.getLiteralDatatype() ;
-// if ( dt == null )
-// return ! isLangString(n) ;
-// if ( JenaRuntime.isRDF11 )
-// return dt.equals(XSDDatatype.XSDstring) ;
-// return false ;
-// }
-//
-// /** A Node is a language string if it has a language tag. (RDF 1.0 and RDF 1.1) */
-// private static boolean isLangString(Node n) {
-// String lang = n.getLiteralLanguage() ;
-// if ( lang == null )
-// return false ;
-// return ! lang.equals("") ;
-// }
-
@Override
public void formatLiteral(AWriter w, Node n)
{
[18/48] jena git commit: Typo
Posted by rv...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8a8bf936
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8a8bf936
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8a8bf936
Branch: refs/heads/hadoop-rdf
Commit: 8a8bf936d419fae9a6980474c271d5a23670cae3
Parents: 6393067
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:56:10 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:56:10 2014 +0000
----------------------------------------------------------------------
.../datatypes/xsd/impl/XSDBaseStringType.java | 24 +-------------------
1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8a8bf936/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
index 6a5613e..e8e2a6e 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.graph.impl.LiteralLabel;
import com.hp.hpl.jena.shared.impl.JenaParameters;
/**
- * Base implementation for all string datatypes derinved from
+ * Base implementation for all string datatypes derived from
* xsd:string. The only purpose of this place holder is
* to support the isValidLiteral tests across string types.
*/
@@ -49,28 +49,6 @@ public class XSDBaseStringType extends XSDDatatype {
super(typeName, javaClass);
}
-
-// Functionality moved to XSDDatatype but old code left here temporarily until
-// we're sure the change is correct.
-//
-// /**
-// * Test whether the given LiteralLabel is a valid instance
-// * of this datatype. This takes into accound typing information
-// * as well as lexical form - for example an xsd:string is
-// * never considered valid as an xsd:integer (even if it is
-// * lexically legal like "1").
-// */
-// public boolean isValidLiteral(LiteralLabel lit) {
-// RDFDatatype dt = lit.getDatatype();
-// if ( dt == null && lit.language().equals("") ) return true;
-// if ( this.equals(dt) ) return true;
-// if (dt instanceof XSDBaseStringType) {
-// return isValid(lit.getLexicalForm());
-// } else {
-// return false;
-// }
-// }
-
/**
* Compares two instances of values of the given datatype.
* This ignores lang tags and optionally allows plain literals to
[13/48] jena git commit: Correct comment
Posted by rv...@apache.org.
Correct comment
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/09928027
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/09928027
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/09928027
Branch: refs/heads/hadoop-rdf
Commit: 09928027a268c4b60b69aaba4ae83d40be97f8ff
Parents: 5af338c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 20 19:08:04 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 20 19:08:04 2014 +0000
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/09928027/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
index ca52c84..6b0b51d 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
@@ -981,9 +981,6 @@ public class XSDFuncOp
private static int compareDuration(Duration duration1, Duration duration2) {
// Returns codes are -1/0/1 but also 2 for "Indeterminate"
- // Not fully sure when Indeterminate is returned with regards to a
- // duration
-
int x = duration1.compare(duration2) ;
return convertComparison(x) ;
}
[21/48] jena git commit: Make development flag "JenaRuntime.isRDF11"
mutable.
Posted by rv...@apache.org.
Make development flag "JenaRuntime.isRDF11" mutable.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/be227075
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/be227075
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/be227075
Branch: refs/heads/hadoop-rdf
Commit: be2270755eac4c1b7f268a3f5907cee2ab77eae6
Parents: 82128c2
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:02:40 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:02:40 2014 +0000
----------------------------------------------------------------------
jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/be227075/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
index 4813d14..dc8148d 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
@@ -81,7 +81,7 @@ public class JenaRuntime
* </p>
*/
- public final static boolean isRDF11 = false ;
+ public static boolean isRDF11 = true ;
// --------------------------------------------------------------
[44/48] jena git commit: Have create(String, String) and create(String,
Datatype) for literals.
Posted by rv...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
index 62c4db0..fb89958 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
@@ -636,7 +636,7 @@ public class TestFBRules extends TestCase {
data.add(new Triple(n2, p, Functor.makeFunctorNode("f", new Node[] {
a, Util.makeIntNode(0) })));
data.add(new Triple(n3, p, Functor.makeFunctorNode("f", new Node[] {
- a, NodeFactory.createLiteral( "0", "", XSDDatatype.XSDnonNegativeInteger ) } )));
+ a, NodeFactory.createLiteral( "0", XSDDatatype.XSDnonNegativeInteger ) } )));
InfGraph infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, s, null),
@@ -713,9 +713,9 @@ public class TestFBRules extends TestCase {
// XSD timeDate point comparisons
data = Factory.createGraphMem();
XSDDatatype dt = new XSDDatatype("dateTime");
- data.add(new Triple(n1, q, NodeFactory.createLiteral("2000-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
- data.add(new Triple(n2, q, NodeFactory.createLiteral("2001-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
- data.add(new Triple(n3, q, NodeFactory.createLiteral("2002-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n1, q, NodeFactory.createLiteral("2000-03-04T20:00:00Z", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n2, q, NodeFactory.createLiteral("2001-03-04T20:00:00Z", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n3, q, NodeFactory.createLiteral("2002-03-04T20:00:00Z", XSDDatatype.XSDdateTime)));
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(n1, null, n2),
@@ -796,18 +796,18 @@ public class TestFBRules extends TestCase {
TestUtil.assertIteratorValues(this, infgraph.find(n1, s, null),
new Triple[] {
- new Triple(n1, s, NodeFactory.createLiteral("literal", "", null)),
- new Triple(n1, s, NodeFactory.createLiteral("notBNode", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("literal")),
+ new Triple(n1, s, NodeFactory.createLiteral("notBNode")),
});
TestUtil.assertIteratorValues(this, infgraph.find(n2, s, null),
new Triple[] {
- new Triple(n2, s, NodeFactory.createLiteral("notLiteral", "", null)),
- new Triple(n2, s, NodeFactory.createLiteral("notBNode", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("notLiteral")),
+ new Triple(n2, s, NodeFactory.createLiteral("notBNode")),
});
TestUtil.assertIteratorValues(this, infgraph.find(n3, s, null),
new Triple[] {
- new Triple(n3, s, NodeFactory.createLiteral("notLiteral", "", null)),
- new Triple(n3, s, NodeFactory.createLiteral("bNode", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("notLiteral")),
+ new Triple(n3, s, NodeFactory.createLiteral("bNode")),
});
// Data type checking
@@ -821,33 +821,33 @@ public class TestFBRules extends TestCase {
"";
data = Factory.createGraphMem();
data.add(new Triple(n1, p, Util.makeIntNode(3)) );
- data.add(new Triple(n2, p, NodeFactory.createLiteral("foo", "", null)) );
- data.add(new Triple(n3, p, NodeFactory.createLiteral("foo", "", XSDDatatype.XSDstring)) );
+ data.add(new Triple(n2, p, NodeFactory.createLiteral("foo")) );
+ data.add(new Triple(n3, p, NodeFactory.createLiteral("foo", XSDDatatype.XSDstring)) );
data.add(new Triple(n4, p, n4));
- data.add(new Triple(n5, p, NodeFactory.createLiteral("-1", "", XSDDatatype.XSDnonNegativeInteger)) );
+ data.add(new Triple(n5, p, NodeFactory.createLiteral("-1", XSDDatatype.XSDnonNegativeInteger)) );
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, s, null),
new Triple[] {
- new Triple(n1, s, NodeFactory.createLiteral("isLiteral", "", null)),
- new Triple(n1, s, NodeFactory.createLiteral("isXSDInt", "", null)),
- new Triple(n1, s, NodeFactory.createLiteral("notXSDString", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("isLiteral")),
+ new Triple(n1, s, NodeFactory.createLiteral("isXSDInt")),
+ new Triple(n1, s, NodeFactory.createLiteral("notXSDString")),
- new Triple(n2, s, NodeFactory.createLiteral("isLiteral", "", null)),
- new Triple(n2, s, NodeFactory.createLiteral("notXSDInt", "", null)),
- new Triple(n2, s, NodeFactory.createLiteral("isXSDString", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("isLiteral")),
+ new Triple(n2, s, NodeFactory.createLiteral("notXSDInt")),
+ new Triple(n2, s, NodeFactory.createLiteral("isXSDString")),
- new Triple(n3, s, NodeFactory.createLiteral("isLiteral", "", null)),
- new Triple(n3, s, NodeFactory.createLiteral("notXSDInt", "", null)),
- new Triple(n3, s, NodeFactory.createLiteral("isXSDString", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("isLiteral")),
+ new Triple(n3, s, NodeFactory.createLiteral("notXSDInt")),
+ new Triple(n3, s, NodeFactory.createLiteral("isXSDString")),
- new Triple(n4, s, NodeFactory.createLiteral("notLiteral", "", null)),
- new Triple(n4, s, NodeFactory.createLiteral("notXSDInt", "", null)),
- new Triple(n4, s, NodeFactory.createLiteral("notXSDString", "", null)),
+ new Triple(n4, s, NodeFactory.createLiteral("notLiteral")),
+ new Triple(n4, s, NodeFactory.createLiteral("notXSDInt")),
+ new Triple(n4, s, NodeFactory.createLiteral("notXSDString")),
- new Triple(n5, s, NodeFactory.createLiteral("notLiteral", "", null)),
- new Triple(n5, s, NodeFactory.createLiteral("notXSDInt", "", null)),
- new Triple(n5, s, NodeFactory.createLiteral("notXSDString", "", null)),
+ new Triple(n5, s, NodeFactory.createLiteral("notLiteral")),
+ new Triple(n5, s, NodeFactory.createLiteral("notXSDInt")),
+ new Triple(n5, s, NodeFactory.createLiteral("notXSDString")),
});
// Literal counting
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
index 5dd327e..4e1d537 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
@@ -297,23 +297,23 @@ public class NodeId
case INTEGER : {
long val = IntegerNode.unpack(v) ;
- Node n = NodeFactory.createLiteral(Long.toString(val), null, XSDDatatype.XSDinteger) ;
+ Node n = NodeFactory.createLiteral(Long.toString(val), XSDDatatype.XSDinteger) ;
return n ;
}
case DECIMAL : {
BigDecimal d = DecimalNode.unpackAsBigDecimal(v) ;
String x = d.toPlainString() ;
- return NodeFactory.createLiteral(x, null, XSDDatatype.XSDdecimal) ;
+ return NodeFactory.createLiteral(x, XSDDatatype.XSDdecimal) ;
}
case DATETIME : {
long val = BitsLong.clear(v, 56, 64) ;
String lex = DateTimeNode.unpackDateTime(val) ;
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdateTime) ;
}
case DATE : {
long val = BitsLong.clear(v, 56, 64) ;
String lex = DateTimeNode.unpackDate(val) ;
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdate) ;
}
case BOOLEAN : {
long val = BitsLong.clear(v, 56, 64) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
index 1b459db..706aed5 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
@@ -566,7 +566,7 @@ public class T_TransSystem
Node s = NodeFactory.createURI("S") ;
Node p = NodeFactory.createURI("P"+value) ;
// Integer - that gets inlined.
- Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
+ Node o = NodeFactory.createLiteral(Integer.toString(value), XSDDatatype.XSDinteger) ;
return new Quad(g,s,p,o) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
index 1acfc68..185b49e 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
@@ -520,7 +520,7 @@ public class T_TransSystemMultiDatasets
Node g = Quad.defaultGraphNodeGenerated ; // urn:x-arq:DefaultGraphNode
Node s = NodeFactory.createURI("S") ;
Node p = NodeFactory.createURI("P") ;
- Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
+ Node o = NodeFactory.createLiteral(Integer.toString(value), XSDDatatype.XSDinteger) ;
return new Quad(g,s,p,o) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
index 279096f..439048a 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
@@ -111,7 +111,7 @@ public class TestNodeId extends BaseTest
// Just this once, directly create the Node.
@Test public void nodeId_decimal_3()
- { test("12.89", NodeFactory.createLiteral("12.89", null, XSDDatatype.XSDdecimal)) ; }
+ { test("12.89", NodeFactory.createLiteral("12.89", XSDDatatype.XSDdecimal)) ; }
@Test public void nodeId_decimal_4()
{ test("-1.0", NodeFactoryExtra.parseNode("-1.0")) ; }
@@ -126,11 +126,11 @@ public class TestNodeId extends BaseTest
@Test public void nodeId_decimal_7()
{ test("'0.00000001'^^xsd:decimal",
- NodeFactory.createLiteral("0.00000001", null, XSDDatatype.XSDdecimal)) ;
+ NodeFactory.createLiteral("0.00000001", XSDDatatype.XSDdecimal)) ;
}
@Test public void nodeId_decimal_8()
- { test("0.00000001", NodeFactory.createLiteral("0.00000001", null, XSDDatatype.XSDdecimal)) ; }
+ { test("0.00000001", NodeFactory.createLiteral("0.00000001", XSDDatatype.XSDdecimal)) ; }
@Test public void nodeId_dateTime_01()
{ test("'2008-04-28T15:36:15+01:00'^^xsd:dateTime") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java
index dbf787f..dc51167 100644
--- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java
+++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java
@@ -83,7 +83,7 @@ public abstract class AbstractTestNodeTable extends BaseTest
@Test public void nodetable_06() { testNode("'x'^^<http://example/dt>") ; }
@Test public void nodetable_07() { testNode("'نواف'") ; }
- static Node badNode1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc", "99bad", null) ;
+ static Node badNode1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc", "99bad") ;
@Test public void nodetable_bad_01() { testNodeBad(badNode1) ; }
@Test public void nodetable_bad_02()
[37/48] jena git commit: Need to force lexical form into existence in
.equals().
Posted by rv...@apache.org.
Need to force lexical form into existence in .equals().
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7cf034e5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7cf034e5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7cf034e5
Branch: refs/heads/hadoop-rdf
Commit: 7cf034e58c31c5dd0df784effef81d782ec2f1a5
Parents: 0fd37f5
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:53:36 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:53:36 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7cf034e5/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
index 50a3979..97d6015 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
@@ -361,16 +361,17 @@ final /*public*/ class LiteralLabelImpl implements LiteralLabel {
}
LiteralLabel otherLiteral = (LiteralLabel) other;
- boolean typeEqual = Objects.equals(dtype, otherLiteral.getDatatype()) ;
- if ( !typeEqual )
+ boolean typeEquals = Objects.equals(dtype, otherLiteral.getDatatype()) ;
+ if ( !typeEquals )
return false ;
- boolean lexEquals = Objects.equals(lexicalForm, otherLiteral.getLexicalForm());
+ // Don't just use this.lexcialForm -- need to force delayed calculation from values.
+ boolean lexEquals = Objects.equals(getLexicalForm(), otherLiteral.getLexicalForm());
if ( ! lexEquals )
return false ;
- boolean langEqual = Objects.equals(lang, otherLiteral.language()) ;
- if ( ! langEqual )
+ boolean langEquals = Objects.equals(lang, otherLiteral.language()) ;
+ if ( ! langEquals )
return false ;
// Ignore xml flag as it is calculated from the lexical form + datatype
// Ignore value as lexical form + datatype -> value is a function.
[10/48] jena git commit: JENA-811 : Make RDF/XML resolve the base IRI
silently.
Posted by rv...@apache.org.
JENA-811 : Make RDF/XML resolve the base IRI silently.
Non-parsable IRI strings are still an exception but parsable strings
which trigger any higher level checking will not cause a parse to abort.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/45985afb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/45985afb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/45985afb
Branch: refs/heads/hadoop-rdf
Commit: 45985afb3596399ba722f08464ddf7e80c2809e2
Parents: 857d05e
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 16 13:59:28 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 16 13:59:28 2014 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/45985afb/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index ee64c8e..b66d67e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -150,7 +150,7 @@ public class RiotReader
if ( lang == RDFXML )
{
if ( baseIRI != null )
- baseIRI = IRIResolver.resolveString(baseIRI) ;
+ baseIRI = IRIResolver.resolveStringSilent(baseIRI) ;
return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest) ;
} else if ( lang == CSV){
return new LangCSV (input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest);
[26/48] jena git commit: JENA-816 : RDF 1.1 style output support.
Posted by rv...@apache.org.
JENA-816 : RDF 1.1 style output support.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/225eea9b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/225eea9b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/225eea9b
Branch: refs/heads/hadoop-rdf
Commit: 225eea9b44eb452897d1a756059c5709a1b4f6ce
Parents: ee2ec79
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:53:12 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:53:12 2014 +0000
----------------------------------------------------------------------
.../hpl/jena/rdfxml/xmloutput/impl/Basic.java | 4 +++-
.../jena/rdfxml/xmloutput/impl/Unparser.java | 25 ++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/225eea9b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
index ddec340..8b3869c 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Basic.java
@@ -170,8 +170,10 @@ public class Basic extends BaseXMLWriter
writer.print(" " + rdfAt("parseType") + "=" + attributeQuoted( "Literal" )+">");
writer.print( form );
} else {
+ // No lang.
String dt = l.getDatatypeURI();
- if (dt != null) writer.print( " " + rdfAt( "datatype" ) + "=" + substitutedAttribute( dt ) );
+ if ( ! Unparser.isSimpleString(l) )
+ writer.print( " " + rdfAt( "datatype" ) + "=" + substitutedAttribute( dt ) );
writer.print(">");
writer.print( Util.substituteEntitiesInElementContent( form ) );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/225eea9b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
index 3424473..feab029 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -121,8 +121,10 @@ import java.util.*;
import org.apache.xerces.util.XMLChar;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.jena.iri.IRI;
+
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
import com.hp.hpl.jena.rdf.model.impl.Util;
@@ -455,13 +457,28 @@ class Unparser {
print(">");
return true;
}
+
+ /** Return true if to be written as a string, without datatype or lang */
+ /*package*/ static boolean isSimpleString(Literal lit) {
+ if ( lit.getDatatypeURI() == null )
+ return true;
+ if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(XSDDatatype.XSDstring.getURI()) )
+ return true;
+ if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(RDF.langString.getId()) )
+ return true;
+
+ return false ;
+ }
private boolean wPropertyEltDatatype(WType wt, Property prop, Statement s,
RDFNode r) {
- if (!((r instanceof Literal) && ((Literal) r).getDatatypeURI() != null)) {
+ if (! (r instanceof Literal) )
+ return false ;
+ Literal lit = ((Literal) r) ;
+ if ( isSimpleString(lit) )
return false;
- }
- // print out.
+
+ // print out with "datatype="
done(s);
tab();
print("<");
[11/48] jena git commit: Use a small footprint setup for the system
database.
Posted by rv...@apache.org.
Use a small footprint setup for the system database.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7d17f2d5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7d17f2d5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7d17f2d5
Branch: refs/heads/hadoop-rdf
Commit: 7d17f2d5e33caea93731c42c7419ff57144f4141
Parents: 45985af
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 16 14:22:40 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 16 14:22:40 2014 +0000
----------------------------------------------------------------------
.../apache/jena/fuseki/server/FusekiServer.java | 3 +--
.../apache/jena/fuseki/server/SystemState.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7d17f2d5/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
index bb651b4..17f1da6 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
@@ -62,8 +62,7 @@ public class FusekiServer
public static Path FUSEKI_BASE = null ;
public static final boolean isWindows = SystemTDB.isWindows ;
-
-
+
/** Unused */
//public static final String DFT_FUSEKI_HOME =
// isWindows ? /*What's correct here?*/ "/usr/share/fuseki" : "/usr/share/fuseki" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/7d17f2d5/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/SystemState.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/SystemState.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/SystemState.java
index ff5775d..74117c9 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/SystemState.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/SystemState.java
@@ -20,11 +20,15 @@ package org.apache.jena.fuseki.server;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.fuseki.Fuseki ;
import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBFactory ;
+import com.hp.hpl.jena.tdb.base.block.FileMode ;
import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.setup.StoreParams ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class SystemState {
@@ -50,6 +54,21 @@ public class SystemState {
init$() ;
}
+ /** Small footprint database. The system database records the server state.
+ * It should not be performance critical, mainly being used for system admin
+ * functions.
+ * <p>Direct mode so that it is not competing for OS file cache space.
+ * <p>Small caches -
+ */
+ private static final StoreParams systemDatabaseParams = StoreParams.builder()
+ .fileMode(FileMode.direct)
+ .blockReadCacheSize(20)
+ .blockWriteCacheSize(20)
+ .node2NodeIdCacheSize(5000)
+ .nodeId2NodeCacheSize(5000)
+ .nodeMissCacheSize(100)
+ .build() ;
+
public /* for testing */ static void init$() {
if ( initialized )
return ;
@@ -61,6 +80,11 @@ public class SystemState {
if ( ! location.isMem() )
FileOps.ensureDir(location.getDirectoryPath()) ;
+ // Force it into the store connection as a low footprint
+ if ( StoreConnection.getExisting(location) != null )
+ Fuseki.serverLog.warn("System database already in the StoreConnection cache") ;
+ StoreConnection.make(location, systemDatabaseParams) ;
+
dataset = TDBFactory.createDataset(location) ;
dsg = (DatasetGraphTransaction)(dataset.asDatasetGraph()) ;
dsg.getContext().set(TDB.symUnionDefaultGraph, false) ;
[25/48] jena git commit: Add constant for rdf:langString
Posted by rv...@apache.org.
Add constant for rdf:langString
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ee2ec796
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ee2ec796
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ee2ec796
Branch: refs/heads/hadoop-rdf
Commit: ee2ec7965be9a88290ccf26904e196e066c6a921
Parents: 909f0e1
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:50:55 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:50:55 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java | 2 +-
.../src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java | 4 ++--
.../java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java | 6 +++---
jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ee2ec796/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
index a83b333..94013ff 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -181,7 +181,7 @@ public class NodeFunctions {
if ( plainLiteral ) {
boolean simpleLiteral = (node.getLiteralLanguage() == null || node.getLiteralLanguage().equals("")) ;
if ( !simpleLiteral )
- return NodeConst.dtRDFlangString ;
+ return NodeConst.rdfLangString ;
return XSD.xstring.asNode() ;
}
return NodeFactory.createURI(s) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/ee2ec796/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
index 940fc1d..a6f56eb 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.vocabulary.OWL ;
import com.hp.hpl.jena.vocabulary.RDF ;
+/** Some node constants */
public class NodeConst
{
public static final Node nodeTrue = NodeFactory.createLiteral("true", null, XSDDatatype.XSDboolean) ;
@@ -41,6 +42,5 @@ public class NodeConst
public static final Node nodeANY = Node.ANY ;
public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ;
- public static final Node dtRDFlangString = NodeFactory.createURI(RDF.getURI()+"langString") ;
-
+ public static final Node rdfLangString = RDF.Nodes.langString ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/ee2ec796/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
index 8c1803e..3e0bd4e 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
@@ -144,13 +144,13 @@ public class TestNodeFunctions extends BaseTest {
NodeValue nv = NodeValue.makeNode("abc", "fr", (String)null) ;
// SPARQL 1.0
// try {
- // NodeValue r = NodeFunctions.datatype(nv) ;
- // fail("Expect a type exception but call succeeded") ;
+ // NodeValue r = NodeFunctions.datatype(nv) ;
+ // fail("Expect a type exception but call succeeded") ;
// }
// catch (ExprTypeException ex) {}
// SPARQL 1.1 / RDF 1.1
NodeValue r = NodeFunctions.datatype(nv) ;
- NodeValue e = NodeValue.makeNode(NodeConst.dtRDFlangString) ;
+ NodeValue e = NodeValue.makeNode(NodeConst.rdfLangString) ;
assertEquals(e, r) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/ee2ec796/jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java b/jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java
index 51b51fd..2241c91 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/vocabulary/RDF.java
@@ -59,6 +59,9 @@ public class RDF{
public static final Property object = property( "object" );
public static final Property type = property( "type" );
public static final Property value = property( "value" );
+
+ // RDF 1.1 - the datatype of language strings
+ public static final Resource langString = resource("langString") ;
/**
The same items of vocabulary, but at the Node level, parked inside a
@@ -80,6 +83,7 @@ public class RDF{
public static final Node object = RDF.object.asNode();
public static final Node type = RDF.type.asNode();
public static final Node value = RDF.value.asNode();
+ public static final Node langString = RDF.langString.asNode();
}
}
[47/48] jena git commit: JENA-817 : Fix for sum(...) of an empty
group.
Posted by rv...@apache.org.
JENA-817 : Fix for sum(...) of an empty group.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a539ff03
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a539ff03
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a539ff03
Branch: refs/heads/hadoop-rdf
Commit: a539ff032d6bb10629dc88cfd9d27a87db53c2be
Parents: e97b0dd
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 24 11:29:30 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 24 11:29:30 2014 +0000
----------------------------------------------------------------------
.../main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java | 3 ++-
jena-arq/testing/ARQ/GroupBy/agg-1.srj | 3 ++-
jena-arq/testing/ARQ/GroupBy/agg-2.srj | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a539ff03/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
index 8fc2e24..e9eb6e6 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/aggregate/AggSum.java
@@ -53,10 +53,11 @@ public class AggSum extends AggregatorBase
public Expr getExpr() { return expr ; }
@Override
- public Node getValueEmpty() { return null ; } //return NodeValue.toNode(noValuesToSum) ; }
+ public Node getValueEmpty() { return NodeValue.toNode(noValuesToSum) ; }
@Override
public int hashCode() { return HC_AggSum ^ expr.hashCode() ; }
+
@Override
public boolean equals(Object other)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/a539ff03/jena-arq/testing/ARQ/GroupBy/agg-1.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/GroupBy/agg-1.srj b/jena-arq/testing/ARQ/GroupBy/agg-1.srj
index fd2ec40..391b3b5 100644
--- a/jena-arq/testing/ARQ/GroupBy/agg-1.srj
+++ b/jena-arq/testing/ARQ/GroupBy/agg-1.srj
@@ -5,7 +5,8 @@
"results": {
"bindings": [
{
- "C": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" }
+ "C": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" } ,
+ "S": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" }
}
]
}
http://git-wip-us.apache.org/repos/asf/jena/blob/a539ff03/jena-arq/testing/ARQ/GroupBy/agg-2.srj
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/GroupBy/agg-2.srj b/jena-arq/testing/ARQ/GroupBy/agg-2.srj
index fd2ec40..391b3b5 100644
--- a/jena-arq/testing/ARQ/GroupBy/agg-2.srj
+++ b/jena-arq/testing/ARQ/GroupBy/agg-2.srj
@@ -5,7 +5,8 @@
"results": {
"bindings": [
{
- "C": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" }
+ "C": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" } ,
+ "S": { "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "type": "typed-literal" , "value": "0" }
}
]
}
[22/48] jena git commit: JENA-816 : Ouput RDF 1.1 form when in RDF
1.1. mode.
Posted by rv...@apache.org.
JENA-816 : Ouput RDF 1.1 form when in RDF 1.1. mode.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0e83e7be
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0e83e7be
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0e83e7be
Branch: refs/heads/hadoop-rdf
Commit: 0e83e7be295e1f466b29af553e146d8275cc92d7
Parents: be22707
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:48:11 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:48:11 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/out/NodeFormatterBase.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0e83e7be/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
index a921e97..6ea8dd7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
@@ -20,6 +20,8 @@ package org.apache.jena.riot.out;
import org.apache.jena.atlas.io.AWriter ;
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -58,7 +60,12 @@ public abstract class NodeFormatterBase implements NodeFormatter
String lang = n.getLiteralLanguage() ;
String lex = n.getLiteralLexicalForm() ;
- if ( dt == null )
+ // In RDF 1.1, print xsd:string and language strings without datatype explicitly.
+ // dt should not be null for RDF 1.1 but let's play carefully.
+ boolean shortString = JenaRuntime.isRDF11 ? (dt == null || dt.equals(XSDDatatype.XSDstring.getURI()))
+ : (dt == null) ;
+
+ if ( shortString )
{
if ( lang == null || lang.equals("") )
formatLitString(w, lex) ;
[39/48] jena git commit: JENA-816 : Checking literals (RDF 1.0 and
1.1 forms)
Posted by rv...@apache.org.
JENA-816 : Checking literals (RDF 1.0 and 1.1 forms)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/707ecb9f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/707ecb9f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/707ecb9f
Branch: refs/heads/hadoop-rdf
Commit: 707ecb9f81668ca24a88edb17c51b6e77105c734
Parents: c23422a
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 16:54:57 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 16:54:57 2014 +0000
----------------------------------------------------------------------
.../jena/riot/checker/CheckerLiterals.java | 164 ++++++++++---------
1 file changed, 89 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/707ecb9f/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
index ca5cf6b..4fa8f53 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerLiterals.java
@@ -16,8 +16,9 @@
* limitations under the License.
*/
-package org.apache.jena.riot.checker;
+package org.apache.jena.riot.checker ;
+import java.util.Objects ;
import java.util.regex.Pattern ;
import org.apache.jena.riot.SysRIOT ;
@@ -28,91 +29,88 @@ import org.apache.xerces.impl.dv.ValidationContext ;
import org.apache.xerces.impl.dv.XSSimpleType ;
import org.apache.xerces.impl.validation.ValidationState ;
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDAbstractDateTimeType ;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDBaseNumericType ;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDDouble ;
import com.hp.hpl.jena.datatypes.xsd.impl.XSDFloat ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.sparql.graph.NodeConst ;
-public class CheckerLiterals implements NodeChecker
-{
+public class CheckerLiterals implements NodeChecker {
// A flag to enable the test suite to read bad data.
public static boolean WarnOnBadLiterals = true ;
-
- private ErrorHandler handler ;
- public CheckerLiterals(ErrorHandler handler)
- {
+
+ private ErrorHandler handler ;
+
+ public CheckerLiterals(ErrorHandler handler) {
this.handler = handler ;
}
-
+
@Override
- public boolean check(Node node, long line, long col)
- { return node.isLiteral() && checkLiteral(node, handler, line, col) ; }
-
+ public boolean check(Node node, long line, long col) {
+ return node.isLiteral() && checkLiteral(node, handler, line, col) ;
+ }
+
final static private Pattern langPattern = Pattern.compile("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*") ;
- public static boolean checkLiteral(Node node, ErrorHandler handler, long line, long col)
- {
- if ( ! node.isLiteral() )
- {
- handler.error("Not a literal: "+node, line, col) ;
+ public static boolean checkLiteral(Node node, ErrorHandler handler, long line, long col) {
+ if ( !node.isLiteral() ) {
+ handler.error("Not a literal: " + node, line, col) ;
return false ;
}
-
- return checkLiteral(node.getLiteralLexicalForm(), node.getLiteralLanguage(), node.getLiteralDatatype(),
- handler, line, col) ;
+
+ return checkLiteral(node.getLiteralLexicalForm(), node.getLiteralLanguage(), node.getLiteralDatatype(), handler, line, col) ;
}
-
-
- public static boolean checkLiteral(String lexicalForm, RDFDatatype datatype,
- ErrorHandler handler, long line, long col)
- {
+
+ public static boolean checkLiteral(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col) {
return checkLiteral(lexicalForm, null, datatype, handler, line, col) ;
}
- public static boolean checkLiteral(String lexicalForm, String lang,
- ErrorHandler handler, long line, long col)
- {
+ public static boolean checkLiteral(String lexicalForm, String lang, ErrorHandler handler, long line, long col) {
return checkLiteral(lexicalForm, lang, null, handler, line, col) ;
}
-
- public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype datatype,
- ErrorHandler handler, long line, long col)
- {
- if ( ! WarnOnBadLiterals )
+
+ public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype datatype, ErrorHandler handler,
+ long line, long col) {
+ if ( !WarnOnBadLiterals )
return true ;
-
- boolean hasLang = lang != null && ! lang.equals("") ;
-
- if ( datatype != null && hasLang )
- handler.error("Literal has datatype and language", line, col) ;
-
- // Datatype check (and plain literals are always well formed)
- if ( datatype != null )
- return validateByDatatype(lexicalForm, datatype, handler, line, col) ;
-
- // No datatype. Language?
-
- if ( hasLang )
- {
- // Not a perfect test.
- if ( lang.length() > 0 && ! langPattern.matcher(lang).matches() )
- {
- handler.warning("Language not valid: "+lang, line, col) ;
- return false;
+
+ boolean hasLang = lang != null && !lang.equals("") ;
+ if ( !hasLang ) {
+ // Datatype check (and RDF 1.0 simpl literals are always well
+ // formed)
+ if ( datatype != null )
+ return validateByDatatype(lexicalForm, datatype, handler, line, col) ;
+ return true ;
+ }
+
+ // Has a language.
+ if ( JenaRuntime.isRDF11 ) {
+ if ( datatype != null && !Objects.equals(datatype.getURI(), NodeConst.rdfLangString.getURI()) ) {
+ handler.error("Literal has language but wrong datatype", line, col) ;
+ return false ;
+ }
+ } else {
+ if ( datatype != null ) {
+ handler.error("Literal has datatype and language", line, col) ;
+ return false ;
}
}
-
+
+ // Test language tag format -- not a perfect test.
+ if ( !lang.isEmpty() && !langPattern.matcher(lang).matches() ) {
+ handler.warning("Language not valid: " + lang, line, col) ;
+ return false ;
+ }
return true ;
}
- protected static boolean validateByDatatype(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col)
- {
- // XXX Reconsider.
- if ( SysRIOT.StrictXSDLexicialForms )
- {
- if ( datatype instanceof XSDBaseNumericType || datatype instanceof XSDFloat || datatype instanceof XSDDouble )
+ protected static boolean validateByDatatype(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col) {
+ if ( SysRIOT.StrictXSDLexicialForms ) {
+ if ( datatype instanceof XSDBaseNumericType || datatype instanceof XSDFloat
+ || datatype instanceof XSDDouble )
return validateByDatatypeNumeric(lexicalForm, datatype, handler, line, col) ;
if ( datatype instanceof XSDAbstractDateTimeType )
return validateByDatatypeDateTime(lexicalForm, datatype, handler, line, col) ;
@@ -120,30 +118,46 @@ public class CheckerLiterals implements NodeChecker
return validateByDatatypeJena(lexicalForm, datatype, handler, line, col) ;
}
- protected static boolean validateByDatatypeJena(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col)
- {
+ protected static boolean validateByDatatypeJena(String lexicalForm, RDFDatatype datatype, ErrorHandler handler,
+ long line, long col) {
if ( datatype.isValid(lexicalForm) )
- return true ;
- handler.warning("Lexical form '"+lexicalForm+"' not valid for datatype "+datatype.getURI(), line, col) ;
+ return true ;
+ handler.warning("Lexical form '" + lexicalForm + "' not valid for datatype " + datatype.getURI(), line, col) ;
return false ;
}
-
- protected static boolean validateByDatatypeDateTime(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col)
- {
- if ( lexicalForm.contains(" ") ) { handler.warning("Whitespace in XSD date or time literal: '"+lexicalForm+"'", line, col) ; return false ; }
- if ( lexicalForm.contains("\n") ) { handler.warning("Newline in XSD date or time literal: '"+lexicalForm+"'", line, col) ; return false ; }
- if ( lexicalForm.contains("\r") ) { handler.warning("Newline in XSD date or time literal: '"+lexicalForm+"'", line, col) ; return false ; }
- //if ( ! StrictXSDLexicialForms )
+
+ protected static boolean validateByDatatypeDateTime(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col) {
+ if ( lexicalForm.contains(" ") ) {
+ handler.warning("Whitespace in XSD date or time literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
+ if ( lexicalForm.contains("\n") ) {
+ handler.warning("Newline in XSD date or time literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
+ if ( lexicalForm.contains("\r") ) {
+ handler.warning("Newline in XSD date or time literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
+ // if ( ! StrictXSDLexicialForms )
// Jena is already strict.
return validateByDatatypeJena(lexicalForm, datatype, handler, line, col) ;
}
-
- protected static boolean validateByDatatypeNumeric(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col)
- {
+
+ protected static boolean validateByDatatypeNumeric(String lexicalForm, RDFDatatype datatype, ErrorHandler handler, long line, long col) {
// Do a white space check as well for numerics.
- if ( lexicalForm.contains(" ") ) { handler.warning("Whitespace in numeric XSD literal: '"+lexicalForm+"'", line, col) ; return false ; }
- if ( lexicalForm.contains("\n") ) { handler.warning("Newline in numeric XSD literal: '"+lexicalForm+"'", line, col) ; return false ; }
- if ( lexicalForm.contains("\r") ) { handler.warning("Carriage return in numeric XSD literal: '"+lexicalForm+"'", line, col) ; return false ; }
+ if ( lexicalForm.contains(" ") ) {
+ handler.warning("Whitespace in numeric XSD literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
+ if ( lexicalForm.contains("\n") ) {
+ handler.warning("Newline in numeric XSD literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
+ if ( lexicalForm.contains("\r") ) {
+ handler.warning("Carriage return in numeric XSD literal: '" + lexicalForm + "'", line, col) ;
+ return false ;
+ }
// if ( lit.getDatatype() instanceof XSDAbstractDateTimeType )
// {
[09/48] jena git commit: Make resolveStringSilent silent.
Posted by rv...@apache.org.
Make resolveStringSilent silent.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/857d05e6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/857d05e6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/857d05e6
Branch: refs/heads/hadoop-rdf
Commit: 857d05e61d92237e3d3862e52c341ad065500c71
Parents: 634cd7f
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 16 13:59:05 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 16 13:59:05 2014 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/system/IRIResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/857d05e6/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index d4260f6..de2ac09 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -177,7 +177,7 @@ public abstract class IRIResolver
* @return String An absolute URI
*/
static public String resolveStringSilent(String relStr) throws RiotException {
- return resolveIRI(relStr).toString() ;
+ return globalResolver.resolveSilent(relStr).toString() ;
}
/**
[02/48] jena git commit: Notes
Posted by rv...@apache.org.
Notes
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5c280fa4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5c280fa4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5c280fa4
Branch: refs/heads/hadoop-rdf
Commit: 5c280fa428b09e0b349afb4402d088aea3dd16e4
Parents: 5e20d4f
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 12:00:58 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 12:00:58 2014 +0000
----------------------------------------------------------------------
jena-tdb/ReleaseNotes.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5c280fa4/jena-tdb/ReleaseNotes.txt
----------------------------------------------------------------------
diff --git a/jena-tdb/ReleaseNotes.txt b/jena-tdb/ReleaseNotes.txt
index 83a1da7..e946d26 100644
--- a/jena-tdb/ReleaseNotes.txt
+++ b/jena-tdb/ReleaseNotes.txt
@@ -1,6 +1,10 @@
ChangeLog for TDB
=================
+==== TDB 1.1.2
+
++ JENA-782 : StoreParams allow configurability of TDB databases.
+
==== TDB 1.1.0
Jena now requires Java7 as of this version.
[23/48] jena git commit: Set RDF 11 mode false.
Posted by rv...@apache.org.
Set RDF 11 mode false.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/69ffd0cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/69ffd0cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/69ffd0cf
Branch: refs/heads/hadoop-rdf
Commit: 69ffd0cfb266878b885e792ddeed00f8327a7bbf
Parents: 0e83e7b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:48:35 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:48:35 2014 +0000
----------------------------------------------------------------------
jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/69ffd0cf/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
index dc8148d..068a756 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
@@ -81,7 +81,7 @@ public class JenaRuntime
* </p>
*/
- public static boolean isRDF11 = true ;
+ public static boolean isRDF11 = false ;
// --------------------------------------------------------------
[28/48] jena git commit: JENA-816 : Test for RDF 1.1 style output
support.
Posted by rv...@apache.org.
JENA-816 : Test for RDF 1.1 style output support.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/581cb412
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/581cb412
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/581cb412
Branch: refs/heads/hadoop-rdf
Commit: 581cb4125a2338cdfea713693900307caf842094
Parents: 4352b0f
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 18:44:17 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 18:44:17 2014 +0000
----------------------------------------------------------------------
.../src/test/java/org/apache/jena/riot/out/TestNodeFmt.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/581cb412/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
index 82630f3..daf0e12 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
@@ -94,6 +94,11 @@ public class TestNodeFmt extends BaseTest
test(nodeFormatterNTutf8, "'abc'^^xsd:string", "\"abc\"^^<http://www.w3.org/2001/XMLSchema#string>") ;
}
+ @Test public void nodefmt_rdf11_02() {
+ // Same in RDF 1.0 and RDF 1.1
+ test(nodeFormatterNTutf8, "'abc'^^rdf:langString", "\"abc\"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#langString>") ;
+ }
+
@Test public void nodefmt_ttl_01() { test(nodeFormatterTTL, "?x") ; }
@Test public void nodefmt_ttl_02() { test(nodeFormatterTTL, "?xyz") ; }
@Test public void nodefmt_ttl_03() { test(nodeFormatterTTL, Var.alloc(""), "?") ; }
[35/48] jena git commit: JENA-815 : Add create(lex,
lang) form without XML flag.
Posted by rv...@apache.org.
JENA-815 : Add create(lex,lang) form without XML flag.
Replace uses of create(lex,lang,false) with a call to this new method.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a226343a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a226343a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a226343a
Branch: refs/heads/hadoop-rdf
Commit: a226343a9735def593f1acdf5e52914da884e690
Parents: f6e1db0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:30:29 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:30:29 2014 +0000
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/graph/NodeFactory.java | 17 ++++++++++++++++-
.../com/hp/hpl/jena/rdf/model/ResourceFactory.java | 4 ++--
.../com/hp/hpl/jena/rdf/model/SimpleSelector.java | 2 +-
.../com/hp/hpl/jena/rdf/model/impl/AltImpl.java | 2 +-
.../hp/hpl/jena/rdf/model/impl/ContainerImpl.java | 2 +-
.../com/hp/hpl/jena/rdf/model/impl/ModelCom.java | 2 +-
.../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java | 2 +-
.../hp/hpl/jena/rdf/model/impl/StatementBase.java | 9 +++------
.../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 2 +-
.../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 4 ++--
.../java/com/hp/hpl/jena/graph/test/TestNode.java | 4 ++--
.../jena/reasoner/rulesys/test/TestFBRules.java | 2 +-
12 files changed, 32 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
index e62bab5..59f3b2e 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
@@ -55,7 +55,9 @@ public class NodeFactory
{ return createLiteral( value, "", false ); }
/** make a literal with specified language and XMLishness.
- _lit_ must *not* be null.
+ lexical form must not be null.
+ @param lex
+ @param lang
@param isXml If true then lit is exclusive canonical XML of type
rdf:XMLLiteral, and no checking will be invoked.
*/
@@ -65,6 +67,19 @@ public class NodeFactory
return createLiteral( LiteralLabelFactory.create( lex, lang, isXml ) );
}
+ /** Make a literal with specified language.
+ lexical form must not be null.
+ @param lex
+ @param lang
+ */
+ public static Node createLiteral( String lex, String lang)
+ {
+ // Equivalent to create(lex, lang, false) except the XML flag is
+ // hidden so client code does not see it unnecesarily.
+ if (lex == null) throw new NullPointerException( "null lexical form for literal" );
+ return createLiteral( LiteralLabelFactory.create( lex, lang) );
+ }
+
/**
* Build a literal node from its lexical form. The
* lexical form will be parsed now and the value stored. If
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
index 2a47310..5f393ad 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
@@ -265,12 +265,12 @@ public class ResourceFactory {
@Override
public Literal createPlainLiteral( String string ) {
- return new LiteralImpl( NodeFactory.createLiteral( string, "", false ), null );
+ return new LiteralImpl( NodeFactory.createLiteral( string, "" ), null );
}
@Override
public Literal createLangLiteral( String string , String lang ) {
- return new LiteralImpl( NodeFactory.createLiteral( string, lang, false ), null );
+ return new LiteralImpl( NodeFactory.createLiteral( string, lang ), null );
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
index ee67a3f..70cbccf 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
@@ -207,7 +207,7 @@ public class SimpleSelector extends Object implements Selector {
}
private Literal literal( String s, String lang )
- { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), (ModelCom) null ); }
+ { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), (ModelCom) null ); }
/** Create a selector. A model <b>may</b> restrict statements that are tested using
* the <CODE>selects</CODE> method to those whose subject matches the
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
index 4e31ff3..bffb3cf 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
@@ -193,7 +193,7 @@ public class AltImpl extends ContainerImpl implements Alt {
@Override
public Alt setDefault(String o, String l) {
- return setDefault( new LiteralImpl( NodeFactory.createLiteral( o,l, false ), getModelCom()) );
+ return setDefault( new LiteralImpl( NodeFactory.createLiteral( o, l ), getModelCom()) );
}
protected Statement getDefaultStatement()
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
index 978f7ec..01a7347 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
@@ -172,7 +172,7 @@ public class ContainerImpl extends ResourceImpl
}
private Literal literal( String s, String lang )
- { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); }
+ { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), getModelCom() ); }
@Override
public NodeIterator iterator()
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
index 587388f..d59edbc 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
@@ -479,7 +479,7 @@ implements Model, PrefixMapping, Lock
if (O != null) {
// this is not OK when L is null: returns only the statements whose lang is ""
// return listStatements( S, P, Node.createLiteral( O, L, false ) );
- if (L != null) return listStatements( S, P, NodeFactory.createLiteral( O, L, false ) );
+ if (L != null) return listStatements( S, P, NodeFactory.createLiteral( O, L ) );
// there's maybe a better way
return new StringFilteredStmtIterator(O, listStatements(S, P, Node.ANY));
} else {
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
index 3575641..234a1c3 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
@@ -348,7 +348,7 @@ public class SeqImpl extends ContainerImpl implements Seq {
}
private Literal literal( String s, String lang )
- { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); }
+ { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), getModelCom() ); }
protected void shiftUp(int start, int finish) {
Statement stmt = null;
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
index 18b8ded..b4c1cf5 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
@@ -60,12 +60,9 @@ public abstract class StatementBase
public abstract RDFNode getObject();
- protected StatementImpl stringReplace(String s, String lang,
- boolean wellFormed)
- {
- return replace(new LiteralImpl(NodeFactory.createLiteral(s, lang, wellFormed),
- model));
- }
+ protected StatementImpl stringReplace(String s, String lang, boolean wellFormed) {
+ return replace(new LiteralImpl(NodeFactory.createLiteral(s, lang, wellFormed), model));
+ }
/**
* "replace" the Object of this statement with the literal string value _s_.
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
index 0fc0e83..725bb8d 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
@@ -106,7 +106,7 @@ public class JenaReader implements RDFReader, ARPErrorNumbers {
private static Node convert(ALiteral lit) {
String dtURI = lit.getDatatypeURI();
if (dtURI == null)
- return NodeFactory.createLiteral(lit.toString(), lit.getLang(), false);
+ return NodeFactory.createLiteral(lit.toString(), lit.getLang());
if (lit.isWellFormedXML()) {
return NodeFactory.createLiteral(lit.toString(), null, true);
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
index 83e84c5..4f9814a 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
@@ -896,7 +896,7 @@ public class Rule implements ClauseEntry {
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
return NodeFactory.createLiteral(lit, "", dt);
} else {
- return NodeFactory.createLiteral(lit, "", false);
+ return NodeFactory.createLiteral(lit, "");
}
} else if ( Character.isDigit(token.charAt(0)) ||
(token.charAt(0) == '-' && token.length() > 1 && Character.isDigit(token.charAt(1))) ) {
@@ -928,7 +928,7 @@ public class Rule implements ClauseEntry {
}
}
// Default is a plain literal
- return NodeFactory.createLiteral(lit, "", false);
+ return NodeFactory.createLiteral(lit, "");
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
index 3fda611..cf08efb 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
@@ -589,8 +589,8 @@ public class TestNode extends GraphTestBase
{
TypeMapper tm = TypeMapper.getInstance();
RDFDatatype dtInt = tm.getTypeByValue( new Integer( 10 ) );
- Node plain = NodeFactory.createLiteral( "rhubarb", "", false );
- Node english = NodeFactory.createLiteral( "eccentric", "en_UK", false );
+ Node plain = NodeFactory.createLiteral( "rhubarb", "");
+ Node english = NodeFactory.createLiteral( "eccentric", "en_UK");
Node typed = NodeFactory.createLiteral( "10", "", dtInt );
assertEquals( "\"rhubarb\"", plain.toString() );
assertEquals( "rhubarb", plain.toString( false ) );
http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
index efaba82..62c4db0 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
@@ -1032,7 +1032,7 @@ public class TestFBRules extends TestCase {
getSkolem(a, Util.makeIntNode(43)) );
assertNotSame( getSkolem(a, NodeFactory.createLiteral("foo")),
- getSkolem(a, NodeFactory.createLiteral("foo", "en", false)) );
+ getSkolem(a, NodeFactory.createLiteral("foo", "en")) );
assertEquals( getSkolem(NodeFactory.createLiteral("foo")),
getSkolem(NodeFactory.createLiteral("foo")));
[08/48] jena git commit: Correct javadoc
Posted by rv...@apache.org.
Correct javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/634cd7f3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/634cd7f3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/634cd7f3
Branch: refs/heads/hadoop-rdf
Commit: 634cd7f378f4386501d0419d19abd6087a5e941a
Parents: 5896fa6
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 16 13:58:37 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 16 13:58:37 2014 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/634cd7f3/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index 00c5631..b4061c6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -62,7 +62,7 @@ public class RiotLib
private final static String bNodeLabelStart = "_:" ;
private final static boolean skolomizedBNodes = ARQ.isTrue(ARQ.constantBNodeLabels) ;
- /** Implement <_:....> as a 2bNode IRI"
+ /** Implement <_:....> as a "Node IRI"
* that is, use the given label as the BNode internal label.
* Use with care.
*/
[45/48] jena git commit: Have create(String, String) and create(String,
Datatype) for literals.
Posted by rv...@apache.org.
Have create(String, String) and create(String, Datatype) for literals.
Replace uses of create(String, String, Datatype) which pass a default
for argument 2 or 3 to the specfic create(String, String) or
create(String, Datatype). This reduces the use of defaults in calling
code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3d43e9c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3d43e9c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3d43e9c
Branch: refs/heads/hadoop-rdf
Commit: d3d43e9c3af48d230060eb07ad1e68db7dfa4d07
Parents: a1f70e0
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 23 18:13:09 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 23 18:13:09 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/sparql/expr/NodeValue.java | 17 ++-
.../sparql/expr/nodevalue/NodeFunctions.java | 4 +-
.../sparql/expr/nodevalue/NodeValueDecimal.java | 2 +-
.../sparql/expr/nodevalue/NodeValueDouble.java | 2 +-
.../expr/nodevalue/NodeValueDuration.java | 2 +-
.../sparql/expr/nodevalue/NodeValueFloat.java | 2 +-
.../sparql/expr/nodevalue/NodeValueInteger.java | 2 +-
.../jena/sparql/expr/nodevalue/XSDFuncOp.java | 18 +--
.../hp/hpl/jena/sparql/graph/GraphMemPlain.java | 4 +-
.../com/hp/hpl/jena/sparql/graph/NodeConst.java | 12 +-
.../com/hp/hpl/jena/sparql/lang/ParserBase.java | 16 +-
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 4 +-
.../hpl/jena/sparql/util/NodeFactoryExtra.java | 18 +--
.../org/apache/jena/riot/lang/JsonLDReader.java | 2 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 2 +-
.../riot/process/normalize/NormalizeValue.java | 16 +-
.../riot/process/normalize/NormalizeValue2.java | 4 +-
.../jena/riot/system/ParserProfileBase.java | 4 +-
.../jena/riot/system/ParserProfileChecker.java | 4 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 6 +-
.../java/org/apache/jena/riot/tokens/Token.java | 10 +-
.../engine/iterator/TestQueryIterSort.java | 2 +-
.../hp/hpl/jena/sparql/expr/TestFunctions.java | 4 +-
.../hpl/jena/sparql/expr/TestNodeFunctions.java | 20 +--
.../hp/hpl/jena/sparql/expr/TestNodeValue.java | 16 +-
.../hp/hpl/jena/sparql/expr/TestOrdering.java | 52 +++----
.../hpl/jena/sparql/syntax/TestSSE_Basic.java | 8 +-
.../hpl/jena/sparql/syntax/TestSSE_Forms.java | 2 +-
.../com/hp/hpl/jena/sparql/util/TestList.java | 10 +-
.../jena/atlas/data/TestDistinctDataBag.java | 2 +-
.../jena/atlas/data/TestDistinctDataNet.java | 2 +-
.../jena/atlas/data/TestSortedDataBag.java | 2 +-
.../java/com/hp/hpl/jena/graph/NodeFactory.java | 148 +++++++++++--------
.../hp/hpl/jena/graph/impl/CollectionGraph.java | 4 +-
.../jena/graph/impl/LiteralLabelFactory.java | 24 ++-
.../hp/hpl/jena/rdf/model/ResourceFactory.java | 2 +-
.../hp/hpl/jena/rdf/model/impl/ModelCom.java | 6 +-
.../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 2 +-
.../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 6 +-
.../hp/hpl/jena/graph/test/NodeCreateUtils.java | 4 +-
.../hpl/jena/graph/test/TestLiteralLabels.java | 10 +-
.../com/hp/hpl/jena/graph/test/TestNode.java | 6 +-
.../hpl/jena/graph/test/TestTypedLiterals.java | 12 +-
.../rulesys/test/TestComparatorBuiltins.java | 20 +--
.../jena/reasoner/rulesys/test/TestFBRules.java | 56 +++----
.../java/com/hp/hpl/jena/tdb/store/NodeId.java | 8 +-
.../hp/hpl/jena/tdb/extra/T_TransSystem.java | 2 +-
.../tdb/extra/T_TransSystemMultiDatasets.java | 2 +-
.../com/hp/hpl/jena/tdb/store/TestNodeId.java | 6 +-
.../store/nodetable/AbstractTestNodeTable.java | 2 +-
50 files changed, 307 insertions(+), 284 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
index 2b789f6..b7180f6 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
@@ -83,6 +83,7 @@ import com.hp.hpl.jena.datatypes.TypeMapper ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDateTime ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.impl.LiteralLabel ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -342,7 +343,7 @@ public abstract class NodeValue extends ExprNode
public static NodeValue makeNode(String lexicalForm, XSDDatatype dtype)
{
- Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, null, dtype) ;
+ Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, dtype) ;
NodeValue nv = NodeValue.makeNode(n) ;
return nv ;
}
@@ -364,14 +365,14 @@ public abstract class NodeValue extends ExprNode
Log.warn(NodeValue.class, "Both lang tag and datatype defined (lexcial form '"+lexicalForm+"')") ;
Node n = null ;
-
- if ( datatype != null)
- {
+ if ( langTag != null )
+ n = NodeFactory.createLiteral(lexicalForm, langTag) ;
+ else if ( datatype != null) {
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatype) ;
- n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, null, dType) ;
- }
- else
- n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, langTag, null) ;
+ n = NodeFactory.createLiteral(lexicalForm, dType) ;
+ } else
+ n = NodeFactory.createLiteral(lexicalForm) ;
+
return NodeValue.makeNode(n) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
index ff52250..fd3e0b6 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -427,7 +427,7 @@ public class NodeFunctions {
Node dt = v2.asNode() ;
// Check?
- Node n = NodeFactory.createLiteral(lex, null, NodeFactory.getType(dt.getURI())) ;
+ Node n = NodeFactory.createLiteral(lex, NodeFactory.getType(dt.getURI())) ;
return NodeValue.makeNode(n) ;
}
@@ -441,7 +441,7 @@ public class NodeFunctions {
String lang = v2.asString() ;
// Check?
- Node n = NodeFactory.createLiteral(lex, lang, null) ;
+ Node n = NodeFactory.createLiteral(lex, lang) ;
return NodeValue.makeNode(n) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
index 98baa8a..f154c35 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
@@ -54,7 +54,7 @@ public class NodeValueDecimal extends NodeValue
protected Node makeNode()
{
int s = decimal.scale() ;
- return NodeFactory.createLiteral(Utils.stringForm(decimal), null, XSDDatatype.XSDdecimal) ;
+ return NodeFactory.createLiteral(Utils.stringForm(decimal), XSDDatatype.XSDdecimal) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
index 234ebd3..fbab82a 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
@@ -50,7 +50,7 @@ public class NodeValueDouble extends NodeValue
@Override
protected Node makeNode()
- { return NodeFactory.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDdouble) ; }
+ { return NodeFactory.createLiteral(Utils.stringForm(value), XSDDatatype.XSDdouble) ; }
@Override
public String asString() { return toString() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
index d7e19cf..79961ac 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
@@ -47,7 +47,7 @@ public class NodeValueDuration extends NodeValue
protected Node makeNode()
{
String lex = duration.toString() ;
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDduration) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDduration) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
index 26c64e7..ea72ba3 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
@@ -46,7 +46,7 @@ public class NodeValueFloat extends NodeValue
@Override
protected Node makeNode()
- { return NodeFactory.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDfloat) ; }
+ { return NodeFactory.createLiteral(Utils.stringForm(value), XSDDatatype.XSDfloat) ; }
@Override
public String asString() { return toString() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
index 0cb18c7..9f3cc06 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
@@ -61,7 +61,7 @@ public class NodeValueInteger extends NodeValue
@Override
protected Node makeNode()
- { return NodeFactory.createLiteral(integer.toString(), null, XSDDatatype.XSDinteger) ; }
+ { return NodeFactory.createLiteral(integer.toString(), XSDDatatype.XSDinteger) ; }
@Override
public String asString() { return toString() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
index 6b0b51d..d1998fd 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
@@ -530,18 +530,6 @@ public class XSDFuncOp
private static NodeValue calcReturn(String result, Node arg) {
Node n2 = NodeFactory.createLiteral(result, arg.getLiteralLanguage(), arg.getLiteralDatatype()) ;
return NodeValue.makeNode(n2) ;
-
-// if ( arg.getLiteralDatatype() != null )
-// {
-// if ( arg.getLiteralDatatype() != XSDDatatype.XSDstring )
-// throw new ARQInternalErrorException("Excepted only xsd:string: "+arg) ;
-// // Must be xsd:string
-// return NodeValue.makeNode(result, XSDDatatype.XSDstring ) ;
-// }
-// String lang = arg.getLiteralLanguage() ;
-// if ( lang == null ) lang = "" ;
-// if ( lang.equals("") ) return NodeValue.makeString(result) ;
-// return NodeValue.makeNode(result, lang, (String)null) ;
}
public static NodeValue strBefore(NodeValue string, NodeValue match) {
@@ -1302,15 +1290,15 @@ public class XSDFuncOp
if ( "".equals(dts.timezone) )
return null ;
if ( "Z".equals(dts.timezone) ) {
- Node n = NodeFactory.createLiteral("PT0S", null, NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
+ Node n = NodeFactory.createLiteral("PT0S", NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
return NodeValue.makeNode(n) ;
}
if ( "+00:00".equals(dts.timezone) ) {
- Node n = NodeFactory.createLiteral("PT0S", null, NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
+ Node n = NodeFactory.createLiteral("PT0S", NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
return NodeValue.makeNode(n) ;
}
if ( "-00:00".equals(dts.timezone) ) {
- Node n = NodeFactory.createLiteral("-PT0S", null, NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
+ Node n = NodeFactory.createLiteral("-PT0S", NodeFactory.getType(XSDDatatype.XSD + "#dayTimeDuration")) ;
return NodeValue.makeNode(n) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
index c42eaf4..0bbed22 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
@@ -110,9 +110,7 @@ public class GraphMemPlain extends GraphBase
{
String lang = node.getLiteralLanguage() ;
if ( lang != null && ! lang.equals("") )
- node = NodeFactory.createLiteral(node.getLiteralLexicalForm(),
- lang.toLowerCase(Locale.ROOT),
- node.getLiteralDatatype()) ;
+ node = NodeFactory.createLiteral(node.getLiteralLexicalForm(), lang.toLowerCase(Locale.ROOT)) ;
}
return node ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
index a6f56eb..37359e6 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
@@ -27,12 +27,12 @@ import com.hp.hpl.jena.vocabulary.RDF ;
/** Some node constants */
public class NodeConst
{
- public static final Node nodeTrue = NodeFactory.createLiteral("true", null, XSDDatatype.XSDboolean) ;
- public static final Node nodeFalse = NodeFactory.createLiteral("false", null, XSDDatatype.XSDboolean) ;
- public static final Node nodeZero = NodeFactory.createLiteral("0", null, XSDDatatype.XSDinteger) ;
- public static final Node nodeOne = NodeFactory.createLiteral("1", null, XSDDatatype.XSDinteger) ;
- public static final Node nodeTwo = NodeFactory.createLiteral("2", null, XSDDatatype.XSDinteger) ;
- public static final Node nodeMinusOne = NodeFactory.createLiteral("-1", null, XSDDatatype.XSDinteger) ;
+ public static final Node nodeTrue = NodeFactory.createLiteral("true", XSDDatatype.XSDboolean) ;
+ public static final Node nodeFalse = NodeFactory.createLiteral("false",XSDDatatype.XSDboolean) ;
+ public static final Node nodeZero = NodeFactory.createLiteral("0", XSDDatatype.XSDinteger) ;
+ public static final Node nodeOne = NodeFactory.createLiteral("1", XSDDatatype.XSDinteger) ;
+ public static final Node nodeTwo = NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) ;
+ public static final Node nodeMinusOne = NodeFactory.createLiteral("-1", XSDDatatype.XSDinteger) ;
public static final Node emptyString = NodeFactory.createLiteral("") ;
public static final Node nodeRDFType = RDF.Nodes.type ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
index 9ba298c..1d30c5f 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
@@ -136,17 +136,17 @@ public class ParserBase
protected Node createLiteralInteger(String lexicalForm)
{
- return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(lexicalForm, XSDDatatype.XSDinteger) ;
}
protected Node createLiteralDouble(String lexicalForm)
{
- return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDdouble) ;
+ return NodeFactory.createLiteral(lexicalForm, XSDDatatype.XSDdouble) ;
}
protected Node createLiteralDecimal(String lexicalForm)
{
- return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDdecimal) ;
+ return NodeFactory.createLiteral(lexicalForm, XSDDatatype.XSDdecimal) ;
}
protected Node stripSign(Node node)
@@ -166,14 +166,16 @@ public class ParserBase
protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI)
{
Node n = null ;
- // Can't have type and lang tag.
- if ( datatypeURI != null)
+ // Can't have type and lang tag in parsing.
+ if ( datatypeURI != null)
{
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI) ;
- n = NodeFactory.createLiteral(lexicalForm, null, dType) ;
+ n = NodeFactory.createLiteral(lexicalForm, dType) ;
}
+ else if ( langTag != null && ! langTag.isEmpty() )
+ n = NodeFactory.createLiteral(lexicalForm, langTag) ;
else
- n = NodeFactory.createLiteral(lexicalForm, langTag, null) ;
+ n = NodeFactory.createLiteral(lexicalForm) ;
return n ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
index 8985c5a..3b7b1b0 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
@@ -147,10 +147,10 @@ public class ParseHandlerPlain implements ParseHandler
datatypeIRI = resolvePrefixedName(datatypePN, line, column) ;
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeIRI) ;
- n = NodeFactory.createLiteral(lexicalForm, null, dType) ;
+ n = NodeFactory.createLiteral(lexicalForm, dType) ;
}
else
- n = NodeFactory.createLiteral(lexicalForm, langTag, null) ;
+ n = NodeFactory.createLiteral(lexicalForm, langTag) ;
Item item = Item.createNode(n, line, column) ;
listAdd(item) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java
index c459f7c..53cef62 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java
@@ -179,7 +179,7 @@ public class NodeFactoryExtra
*/
public static Node intToNode(int integer)
{
- return NodeFactory.createLiteral(Integer.toString(integer), "", XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(Integer.toString(integer), XSDDatatype.XSDinteger) ;
}
/** long to Node
@@ -189,7 +189,7 @@ public class NodeFactoryExtra
*/
public static Node intToNode(long integer)
{
- return NodeFactory.createLiteral(Long.toString(integer), "", XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(Long.toString(integer), XSDDatatype.XSDinteger) ;
}
/** float to Node
@@ -199,7 +199,7 @@ public class NodeFactoryExtra
*/
public static Node floatToNode(float value)
{
- return NodeFactory.createLiteral(Float.toString(value), "", XSDDatatype.XSDfloat) ;
+ return NodeFactory.createLiteral(Float.toString(value), XSDDatatype.XSDfloat) ;
}
/** double to Node
@@ -209,42 +209,42 @@ public class NodeFactoryExtra
*/
public static Node doubleToNode(double value)
{
- return NodeFactory.createLiteral(Double.toString(value), "", XSDDatatype.XSDdouble) ;
+ return NodeFactory.createLiteral(Double.toString(value), XSDDatatype.XSDdouble) ;
}
/** Calendar to xsd:dateTime Node */
public static Node dateTimeToNode(Calendar c)
{
String lex = Utils.calendarToXSDDateTimeString(c);
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime);
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdateTime);
}
/** Calendar to xsd:date Node */
public static Node dateToNode(Calendar c)
{
String lex = Utils.calendarToXSDDateString(c);
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate);
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdate);
}
/** Calendar to xsd:time Node */
public static Node timeToNode(Calendar c)
{
String lex = Utils.calendarToXSDTimeString(c);
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDtime);
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDtime);
}
/** Now, as xsd:dateTime Node */
public static Node nowAsDateTime()
{
String lex = Utils.nowAsXSDDateTimeString() ;
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdateTime) ;
}
/** Today, as xsd:date Node */
public static Node todayAsDate()
{
String lex = Utils.todayAsXSDDateString() ;
- return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate) ;
+ return NodeFactory.createLiteral(lex, XSDDatatype.XSDdate) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/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 4314c63..18b66af 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
@@ -180,7 +180,7 @@ public class JsonLDReader implements ReaderRIOT
if ( lang == null && datatype == null )
return NodeFactory.createLiteral(lex) ;
if ( lang != null )
- return NodeFactory.createLiteral(lex, lang, null) ;
+ return NodeFactory.createLiteral(lex, lang) ;
RDFDatatype dt = NodeFactory.getType(datatype) ;
return NodeFactory.createLiteral(lex, dt) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
index 6fd5875..5dd7cbc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
@@ -181,7 +181,7 @@ public class LangRDFXML implements LangRIOT
}
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
- return NodeFactory.createLiteral(lit.toString(), null, dt);
+ return NodeFactory.createLiteral(lit.toString(), dt);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
index 1730102..9e5db2d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
@@ -82,7 +82,7 @@ class NormalizeValue
String lex2 = xcal.toXMLFormat() ;
if ( lex2.equals(lexicalForm) )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
// The only variablity for a valid date/dateTime/g* type is:
// Second part can have fractional seconds '.' s+ (if present) represents the fractional seconds;
@@ -107,7 +107,7 @@ class NormalizeValue
// Can't happen. We munged dts.second.
// if ( lex2.equals(lexicalForm) )
// return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
@@ -142,7 +142,7 @@ class NormalizeValue
// If it's a subtype of integer, then output a new node of datatype integer.
if ( datatype.equals(XSDDatatype.XSDinteger) && lex2.equals(lexicalForm) )
return node ;
- return NodeFactory.createLiteral(lex2, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(lex2, XSDDatatype.XSDinteger) ;
}
} ;
@@ -160,7 +160,7 @@ class NormalizeValue
lex2 = lex2+".0" ;
if ( lex2.equals(lexicalForm) )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
@@ -190,7 +190,7 @@ class NormalizeValue
String lex2 = fmtFloatingPoint.format(d) ;
if ( lex2.equals(lexicalForm) )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
@@ -202,7 +202,7 @@ class NormalizeValue
String lex2 = fmtFloatingPoint.format(f) ;
if ( lex2.equals(lexicalForm) )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
@@ -220,7 +220,7 @@ class NormalizeValue
@Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
- return NodeFactory.createLiteral(lexicalForm, "", datatype) ;
+ return NodeFactory.createLiteral(lexicalForm, datatype) ;
}
} ;
@@ -240,7 +240,7 @@ class NormalizeValue
if ( idx == lexicalForm.length()-1 )
return NodeFactory.createLiteral(lex) ;
String lang = lexicalForm.substring(idx+1) ;
- return NodeFactory.createLiteral(lex,lang, null) ;
+ return NodeFactory.createLiteral(lex,lang) ;
}
} ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
index d2732bb..7b9ce8e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
@@ -133,7 +133,7 @@ class NormalizeValue2
String lex2 = rebuild(chars) ;
if ( lex2 == null )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
@@ -152,7 +152,7 @@ class NormalizeValue2
String lex2 = rebuild(chars) ;
if ( lex2 == null )
return node ;
- return NodeFactory.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, datatype) ;
}
} ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
index 80c814f..b3efdf1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
@@ -119,12 +119,12 @@ public class ParserProfileBase implements ParserProfile {
@Override
public Node createTypedLiteral(String lexical, RDFDatatype dt, long line, long col) {
- return NodeFactory.createLiteral(lexical, null, dt) ;
+ return NodeFactory.createLiteral(lexical, dt) ;
}
@Override
public Node createLangLiteral(String lexical, String langTag, long line, long col) {
- return NodeFactory.createLiteral(lexical, langTag, null) ;
+ return NodeFactory.createLiteral(lexical, langTag) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
index fa184a9..2d15674 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
@@ -123,14 +123,14 @@ public class ParserProfileChecker extends ParserProfileBase // implements
@Override
public Node createTypedLiteral(String lexical, RDFDatatype datatype, long line, long col) {
- Node n = NodeFactory.createLiteral(lexical, null, datatype) ;
+ Node n = NodeFactory.createLiteral(lexical, datatype) ;
CheckerLiterals.checkLiteral(lexical, datatype, errorHandler, line, col) ;
return n ;
}
@Override
public Node createLangLiteral(String lexical, String langTag, long line, long col) {
- Node n = NodeFactory.createLiteral(lexical, langTag, null) ;
+ Node n = NodeFactory.createLiteral(lexical, langTag) ;
CheckerLiterals.checkLiteral(lexical, langTag, errorHandler, line, col) ;
return n ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
index 5b50e6d..7b542f0 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
@@ -89,14 +89,14 @@ public class ThriftConvert
long x = term.getValInteger() ;
String lex = Long.toString(x, 10) ;
RDFDatatype dt = XSDDatatype.XSDinteger ;
- return NodeFactory.createLiteral(lex, null, dt) ;
+ return NodeFactory.createLiteral(lex, dt) ;
}
if ( term.isSetValDouble() ) {
double x = term.getValDouble() ;
String lex = Double.toString(x) ;
RDFDatatype dt = XSDDatatype.XSDdouble ;
- return NodeFactory.createLiteral(lex, null, dt) ;
+ return NodeFactory.createLiteral(lex, dt) ;
}
if ( term.isSetValDecimal() ) {
@@ -105,7 +105,7 @@ public class ThriftConvert
BigDecimal d = BigDecimal.valueOf(value, scale) ;
String lex = d.toPlainString() ;
RDFDatatype dt = XSDDatatype.XSDdecimal ;
- return NodeFactory.createLiteral(lex, null, dt) ;
+ return NodeFactory.createLiteral(lex, dt) ;
}
if ( term.isSetVariable() )
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
index 1f6edf0..03b7300 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
@@ -441,9 +441,9 @@ public final class Token
if ( x == null )
throw new RiotException("Can't expand prefixed name: "+this) ;
return NodeFactory.createURI(x) ;
- case DECIMAL : return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDdecimal) ;
- case DOUBLE : return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDdouble) ;
- case INTEGER: return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDinteger) ;
+ case DECIMAL : return NodeFactory.createLiteral(tokenImage, XSDDatatype.XSDdecimal) ;
+ case DOUBLE : return NodeFactory.createLiteral(tokenImage, XSDDatatype.XSDdouble) ;
+ case INTEGER: return NodeFactory.createLiteral(tokenImage, XSDDatatype.XSDinteger) ;
case LITERAL_DT :
{
Token lexToken = getSubToken1() ;
@@ -456,9 +456,9 @@ public final class Token
if ( ! n.isURI() )
throw new RiotException("Invalid token: "+this) ;
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(n.getURI()) ;
- return NodeFactory.createLiteral(lexToken.getImage(), null, dt) ;
+ return NodeFactory.createLiteral(lexToken.getImage(), dt) ;
}
- case LITERAL_LANG : return NodeFactory.createLiteral(tokenImage, tokenImage2, null) ;
+ case LITERAL_LANG : return NodeFactory.createLiteral(tokenImage, tokenImage2) ;
case STRING:
case STRING1:
case STRING2:
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
index ec6db02..88e7f4e 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
@@ -260,7 +260,7 @@ public class TestQueryIterSort {
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
- binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
index da51a46..23905b6 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
@@ -220,10 +220,10 @@ public class TestFunctions
@Test public void exprNotOneOf_06() { test("57 not in (1,2,3)", TRUE) ; }
- static Node xyz_en = NodeFactory.createLiteral("xyz", "en", null) ;
+ static Node xyz_en = NodeFactory.createLiteral("xyz", "en") ;
static NodeValue nv_xyz_en = NodeValue.makeNode(xyz_en) ;
- static Node xyz_xsd_string = NodeFactory.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
+ static Node xyz_xsd_string = NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring) ;
static NodeValue nv_xyz_string = NodeValue.makeNode(xyz_xsd_string) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
index af59b16..7b54d6e 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
@@ -53,7 +53,7 @@ public class TestNodeFunctions extends BaseTest {
@Test public void testSameTerm4() {
Node n1 = NodeFactory.createLiteral("xyz") ;
- Node n2 = NodeFactory.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
+ Node n2 = NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring) ;
if ( JenaRuntime.isRDF11 )
assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
else
@@ -61,20 +61,20 @@ public class TestNodeFunctions extends BaseTest {
}
@Test public void testSameTerm5() {
- Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
- Node n2 = NodeFactory.createLiteral("xyz", null, null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en") ;
+ Node n2 = NodeFactory.createLiteral("xyz") ;
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm6() {
- Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
- Node n2 = NodeFactory.createLiteral("xyz", "EN", null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en") ;
+ Node n2 = NodeFactory.createLiteral("xyz", "EN") ;
assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testRDFtermEquals1() {
Node n1 = NodeFactory.createURI("xyz") ;
- Node n2 = NodeFactory.createLiteral("xyz", null, null) ;
+ Node n2 = NodeFactory.createLiteral("xyz") ;
assertFalse(NodeFunctions.rdfTermEquals(n1, n2)) ;
}
@@ -82,13 +82,13 @@ public class TestNodeFunctions extends BaseTest {
public void testRDFtermEquals3() {
// Unextended - no language tag
Node n1 = NodeFactory.createLiteral("xyz") ;
- Node n2 = NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = NodeFactory.createLiteral("xyz", "en") ;
NodeFunctions.rdfTermEquals(n1, n2) ;
}
@Test public void testRDFtermEquals2() {
- Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
- Node n2 = NodeFactory.createLiteral("xyz", "EN", null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en") ;
+ Node n2 = NodeFactory.createLiteral("xyz", "EN") ;
assertTrue(NodeFunctions.rdfTermEquals(n1, n2)) ;
}
@@ -164,7 +164,7 @@ public class TestNodeFunctions extends BaseTest {
}
@Test public void testLang1() {
- Node n = NodeFactory.createLiteral("abc", "en-gb", null) ;
+ Node n = NodeFactory.createLiteral("abc", "en-gb") ;
assertEquals("en-gb", NodeFunctions.lang(n)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
index f6d1296..d84011b 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
@@ -728,18 +728,18 @@ public class TestNodeValue extends BaseTest
@Test public void testLang1()
{
- Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertTrue(NodeValue.sameAs(nv1, nv2)) ;
}
@Test public void testLang2()
{
- Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN") ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertTrue(NodeValue.sameAs(nv1, nv2)) ;
assertFalse(nv1.equals(nv2)) ;
@@ -747,18 +747,18 @@ public class TestNodeValue extends BaseTest
@Test public void testLang3()
{
- Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertFalse(NodeValue.notSameAs(nv1, nv2)) ;
}
@Test public void testLang4()
{
- Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN") ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertFalse(NodeValue.notSameAs(nv1, nv2)) ;
assertFalse(nv1.equals(nv2)) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
index 6869b94..46562a9 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
@@ -127,47 +127,47 @@ public class TestOrdering extends BaseTest
@Test public void test_xsd_string1()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_EQUAL == x ) ;
}
@Test public void test_xsd_string2()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_GREATER == x ) ;
}
@Test public void test_xsd_string3()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc")) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_GREATER == x ) ;
}
@Test public void test_xsd_string4()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_LESS == x ) ;
}
@Test public void test_xsd_string5()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz")) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_LESS == x ) ;
}
@Test public void test_lang1()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc")) ;
int x = NodeUtils.compareRDFTerms(nv1.asNode() , nv2.asNode()) ;
assertTrue("Lang tags should sort after plain literal", Expr.CMP_GREATER == x ) ;
@@ -175,8 +175,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang2()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN")) ;
int x = NodeUtils.compareRDFTerms(nv1.asNode() , nv2.asNode()) ;
assertTrue("Lang tags should sort by case", Expr.CMP_GREATER == x ) ;
@@ -184,8 +184,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang3()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical if tags value-same", Expr.CMP_LESS == x ) ;
@@ -195,8 +195,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang4()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical if tags the same", Expr.CMP_LESS == x ) ;
@@ -206,8 +206,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang5()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if one is plain", Expr.CMP_LESS == x ) ;
@@ -217,8 +217,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang6()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if one is plain", Expr.CMP_GREATER == x ) ;
@@ -228,8 +228,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang7()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_LESS == x ) ;
@@ -239,8 +239,8 @@ public class TestOrdering extends BaseTest
@Test public void test_lang8()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_GREATER == x ) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
index a7f38c0..ab0a6d0 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
@@ -35,10 +35,10 @@ public class TestSSE_Basic extends TestCase
{
// Tests not requiring URI resolution or prefix name handling.
- static Node int1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("1", null, XSDDatatype.XSDinteger) ;
- static Node int2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("2", null, XSDDatatype.XSDinteger) ;
- static Node int3 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
- static Node strLangEN = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
+ static Node int1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("1", XSDDatatype.XSDinteger) ;
+ static Node int2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) ;
+ static Node int3 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("3", XSDDatatype.XSDinteger) ;
+ static Node strLangEN = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
static Node typeLit1 = NodeFactoryExtra.createLiteralNode("123", null, "http://example/type") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
index 22f6a6d..e446c6f 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
@@ -149,7 +149,7 @@ public class TestSSE_Forms extends TestCase
@Test public void testTypedLit_r1()
{
- Node node = NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
+ Node node = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger) ;
testItem("'3'^^xsd:integer", Item.createNode(node)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
index 297ab61..90a5109 100644
--- a/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
+++ b/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
@@ -191,12 +191,12 @@ public class TestList extends BaseTest
return new GNode(graph, t.getObject()) ;
}
- private static Node node1 = NodeFactory.createLiteral("1", "", XSDDatatype.XSDinteger) ;
- private static Node node2 = NodeFactory.createLiteral("2", "", XSDDatatype.XSDinteger) ;
- private static Node node3 = NodeFactory.createLiteral("3", "", XSDDatatype.XSDinteger) ;
- private static Node node4 = NodeFactory.createLiteral("4", "", XSDDatatype.XSDinteger) ;
+ private static Node node1 = NodeFactory.createLiteral("1", XSDDatatype.XSDinteger) ;
+ private static Node node2 = NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) ;
+ private static Node node3 = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger) ;
+ private static Node node4 = NodeFactory.createLiteral("4", XSDDatatype.XSDinteger) ;
- private static Node node0 = NodeFactory.createLiteral("0", "", XSDDatatype.XSDinteger) ;
+ private static Node node0 = NodeFactory.createLiteral("0", XSDDatatype.XSDinteger) ;
private static Node r = NodeFactory.createURI("http://example/r") ;
private static Node p = NodeFactory.createURI("http://example/p") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
index 38d29c1..6d00176 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
@@ -174,7 +174,7 @@ public class TestDistinctDataBag extends TestCase
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
- binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
index 33e5f29..1d8386d 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
@@ -277,7 +277,7 @@ public class TestDistinctDataNet extends TestCase
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
- binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
index 9041501..7c8d0a0 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
@@ -195,7 +195,7 @@ public class TestSortedDataBag extends TestCase
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
- binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
index 59f3b2e..e13d58d 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.graph;
+package com.hp.hpl.jena.graph ;
import com.hp.hpl.jena.datatypes.DatatypeFormatException ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
@@ -25,95 +25,113 @@ import com.hp.hpl.jena.graph.impl.LiteralLabel ;
import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
-public class NodeFactory
-{
+public class NodeFactory {
- public static RDFDatatype getType( String s )
- { return TypeMapper.getInstance().getSafeTypeByName( s ); }
+ public static RDFDatatype getType(String s) {
+ return TypeMapper.getInstance().getSafeTypeByName(s) ;
+ }
- /** make a blank node with a fresh anon id */
- public static Node createAnon()
- { return createAnon( AnonId.create() ); }
+ /** make a blank node with a fresh anon id */
+ public static Node createAnon() {
+ return createAnon(AnonId.create()) ;
+ }
/** make a blank node with the specified label */
- public static Node createAnon( AnonId id )
- { return Node.create( Node.makeAnon, id ); }
+ public static Node createAnon(AnonId id) {
+ return Node.create(Node.makeAnon, id) ;
+ }
/** make a literal node with the specified literal value */
- public static Node createLiteral( LiteralLabel lit )
- { return Node.create( Node.makeLiteral, lit ); }
+ public static Node createLiteral(LiteralLabel lit) {
+ return Node.create(Node.makeLiteral, lit) ;
+ }
/** make a URI node with the specified URIref string */
- public static Node createURI( String uri )
- { return Node.create( Node.makeURI, uri ); }
+ public static Node createURI(String uri) {
+ return Node.create(Node.makeURI, uri) ;
+ }
/** make a variable node with a given name */
- public static Node createVariable( String name )
- { return Node.create( Node.makeVariable, Node_Variable.variable( name ) ); }
-
- public static Node createLiteral( String value )
- { return createLiteral( value, "", false ); }
-
- /** make a literal with specified language and XMLishness.
- lexical form must not be null.
- @param lex
- @param lang
- @param isXml If true then lit is exclusive canonical XML of type
- rdf:XMLLiteral, and no checking will be invoked.
- */
- public static Node createLiteral( String lex, String lang, boolean isXml )
- {
- if (lex == null) throw new NullPointerException( "null lexical form for literal" );
- return createLiteral( LiteralLabelFactory.create( lex, lang, isXml ) );
+ public static Node createVariable(String name) {
+ return Node.create(Node.makeVariable, Node_Variable.variable(name)) ;
}
- /** Make a literal with specified language.
- lexical form must not be null.
- @param lex
- @param lang
+ public static Node createLiteral(String value) {
+ return createLiteral(value, "", false) ;
+ }
+
+ /**
+ * make a literal with specified language and XMLishness. lexical form must
+ * not be null.
+ *
+ * @param lex
+ * @param lang
+ * @param isXml
+ * If true then lit is exclusive canonical XML of type
+ * rdf:XMLLiteral, and no checking will be invoked.
*/
- public static Node createLiteral( String lex, String lang)
- {
+ public static Node createLiteral(String lex, String lang, boolean isXml) {
+ if ( lex == null )
+ throw new NullPointerException("null lexical form for literal") ;
+ return createLiteral(LiteralLabelFactory.create(lex, lang, isXml)) ;
+ }
+
+ /**
+ * Make a literal with specified language. lexical form must not be null.
+ *
+ * @param lex
+ * the lexical form of the literal
+ * @param lang
+ * the optional language tag
+ */
+ public static Node createLiteral(String lex, String lang) {
// Equivalent to create(lex, lang, false) except the XML flag is
// hidden so client code does not see it unnecesarily.
- if (lex == null) throw new NullPointerException( "null lexical form for literal" );
- return createLiteral( LiteralLabelFactory.create( lex, lang) );
+ if ( lex == null )
+ throw new NullPointerException("null lexical form for literal") ;
+ return createLiteral(LiteralLabelFactory.create(lex, lang)) ;
}
/**
- * Build a literal node from its lexical form. The
- * lexical form will be parsed now and the value stored. If
- * the form is not legal this will throw an exception.
+ * Build a literal node from its lexical form. The lexical form will be
+ * parsed now and the value stored. If the form is not legal this will throw
+ * an exception.
*
- * @param lex the lexical form of the literal
- * @param lang the optional language tag
- * @param dtype the type of the literal, null for old style "plain" literals
- * @throws DatatypeFormatException if lex is not a legal form of dtype
+ * @param lex
+ * the lexical form of the literal
+ * @param lang
+ * the optional language tag
+ * @param dtype
+ * the type of the literal
+ * @throws DatatypeFormatException
+ * if lex is not a legal form of dtype
*/
- public static Node createLiteral( String lex, String lang, RDFDatatype dtype )
- throws DatatypeFormatException
- { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, lang, dtype ) ); }
+ public static Node createLiteral(String lex, String lang, RDFDatatype dtype) throws DatatypeFormatException {
+ return createLiteral(LiteralLabelFactory.createLiteralLabel(lex, lang, dtype)) ;
+ }
/**
- * Build a typed literal node from its lexical form. The
- * lexical form will be parsed now and the value stored. If
- * the form is not legal this will throw an exception.
+ * Build a typed literal node from its lexical form. The lexical form will
+ * be parsed now and the value stored. If the form is not legal this will
+ * throw an exception.
*
- * @param lex the lexical form of the literal
- * @param dtype the type of the literal, null for old style "plain" literals
- * @throws DatatypeFormatException if lex is not a legal form of dtype
+ * @param lex
+ * the lexical form of the literal
+ * @param dtype
+ * the type of the literal
+ * @throws DatatypeFormatException
+ * if lex is not a legal form of dtype
*/
- public static Node createLiteral( String lex, RDFDatatype dtype )
- throws DatatypeFormatException
- { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, "", dtype ) ); }
+ public static Node createLiteral(String lex, RDFDatatype dtype) throws DatatypeFormatException {
+ return createLiteral(LiteralLabelFactory.create(lex, dtype)) ;
+ }
- public static Node createUncachedLiteral( Object value, String lang, RDFDatatype dtype )
- throws DatatypeFormatException
- { return new Node_Literal( LiteralLabelFactory.create( value, lang, dtype ) ); }
+ public static Node createUncachedLiteral(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException {
+ return new Node_Literal(LiteralLabelFactory.create(value, lang, dtype)) ;
+ }
- public static Node createUncachedLiteral( Object value, RDFDatatype dtype )
- throws DatatypeFormatException
- { return new Node_Literal( LiteralLabelFactory.create( value, "", dtype ) ); }
+ public static Node createUncachedLiteral(Object value, RDFDatatype dtype) throws DatatypeFormatException {
+ return new Node_Literal(LiteralLabelFactory.create(value, "", dtype)) ;
+ }
}
-
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
index df9b53f..21f7f9f 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
@@ -108,9 +108,7 @@ public class CollectionGraph extends GraphBase
{
String lang = node.getLiteralLanguage() ;
if ( lang != null && ! lang.equals("") )
- node = NodeFactory.createLiteral(node.getLiteralLexicalForm(),
- lang.toLowerCase(Locale.ROOT),
- node.getLiteralDatatype()) ;
+ node = NodeFactory.createLiteral(node.getLiteralLexicalForm(), lang.toLowerCase(Locale.ROOT)) ;
}
return node ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index 97dfbf0..bfd5021 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -27,6 +27,14 @@ import com.hp.hpl.jena.vocabulary.RDF ;
public class LiteralLabelFactory
{
+ // This code works for RDF 1.0 and RDF 1.1
+ //
+ // In RDF 1.0, "abc" has no datatype and is a different term to "abc"^^xsd:string
+ // In RDF 1.0, "abc"@en has no datatype.
+ //
+ // In RDF 1.1, "abc" has no datatype xsd:string and is the same term as "abc"^^xsd:string
+ // In RDF 1.1, "abc"@en has datatype rdf:langString.
+
private static final RDFDatatype dtSLangString = NodeFactory.getType(RDF.Nodes.langString.getURI()) ;
private static RDFDatatype fixDatatype(RDFDatatype dtype, String lang) {
@@ -37,19 +45,27 @@ public class LiteralLabelFactory
return dtype ;
}
+ /** Create a literal with a dataype. */
+ public static LiteralLabel create( String lex, RDFDatatype dtype) {
+ return new LiteralLabelImpl( lex, "", dtype );
+ }
+
+ /** Using {@linkplain #create(String, String)} or {@linkplain #create(String, RDFDatatype)}
+ * where possible is preferred.
+ */
public static LiteralLabel createLiteralLabel( String lex, String lang, RDFDatatype dtype )
- throws DatatypeFormatException
+ throws DatatypeFormatException
{
dtype = fixDatatype(dtype, lang) ;
return new LiteralLabelImpl( lex, lang, dtype ); }
/**
- * Build a plain literal label from its lexical form.
+ * Build a plain literal label from its lexical form and language tag.
* @param lex the lexical form of the literal
* @param lang the optional language tag, only relevant for plain literals
*/
public static LiteralLabel create(String lex, String lang) {
- RDFDatatype dt = fixDatatype(null, lang) ;
+ RDFDatatype dt = fixDatatype(null, lang) ;
return new LiteralLabelImpl(lex, lang, dt);
}
@@ -74,7 +90,7 @@ public class LiteralLabelFactory
*/
public static LiteralLabel create(Object value) {
if ( value instanceof String )
- create((String)value, null) ;
+ create((String)value, (RDFDatatype)null) ;
return new LiteralLabelImpl(value) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
index 5f393ad..b2299c6 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
@@ -276,7 +276,7 @@ public class ResourceFactory {
@Override
public Literal createTypedLiteral( String string , RDFDatatype dType)
{
- return new LiteralImpl(NodeFactory.createLiteral(string, "", dType), null) ;
+ return new LiteralImpl(NodeFactory.createLiteral(string, dType), null) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
index d59edbc..717c63c 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
@@ -173,7 +173,7 @@ implements Model, PrefixMapping, Lock
{ return new LiteralImpl( NodeFactory.createLiteral( s, lang, wellFormed), this ); }
private Literal literal( String lex, RDFDatatype datatype)
- { return new LiteralImpl( NodeFactory.createLiteral( lex, "", datatype), this ); }
+ { return new LiteralImpl( NodeFactory.createLiteral( lex, datatype), this ); }
@Override
public Model add( Resource s, Property p, String o, String l )
@@ -708,7 +708,7 @@ implements Model, PrefixMapping, Lock
@Override
public Literal createTypedLiteral(String lex, RDFDatatype dtype)
throws DatatypeFormatException {
- return new LiteralImpl( NodeFactory.createLiteral( lex, "", dtype ), this);
+ return new LiteralImpl( NodeFactory.createLiteral( lex, dtype ), this);
}
/**
@@ -735,7 +735,7 @@ implements Model, PrefixMapping, Lock
@Override
public Literal createTypedLiteral(String lex, String typeURI) {
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI);
- LiteralLabel ll = LiteralLabelFactory.createLiteralLabel( lex, "", dt );
+ LiteralLabel ll = LiteralLabelFactory.create( lex, dt );
return new LiteralImpl( NodeFactory.createLiteral(ll), this );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
index 725bb8d..c8a8b77 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java
@@ -113,7 +113,7 @@ public class JenaReader implements RDFReader, ARPErrorNumbers {
}
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
- return NodeFactory.createLiteral(lit.toString(), null, dt);
+ return NodeFactory.createLiteral(lit.toString(), dt);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
index 4f9814a..cb86eed 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
@@ -894,7 +894,7 @@ public class Rule implements ClauseEntry {
}
}
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
- return NodeFactory.createLiteral(lit, "", dt);
+ return NodeFactory.createLiteral(lit, dt);
} else {
return NodeFactory.createLiteral(lit, "");
}
@@ -918,12 +918,12 @@ public class Rule implements ClauseEntry {
if ( lit.contains( "." ) ) {
// Float?
if (XSDDatatype.XSDfloat.isValid(lit)) {
- return NodeFactory.createLiteral(lit, "", XSDDatatype.XSDfloat);
+ return NodeFactory.createLiteral(lit, XSDDatatype.XSDfloat);
}
} else {
// Int?
if (XSDDatatype.XSDint.isValid(lit)) {
- return NodeFactory.createLiteral(lit, "", XSDDatatype.XSDint);
+ return NodeFactory.createLiteral(lit, XSDDatatype.XSDint);
}
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
index fb68b82..af8de31 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
@@ -81,7 +81,7 @@ public class NodeCreateUtils
if (first == '\'' || first == '\"')
return NodeFactory.createLiteral( newString( pm, first, x ) );
if (Character.isDigit( first ))
- return NodeFactory.createLiteral( x, "", XSDDatatype.XSDinteger );
+ return NodeFactory.createLiteral( x, XSDDatatype.XSDinteger );
if (first == '_')
return NodeFactory.createAnon( new AnonId( x ) );
if (x.equals( "??" ))
@@ -135,7 +135,7 @@ public class NodeCreateUtils
int colon = langOrType.indexOf( ':' );
return colon < 0
? LiteralLabelFactory.create( content, langOrType, false )
- : LiteralLabelFactory.createLiteralLabel( content, "", NodeFactory.getType( pm.expandPrefix( langOrType ) ) )
+ : LiteralLabelFactory.create( content, NodeFactory.getType( pm.expandPrefix( langOrType ) ) )
;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
index 3143c37..7de1a82 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
@@ -18,11 +18,13 @@
package com.hp.hpl.jena.graph.test;
-import com.hp.hpl.jena.datatypes.*;
-import com.hp.hpl.jena.graph.impl.LiteralLabel;
-import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
+import junit.framework.Test ;
+import junit.framework.TestSuite ;
-import junit.framework.*;
+import com.hp.hpl.jena.datatypes.BaseDatatype ;
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.graph.impl.LiteralLabel ;
+import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
public class TestLiteralLabels extends GraphTestBase
{
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
index cf08efb..7b16ba4 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
@@ -578,8 +578,8 @@ public class TestNode extends GraphTestBase
TypeMapper tm = TypeMapper.getInstance();
RDFDatatype dt1 = tm.getTypeByValue( new Integer( 10 ) );
RDFDatatype dt2 = tm.getTypeByValue( new Short( (short) 10 ) );
- Node a = NodeFactory.createLiteral( "10", "", dt1 );
- Node b = NodeFactory.createLiteral( "10", "", dt2 );
+ Node a = NodeFactory.createLiteral( "10", dt1 );
+ Node b = NodeFactory.createLiteral( "10", dt2 );
assertDiffer( "types must make a difference", a, b );
assertTrue( "A and B must express the same value", a.sameValueAs( b ) );
assertTrue( "matching literals must respect sameValueAs", a.matches( b ) );
@@ -591,7 +591,7 @@ public class TestNode extends GraphTestBase
RDFDatatype dtInt = tm.getTypeByValue( new Integer( 10 ) );
Node plain = NodeFactory.createLiteral( "rhubarb", "");
Node english = NodeFactory.createLiteral( "eccentric", "en_UK");
- Node typed = NodeFactory.createLiteral( "10", "", dtInt );
+ Node typed = NodeFactory.createLiteral( "10", dtInt );
assertEquals( "\"rhubarb\"", plain.toString() );
assertEquals( "rhubarb", plain.toString( false ) );
assertEquals( "\"eccentric\"@en_UK", english.toString() );
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
index ca917d8..9b99d48 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
@@ -511,8 +511,8 @@ public class TestTypedLiterals extends TestCase {
RDFDatatype dt = XSDDatatype.XSDdecimal;
Node ns = NodeFactory.createURI("x") ;
Node np = NodeFactory.createURI("p") ;
- Node nx1 = NodeFactory.createLiteral("0.50", null, dt) ;
- Node nx2 = NodeFactory.createLiteral("0.500", null, dt) ;
+ Node nx1 = NodeFactory.createLiteral("0.50", dt) ;
+ Node nx2 = NodeFactory.createLiteral("0.500", dt) ;
Graph graph = Factory.createDefaultGraph() ;
graph.add(new Triple(ns, np, nx1)) ;
assertTrue( graph.find(Node.ANY, Node.ANY, nx2).hasNext() );
@@ -963,8 +963,8 @@ public class TestTypedLiterals extends TestCase {
/** Test that XSD anyURI is not sameValueAs XSD string (Xerces returns a string as the value for both) */
public void testXSDanyURI() {
- Node node1 = NodeFactory.createLiteral("http://example/", null, XSDDatatype.XSDanyURI) ;
- Node node2 = NodeFactory.createLiteral("http://example/", null, XSDDatatype.XSDstring) ;
+ Node node1 = NodeFactory.createLiteral("http://example/", XSDDatatype.XSDanyURI) ;
+ Node node2 = NodeFactory.createLiteral("http://example/", XSDDatatype.XSDstring) ;
assertFalse(node1.sameValueAs(node2)) ;
}
@@ -1156,12 +1156,12 @@ public class TestTypedLiterals extends TestCase {
* Check parse/unparse loop.
*/
public void doTestRoundTrip(String lex, RDFDatatype dt, boolean testeq) {
- LiteralLabel ll = LiteralLabelFactory.createLiteralLabel( lex, "", dt );
+ LiteralLabel ll = LiteralLabelFactory.create( lex, dt );
String lex2 = dt.unparse(ll.getValue());
if (testeq) {
assertEquals(lex, lex2);
}
- LiteralLabel ll2 = LiteralLabelFactory.createLiteralLabel( lex2, "", dt );
+ LiteralLabel ll2 = LiteralLabelFactory.create( lex2, dt );
assertTrue( ll2.isWellFormed() );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
index 2a23b5e..ea80412 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
@@ -59,14 +59,14 @@ public class TestComparatorBuiltins extends TestCase {
doTestComparator("1.0", "1.1", XSDDatatype.XSDfloat);
doTestComparator("1.0", "1.1", XSDDatatype.XSDdouble);
doTestComparator(
- NodeFactory.createLiteral("1.0", "", XSDDatatype.XSDfloat),
- NodeFactory.createLiteral("1.1", "", XSDDatatype.XSDdouble) );
+ NodeFactory.createLiteral("1.0", XSDDatatype.XSDfloat),
+ NodeFactory.createLiteral("1.1", XSDDatatype.XSDdouble) );
doTestComparator(
- NodeFactory.createLiteral("1", "", XSDDatatype.XSDint),
- NodeFactory.createLiteral("2", "", XSDDatatype.XSDinteger) );
+ NodeFactory.createLiteral("1", XSDDatatype.XSDint),
+ NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) );
doTestComparator(
- NodeFactory.createLiteral("1", "", XSDDatatype.XSDint),
- NodeFactory.createLiteral("2", "", XSDDatatype.XSDlong) );
+ NodeFactory.createLiteral("1", XSDDatatype.XSDint),
+ NodeFactory.createLiteral("2", XSDDatatype.XSDlong) );
}
public void testComparatorTime() {
@@ -77,8 +77,8 @@ public class TestComparatorBuiltins extends TestCase {
}
public void doTestComparator(String lLow, String lHigh, RDFDatatype type) {
- Node nl = NodeFactory.createLiteral(lLow, "", type);
- Node nh = NodeFactory.createLiteral(lHigh, "", type);
+ Node nl = NodeFactory.createLiteral(lLow, type);
+ Node nh = NodeFactory.createLiteral(lHigh, type);
doTestComparator(nl, nh);
doTestBuiltins(nl, nh);
@@ -91,8 +91,8 @@ public class TestComparatorBuiltins extends TestCase {
}
public void doTestBuiltins(String lLow, String lHigh, RDFDatatype type) {
- Node nl = NodeFactory.createLiteral(lLow, "", type);
- Node nh = NodeFactory.createLiteral(lHigh, "", type);
+ Node nl = NodeFactory.createLiteral(lLow, type);
+ Node nh = NodeFactory.createLiteral(lHigh, type);
doTestBuiltins(nl, nh);
}
[31/48] jena git commit: JENA-816 : RDF 1.0./1.1 neutral
LiteralLabel.equals.
Posted by rv...@apache.org.
JENA-816 : RDF 1.0./1.1 neutral LiteralLabel.equals.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/782e002e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/782e002e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/782e002e
Branch: refs/heads/hadoop-rdf
Commit: 782e002eca0b2736bba27490c48ede9204aa0872
Parents: 8864bd0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:22:09 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:22:09 2014 +0000
----------------------------------------------------------------------
.../hpl/jena/graph/impl/LiteralLabelImpl.java | 27 ++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/782e002e/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
index b31288c..50a3979 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
@@ -19,6 +19,7 @@
package com.hp.hpl.jena.graph.impl;
import java.util.Locale ;
+import java.util.Objects ;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -299,7 +300,7 @@ final /*public*/ class LiteralLabelImpl implements LiteralLabel {
public Object getIndexingValue() {
return
isXML() ? this
- : !lang.equals( "" ) ? getLexicalForm() + "@" + lang.toLowerCase(Locale.ENGLISH)
+ : !lang.equals( "" ) ? getLexicalForm() + "@" + lang.toLowerCase(Locale.ROOT)
: wellformed ? getValue()
: getLexicalForm()
;
@@ -359,15 +360,21 @@ final /*public*/ class LiteralLabelImpl implements LiteralLabel {
return false;
}
LiteralLabel otherLiteral = (LiteralLabel) other;
- boolean typeEqual =
- (dtype == null
- ? otherLiteral.getDatatype() == null
- : dtype.equals(otherLiteral.getDatatype()));
- boolean langEqual =
- (dtype == null ? lang.equals(otherLiteral.language()) : true);
- return typeEqual
- && langEqual
- && getLexicalForm().equals(otherLiteral.getLexicalForm());
+
+ boolean typeEqual = Objects.equals(dtype, otherLiteral.getDatatype()) ;
+ if ( !typeEqual )
+ return false ;
+
+ boolean lexEquals = Objects.equals(lexicalForm, otherLiteral.getLexicalForm());
+ if ( ! lexEquals )
+ return false ;
+
+ boolean langEqual = Objects.equals(lang, otherLiteral.language()) ;
+ if ( ! langEqual )
+ return false ;
+ // Ignore xml flag as it is calculated from the lexical form + datatype
+ // Ignore value as lexical form + datatype -> value is a function.
+ return true ;
}
/**
[42/48] jena git commit: Escape \" in LiteralLabel.toString.
Posted by rv...@apache.org.
Escape \" in LiteralLabel.toString.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2111efcf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2111efcf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2111efcf
Branch: refs/heads/hadoop-rdf
Commit: 2111efcf4ed6e378fe8491872e54ce3868c5f509
Parents: d753212
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 17:33:18 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 17:33:18 2014 +0000
----------------------------------------------------------------------
.../hpl/jena/graph/impl/LiteralLabelImpl.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2111efcf/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
index 97d6015..cb8be15 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelImpl.java
@@ -24,9 +24,11 @@ import java.util.Objects ;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.datatypes.*;
import com.hp.hpl.jena.datatypes.xsd.*;
import com.hp.hpl.jena.datatypes.xsd.impl.*;
+import com.hp.hpl.jena.rdf.model.impl.Util ;
import com.hp.hpl.jena.shared.impl.JenaParameters;
/**
@@ -267,13 +269,21 @@ final /*public*/ class LiteralLabelImpl implements LiteralLabel {
*/
@Override
public String toString(boolean quoting) {
- StringBuilder b = new StringBuilder();
- if (quoting) b.append('"');
- b.append(getLexicalForm());
- if (quoting) b.append('"');
- if (lang != null && !lang.equals( "" )) b.append( "@" ).append(lang);
- if (dtype != null) b.append( "^^" ).append(dtype.getURI());
- return b.toString();
+ StringBuilder b = new StringBuilder() ;
+ if ( quoting )
+ b.append('"') ;
+ String lex = getLexicalForm() ;
+ lex = Util.replace(lex, "\"", "\\\"") ;
+ b.append(lex) ;
+ if ( quoting )
+ b.append('"') ;
+ if ( lang != null && !lang.equals("") )
+ b.append("@").append(lang) ;
+ else if ( dtype != null ) {
+ if ( ! ( JenaRuntime.isRDF11 && dtype.equals(XSDDatatype.XSDstring) ) )
+ b.append("^^").append(dtype.getURI()) ;
+ }
+ return b.toString() ;
}
@Override
[33/48] jena git commit: Reformat nested SSE expression
Posted by rv...@apache.org.
Reformat nested SSE expression
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3a345b05
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3a345b05
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3a345b05
Branch: refs/heads/hadoop-rdf
Commit: 3a345b05d9d654a91c51cd20b13d66fa38976e14
Parents: 23b6784
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:24:18 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:24:18 2014 +0000
----------------------------------------------------------------------
.../org/apache/jena/riot/writer/TestRDFJSON.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3a345b05/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
index 0c9ea6b..8a2c251 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
@@ -120,14 +120,15 @@ public class TestRDFJSON extends BaseTest
@Test public void rdfjson_literals()
{
// Literals, various
- test ("(base <http://example/> (graph ",
- "(<s> <p> 'abc')",
- "(<s> <p> 'abc'@en)",
- "(<s> <p> 'abc'^^xsd:string)",
- "(<s> <p> '1'^^xsd:integer)",
- "(<s> <p> '1e+100'^^xsd:double)",
- "(<s> <p> '1.05'^^xsd:decimal)",
- "))") ;
+ test ("(base <http://example/>"
+ ," (graph "
+ ," (<s> <p> 'abc')"
+ ," (<s> <p> 'abc'@en)"
+ ," (<s> <p> 'abc'^^xsd:string)"
+ ," (<s> <p> '1'^^xsd:integer)"
+ ," (<s> <p> '1e+100'^^xsd:double)"
+ ," (<s> <p> '1.05'^^xsd:decimal)"
+ ,"))") ;
}
@Test public void rdfjson_escapes()
[14/48] jena git commit: Update jsonld-java from 0.5.0 to 0.5.1
Posted by rv...@apache.org.
Update jsonld-java from 0.5.0 to 0.5.1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/aa78d8aa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/aa78d8aa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/aa78d8aa
Branch: refs/heads/hadoop-rdf
Commit: aa78d8aa8cbe0ecac47e2b0038acc9d63d49000e
Parents: 0992802
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 20 20:04:08 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 20 20:04:08 2014 +0000
----------------------------------------------------------------------
jena-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/aa78d8aa/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index 1652b37..32df4c4 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -50,7 +50,7 @@
<ver.log4j>1.2.17</ver.log4j>
<ver.junit>4.11</ver.junit>
<ver.xerces>2.11.0</ver.xerces>
- <ver.jsonldjava>0.5.0</ver.jsonldjava>
+ <ver.jsonldjava>0.5.1</ver.jsonldjava>
<ver.commons-fileupload>1.3.1</ver.commons-fileupload>
<!-- These are connected because solr4j depends on httpclient as well -->
[16/48] jena git commit: JENA-808 : correct order of assertIsomorphic
arguments.
Posted by rv...@apache.org.
JENA-808 : correct order of assertIsomorphic arguments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7c987169
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7c987169
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7c987169
Branch: refs/heads/hadoop-rdf
Commit: 7c987169f3dc49480a872f075e61ace1d7694775
Parents: 9e69b39
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 13:24:09 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 13:24:09 2014 +0000
----------------------------------------------------------------------
.../jena/graph/compose/test/TestDifference.java | 60 ++++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7c987169/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java
index 0da6e70..6b08b6c 100755
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java
@@ -37,79 +37,79 @@ public class TestDifference extends TestDyadic
Graph gBase = graphWith( "" ), g1 = graphWith( "" );
return new Difference( gBase, g1 );
}
-
+
public Difference differenceOf(String s1, String s2) {
return new Difference( graphWith( s1 ), graphWith( s2 ) );
}
public void testStaticDifference() {
- assertIsomorphic( differenceOf( "", "" ), graphWith( "" ) );
- assertIsomorphic( differenceOf( "x R y", "" ), graphWith( "x R y" ) );
- assertIsomorphic( differenceOf( "", "x R y" ), graphWith( "" ) );
- assertIsomorphic( differenceOf( "x R y", "x R y" ), graphWith( "" ) );
- assertIsomorphic( differenceOf( "x R y; p R q", "r A s; x R y" ), graphWith( "p R q" ) );
+ assertIsomorphic( graphWith( "" ), differenceOf( "", "" ) );
+ assertIsomorphic( graphWith( "x R y" ), differenceOf( "x R y", "" ) );
+ assertIsomorphic( graphWith( "" ), differenceOf( "", "x R y" ) );
+ assertIsomorphic( graphWith( "" ), differenceOf( "x R y", "x R y" ) );
+ assertIsomorphic( graphWith( "p R q" ), differenceOf( "x R y; p R q", "r A s; x R y" ) );
}
public void testDifferenceReflectsChangesToOperands() {
Graph l = graphWith( "x R y" );
Graph r = graphWith( "x R y" );
Difference diff = new Difference( l, r );
- assertIsomorphic( diff, graphWith( "" ) );
+ assertIsomorphic(graphWith( "" ), diff);
r.delete( triple( "x R y" ) );
- assertIsomorphic( diff, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "x R y" ), diff );
l.add( triple( "x R z" ) );
- assertIsomorphic( diff, graphWith( "x R y; x R z" ) );
+ assertIsomorphic( graphWith( "x R y; x R z" ), diff );
r.add( triple( "x R z" ) );
- assertIsomorphic( diff, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "x R y" ), diff );
}
public void testAdd() {
Graph l = graphWith( "x R y" );
Graph r = graphWith( "x R y; x R z" );
Difference diff = new Difference( l, r );
- assertIsomorphic( diff, graphWith( "" ) );
+ assertIsomorphic( graphWith( "" ), diff );
// case 1: add to the left operand
diff.add( triple( "p S q" ) );
- assertIsomorphic( diff, graphWith( "p S q" ) );
- assertIsomorphic( l, graphWith( "x R y; p S q" ) );
- assertIsomorphic( r, graphWith( "x R y; x R z" ) );
+ assertIsomorphic( graphWith( "p S q" ), diff );
+ assertIsomorphic( graphWith( "x R y; p S q" ), l );
+ assertIsomorphic( graphWith( "x R y; x R z" ), r );
// case 2: remove from the right, and add to the left operand
diff.add( triple( "x R z" ) );
- assertIsomorphic( diff, graphWith( "x R z; p S q" ) );
- assertIsomorphic( l, graphWith( "x R y; x R z; p S q" ) );
- assertIsomorphic( r, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "x R z; p S q" ), diff );
+ assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l );
+ assertIsomorphic( graphWith( "x R y" ), r );
// case 3: remove from the right operand
diff.add( triple( "x R y" ) );
- assertIsomorphic( diff, graphWith( "x R y; x R z; p S q" ) );
- assertIsomorphic( l, graphWith( "x R y; x R z; p S q" ) );
- assertIsomorphic( r, graphWith( "" ) );
+ assertIsomorphic( graphWith( "x R y; x R z; p S q" ), diff );
+ assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l );
+ assertIsomorphic( graphWith( "" ), r );
}
public void testDelete() {
Graph l = graphWith( "x R y; x R z" );
Graph r = graphWith( "x R y" );
Difference diff = new Difference( l, r );
- assertIsomorphic( diff, graphWith( "x R z" ) );
+ assertIsomorphic( graphWith( "x R z" ), diff );
// case 1: remove non-existent triple is a no-op
diff.delete( triple( "p S q" ) );
- assertIsomorphic( diff, graphWith( "x R z" ) );
- assertIsomorphic( l, graphWith( "x R y; x R z" ) );
- assertIsomorphic( r, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "x R z" ), diff );
+ assertIsomorphic( graphWith( "x R y; x R z" ), l );
+ assertIsomorphic( graphWith( "x R y" ), r );
// case 2: remove triple that exists in both - removes from left
diff.delete( triple( "x R y" ) );
- assertIsomorphic( diff, graphWith( "x R z" ) );
- assertIsomorphic( l, graphWith( "x R z" ) );
- assertIsomorphic( r, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "x R z" ), diff );
+ assertIsomorphic( graphWith( "x R z" ), l );
+ assertIsomorphic( graphWith( "x R y" ), r );
// case 3: remove triple that exists in left is removed
diff.delete( triple( "x R z" ) );
- assertIsomorphic( diff, graphWith( "" ) );
- assertIsomorphic( l, graphWith( "" ) );
- assertIsomorphic( r, graphWith( "x R y" ) );
+ assertIsomorphic( graphWith( "" ), diff );
+ assertIsomorphic( graphWith( "" ), l );
+ assertIsomorphic( graphWith( "x R y" ), r );
}
}
[24/48] jena git commit: JENA-816 : Test for RDF 1.1 mode.
Posted by rv...@apache.org.
JENA-816 : Test for RDF 1.1 mode.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/909f0e17
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/909f0e17
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/909f0e17
Branch: refs/heads/hadoop-rdf
Commit: 909f0e17a3c1b2f51b66ba3d5478c48c722b2bb4
Parents: 69ffd0c
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:50:23 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:50:23 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/out/TestNodeFmt.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/909f0e17/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
index 8edeb14..82630f3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
@@ -24,6 +24,7 @@ import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.junit.Test ;
+import com.hp.hpl.jena.JenaRuntime ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
@@ -83,9 +84,15 @@ public class TestNodeFmt extends BaseTest
@Test public void nodefmt_nt_15() { test(nodeFormatterNTascii, "'\\n\\t\\f'", "\"\\n\\t\\f\"") ; }
-
-
-
+ // RDF 1.1 sensitive.
+ // xsd:strings output without ^^
+ @Test public void nodefmt_rdf11_01()
+ {
+ if ( JenaRuntime.isRDF11 )
+ test(nodeFormatterNTutf8, "'abc'^^xsd:string", "\"abc\"") ;
+ else
+ test(nodeFormatterNTutf8, "'abc'^^xsd:string", "\"abc\"^^<http://www.w3.org/2001/XMLSchema#string>") ;
+ }
@Test public void nodefmt_ttl_01() { test(nodeFormatterTTL, "?x") ; }
@Test public void nodefmt_ttl_02() { test(nodeFormatterTTL, "?xyz") ; }
[30/48] jena git commit: JENA-816 : Recode to be RDF 1.0/1.1 neutral.
Posted by rv...@apache.org.
JENA-816 : Recode to be RDF 1.0/1.1 neutral.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8864bd06
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8864bd06
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8864bd06
Branch: refs/heads/hadoop-rdf
Commit: 8864bd0609831cd67edff27e6b5e39d4d2d2ee22
Parents: c3843a3
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 15:17:15 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 15:17:15 2014 +0000
----------------------------------------------------------------------
.../process/normalize/CanonicalizeLiteral.java | 27 ++++++++++----------
1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8864bd06/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
index a745b29..d30eee6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
@@ -23,12 +23,12 @@ import java.util.Map ;
import org.apache.jena.riot.web.LangTag ;
-
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
+import com.hp.hpl.jena.sparql.util.NodeUtils ;
import com.hp.hpl.jena.vocabulary.RDF ;
public class CanonicalizeLiteral implements NodeTransform
@@ -40,42 +40,41 @@ public class CanonicalizeLiteral implements NodeTransform
private CanonicalizeLiteral() {}
@Override
- public Node convert(Node node)
- {
+ public Node convert(Node node) {
if ( ! node.isLiteral() )
return node ;
RDFDatatype dt = node.getLiteralDatatype() ;
Node n2 ;
- if ( dt == null )
- {
+ if ( NodeUtils.isLangString(node) ) {
+ // RDF 1.0, no datatype ; RDF 1.1 : datatype is rdf:langString
if ( node.getLiteralLanguage().equals("") )
//n2 = NormalizeValue.dtSimpleLiteral.handle(node, node.getLiteralLexicalForm(), null) ;
return node ;
else
- n2 = canonicalLangtag(node, node.getLiteralLexicalForm(), node.getLiteralLanguage()) ;
- }
- else
- {
- // Valid? Yes - assumes checking has been done.
- // May integrate later
+ n2 = canonicalLangtag(node.getLiteralLexicalForm(), node.getLiteralLanguage()) ;
+ } else if ( dt == null ) {
+ // RDF 1.0 / no lang.
+ n2 = NormalizeValue.dtSimpleLiteral.handle(node, node.getLiteralLexicalForm(), null) ;
+ } else {
+ // Dataype, not rdf:langString (RDF 1.1).
DatatypeHandler handler = dispatch.get(dt) ;
if ( handler == null )
return node ;
-
n2 = handler.handle(node, node.getLiteralLexicalForm(), dt) ;
}
+
if ( n2 == null )
return node ;
return n2 ;
}
- private static Node canonicalLangtag(Node node, String lexicalForm, String langTag)
+ private static Node canonicalLangtag(String lexicalForm, String langTag)
{
String langTag2 = LangTag.canonical(langTag) ;
if ( langTag2.equals(langTag) )
return null ;
- return NodeFactory.createLiteral(lexicalForm, langTag2, null) ;
+ return NodeFactory.createLiteral(lexicalForm, langTag2) ;
}
private static final RDFDatatype dtPlainLiteral = NodeFactory.getType(RDF.getURI()+"PlainLiteral") ;
[43/48] jena git commit: Remove rather old comment item.
Posted by rv...@apache.org.
Remove rather old comment item.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a1f70e02
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a1f70e02
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a1f70e02
Branch: refs/heads/hadoop-rdf
Commit: a1f70e0277d3e8675323e69d2b44f9e7f035c1ae
Parents: 2111efc
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 23 11:03:52 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 23 11:03:52 2014 +0000
----------------------------------------------------------------------
.../src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a1f70e02/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java
index 0048c44..21d9839 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDDatatype.java
@@ -285,7 +285,7 @@ public class XSDDatatype extends BaseDatatype {
/**
* Compares two instances of values of the given datatype.
* This ignores lang tags and defers to the equality function
- * defined by the Xerces package - to be checked.
+ * defined by the Xerces package.
*/
@Override
public boolean isEqual(LiteralLabel value1, LiteralLabel value2) {
[12/48] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by rv...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5af338cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5af338cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5af338cf
Branch: refs/heads/hadoop-rdf
Commit: 5af338cfdc0e68f8e639c7263d22b6e2f8bda77e
Parents: 15e4e8f 7d17f2d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Nov 20 19:07:02 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Nov 20 19:07:02 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RiotReader.java | 2 +-
.../apache/jena/riot/system/IRIResolver.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 2 +-
.../apache/jena/fuseki/server/FusekiServer.java | 3 +--
.../apache/jena/fuseki/server/SystemState.java | 24 ++++++++++++++++++++
5 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[06/48] jena git commit: For reference : the cfg file for default
settings.
Posted by rv...@apache.org.
For reference : the cfg file for default settings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8b549879
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8b549879
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8b549879
Branch: refs/heads/hadoop-rdf
Commit: 8b549879f8f6f870eb7174e93f7da5b336cf39f4
Parents: 02015dc
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 15:38:13 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 15:38:13 2014 +0000
----------------------------------------------------------------------
jena-tdb/tdb-default.cfg | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8b549879/jena-tdb/tdb-default.cfg
----------------------------------------------------------------------
diff --git a/jena-tdb/tdb-default.cfg b/jena-tdb/tdb-default.cfg
new file mode 100644
index 0000000..dbfa54a
--- /dev/null
+++ b/jena-tdb/tdb-default.cfg
@@ -0,0 +1,20 @@
+{
+ "tdb.file_mode" : "mapped" ,
+ "tdb.block_size" : 8192 ,
+ "tdb.block_read_cache_size" : 10000 ,
+ "tdb.block_write_cache_size" : 2000 ,
+ "tdb.node2nodeid_cache_size" : 100000 ,
+ "tdb.nodeid2node_cache_size" : 500000 ,
+ "tdb.node_miss_cache_size" : 100 ,
+ "tdb.index_node2id" : "node2id" ,
+ "tdb.index_id2node" : "nodes" ,
+ "tdb.triple_index_primary" : "SPO" ,
+ "tdb.triple_indexes" : [ "SPO" , "POS" , "OSP" ] ,
+ "tdb.quad_index_primary" : "GSPO" ,
+ "tdb.quad_indexes" : [ "GSPO" , "GPOS" , "GOSP" , "POSG" , "OSPG" , "SPOG" ] ,
+ "tdb.prefix_index_primary" : "GPU" ,
+ "tdb.prefix_indexes" : [ "GPU" ] ,
+ "tdb.file_prefix_index" : "prefixIdx" ,
+ "tdb.file_prefix_nodeid" : "prefix2id" ,
+ "tdb.file_prefix_id2node" : "prefixes"
+}
[17/48] jena git commit: Reformat comments.
Posted by rv...@apache.org.
Reformat comments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6393067c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6393067c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6393067c
Branch: refs/heads/hadoop-rdf
Commit: 6393067cbcfd5ae83f66abf61726e70607a888b1
Parents: 7c98716
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:55:57 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:55:57 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/writer/TurtleShell.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6393067c/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index f128c73..0162c6c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -585,14 +585,12 @@ public abstract class TurtleShell {
}
for ( Node p : predicates ) {
- List<Node> rdfLiterals = new ArrayList<>() ; // Literals in the
- // group
- List<Node> rdfSimpleNodes = new ArrayList<>() ; // Non-literals,
- // printed
- List<Node> rdfComplexNodes = new ArrayList<>() ; // Non-literals,
- // printed ()
- // or
- // []-embedded
+ // Literals in the group
+ List<Node> rdfLiterals = new ArrayList<>() ;
+ // Non-literals, printed
+ List<Node> rdfSimpleNodes = new ArrayList<>() ;
+ // Non-literals, printed (), or []-embedded
+ List<Node> rdfComplexNodes = new ArrayList<>() ;
for ( Node o : pGroups.get(p) ) {
if ( o.isLiteral() ) {
[41/48] jena git commit: Use JDK string replacement.
Posted by rv...@apache.org.
Use JDK string replacement.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d7532127
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d7532127
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d7532127
Branch: refs/heads/hadoop-rdf
Commit: d7532127806a10a5f651418229f6aea290f79243
Parents: 9647622
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 22 17:32:52 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 22 17:32:52 2014 +0000
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/rdf/model/impl/Util.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d7532127/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
index 623174a..7b4b385 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/Util.java
@@ -185,20 +185,8 @@ public class Util extends Object {
}
}
- public static String replace(
- String s,
- String oldString,
- String newString) {
- String result = "";
- int length = oldString.length();
- int pos = s.indexOf(oldString);
- int lastPos = 0;
- while (pos >= 0) {
- result = result + s.substring(lastPos, pos) + newString;
- lastPos = pos + length;
- pos = s.indexOf(oldString, lastPos);
- }
- return result + s.substring(lastPos, s.length());
+ public static String replace(String s, String oldString, String newString) {
+ return s.replace(oldString, newString) ;
}
/** Return true if the literal should be written as a string, without datatype or lang. (RDF 1.0 and RDF 1.1) */
[07/48] jena git commit: Tidy comments.
Posted by rv...@apache.org.
Tidy comments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/15e4e8fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/15e4e8fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/15e4e8fb
Branch: refs/heads/hadoop-rdf
Commit: 15e4e8fb8354a3f6e1485c1653a7c509cd752063
Parents: 8b54987
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Nov 11 15:38:23 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Nov 11 15:38:23 2014 +0000
----------------------------------------------------------------------
.../java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/15e4e8fb/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
index ab6fbe8..5287334 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
@@ -101,21 +101,18 @@ public class StageMatchTuple extends RepeatApplyIterator<BindingNodeId>
if ( anyGraphs )
{
iterMatches = Iter.operate(iterMatches, quadsToAnyTriples) ;
- // If any slots were set, then the index would be ???G and we can use distinctAdjacent.
- // If all slots are unset, the index is probably GSPO (SPOG would be better in this one case).
- // This is a safe, if potentially costly, choice.
-
//Guaranteed
//iterMatches = Iter.distinct(iterMatches) ;
- // This depends on the way indexes are choose and
+ // This depends on the way indexes are chosen and
// the indexing pattern. It assumes that the index
// chosen ends in G so same triples are adjacent
// in a union query.
+ //
// If any slot is defined, then the index will be X??G.
- // if no slot is defined, then the index will be ???G.
+ // If no slot is defined, then the index will be ???G.
+ // But the TupleTable
// See TupleTable.scanAllIndex that ensures the latter.
- // The former assumes indexes are either G... or ...G.
// No G part way through.
iterMatches = Iter.distinctAdjacent(iterMatches) ;
}