You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/12/01 19:09:12 UTC
[12/14] jena git commit: prefer Strings.emptyToNull(...)
prefer Strings.emptyToNull(...)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c68d55fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c68d55fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c68d55fb
Branch: refs/heads/master
Commit: c68d55fbebdb449ec3e7544b82539ee2c4f4b317
Parents: c39c232
Author: Chris Tomlinson <ct...@moonvine.org>
Authored: Thu Nov 30 09:41:44 2017 -0600
Committer: GitHub <no...@github.com>
Committed: Thu Nov 30 09:41:44 2017 -0600
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextQueryPF.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c68d55fb/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index ecb781c..bafe2ac 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -31,6 +31,7 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.ext.com.google.common.base.Strings;
import org.apache.jena.ext.com.google.common.collect.LinkedListMultimap;
import org.apache.jena.ext.com.google.common.collect.ListMultimap;
import org.apache.jena.query.QueryBuildException ;
@@ -317,7 +318,7 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
}
- lang = lang.isEmpty() ? null : lang;
+ lang = Strings.emptyToNull(lang);
String qs = o.getLiteralLexicalForm() ;
return new StrMatch(null, qs, lang, -1, 0) ;
@@ -358,7 +359,7 @@ public class TextQueryPF extends PropertyFunctionBase {
return null ;
}
}
- lang = lang.isEmpty() ? null : lang;
+ lang = Strings.emptyToNull(lang);
String queryString = x.getLiteralLexicalForm() ;
idx++ ;