You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/12/02 10:15:04 UTC
[6/6] jena git commit: Enhance javadoc for isSimpleString. Tidy code.
Enhance javadoc for isSimpleString. Tidy code.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/06ed324a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/06ed324a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/06ed324a
Branch: refs/heads/master
Commit: 06ed324aa7863ad8b55064fc13cd74b1760d6b93
Parents: 08a1580
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 2 09:09:35 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 2 09:14:05 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/rdf/model/impl/Util.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/06ed324a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
index 5e3ec1b..d88b755 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
@@ -17,6 +17,7 @@
*/
package org.apache.jena.rdf.model.impl;
+import java.util.Objects ;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
@@ -199,6 +200,7 @@ public class Util extends Object {
* <li>(RDF 1.1) xsd:string
*/
public static boolean isSimpleString(Node n) {
+ Objects.requireNonNull(n) ;
RDFDatatype dt = n.getLiteralDatatype() ;
if ( dt == null )
return !isLangString(n) ;
@@ -212,6 +214,7 @@ public class Util extends Object {
* (RDF 1.0 and RDF 1.1)
*/
public static boolean isLangString(Node n) {
+ Objects.requireNonNull(n) ;
String lang = n.getLiteralLanguage() ;
if ( lang == null )
return false ;
@@ -219,18 +222,23 @@ public class Util extends Object {
}
- /** Return true if the literal should be written as a string, without datatype or lang. (RDF 1.0 and RDF 1.1) */
+ /** Return true if the literal is a simple string.
+ * <p>RDF 1.0 => it is a plain literal, with no language tag
+ * <p>RDF 1.1 => it has datatype xsd:string
+ */
public static boolean isSimpleString(Literal lit) {
- if ( lit.getDatatypeURI() == null ) {
+ Objects.requireNonNull(lit) ;
+ String dtStr = lit.getDatatypeURI() ;
+ if ( dtStr == null )
return ! isLangString(lit) ;
- }
- if ( JenaRuntime.isRDF11 && lit.getDatatypeURI().equals(XSDDatatype.XSDstring.getURI()) )
- return true;
+ if ( JenaRuntime.isRDF11 )
+ return dtStr.equals(XSDDatatype.XSDstring.getURI());
return false ;
}
- /** Return true if the literals shodul be written with a language string. (RDF 1.0 and RDF 1.1) */
+ /** Return true if the literal has a language tag. (RDF 1.0 and RDF 1.1) */
public static boolean isLangString(Literal lit) {
+ Objects.requireNonNull(lit) ;
String lang = lit.getLanguage() ;
if ( lang == null )
return false ;