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 2018/08/05 15:33:28 UTC
[03/19] jena git commit: ARQ:Query:ParameterizedSparqlString -
replaced "createInsert" method with "FmtUtils.stringForNode" to convert
RDFNodes to string representation.
ARQ:Query:ParameterizedSparqlString - replaced "createInsert" method with "FmtUtils.stringForNode" to convert RDFNodes to string representation.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b06b67bd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b06b67bd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b06b67bd
Branch: refs/heads/master
Commit: b06b67bd2ba5e9afd6f254998b8143e42a69ffc6
Parents: edbd0a2
Author: Greg Albiston <gr...@hotmail.com>
Authored: Mon Jul 30 14:00:03 2018 +0100
Committer: Greg Albiston <gr...@hotmail.com>
Committed: Mon Jul 30 14:00:03 2018 +0100
----------------------------------------------------------------------
.../jena/query/ParameterizedSparqlString.java | 22 ++------------------
.../query/TestParameterizedSparqlString.java | 17 +++++++--------
2 files changed, 10 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b06b67bd/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java b/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
index 03960e0..2a71ea9 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
@@ -1902,7 +1902,7 @@ public class ParameterizedSparqlString implements PrefixMapping {
replacement.append("(");
for (RDFNode item : group) {
- String insert = createInsert(item);
+ String insert = FmtUtils.stringForNode(item.asNode(), (PrefixMapping) null);
replacement.append(insert);
replacement.append(" ");
}
@@ -1922,7 +1922,7 @@ public class ParameterizedSparqlString implements PrefixMapping {
if (isParenthesisNeeded) {
replacement.append("(");
}
- String insert = createInsert(item);
+ String insert = FmtUtils.stringForNode(item.asNode(), (PrefixMapping) null);
replacement.append(insert);
if (isParenthesisNeeded) {
replacement.append(")");
@@ -1952,24 +1952,6 @@ public class ParameterizedSparqlString implements PrefixMapping {
return target;
}
- /**
- * Insert the SPARQL representation of the RDF node.
- *
- * @param item
- * @return
- */
- private String createInsert(RDFNode item) {
- String insert;
- if (item.isLiteral()) {
- Literal lit = item.asLiteral();
- insert = "\"" + lit.getLexicalForm() + "\"^^" + lit.getDatatypeURI();
- } else if (item.isResource()) {
- insert = "<" + item.asResource().getURI() + ">";
- } else {
- insert = item.asResource().getId().getLabelString();
- }
- return insert;
- }
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b06b67bd/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
index 8d75942..fd9b79d 100644
--- a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
+++ b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
@@ -24,8 +24,7 @@ import java.util.HashMap;
import java.util.Iterator ;
import java.util.List;
import java.util.TimeZone ;
-
-import org.apache.jena.datatypes.TypeMapper ;
+import org.apache.jena.datatypes.TypeMapper;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.rdf.model.* ;
@@ -1935,7 +1934,7 @@ public class TestParameterizedSparqlString {
ParameterizedSparqlString pss = new ParameterizedSparqlString(str);
pss.setValues("objs", ResourceFactory.createPlainLiteral("test"));
- String exp = "SELECT * WHERE { VALUES ?o {\"test\"^^http://www.w3.org/2001/XMLSchema#string} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES ?o {\"test\"} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -1949,7 +1948,7 @@ public class TestParameterizedSparqlString {
ParameterizedSparqlString pss = new ParameterizedSparqlString(str);
pss.setValues("objs", ResourceFactory.createPlainLiteral("test"), true);
- String exp = "SELECT * WHERE { VALUES ?o {(\"test\"^^http://www.w3.org/2001/XMLSchema#string)} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES ?o {(\"test\")} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -1966,7 +1965,7 @@ public class TestParameterizedSparqlString {
objs.add(ResourceFactory.createPlainLiteral("obj_B"));
pss.setValues("objs", objs);
- String exp = "SELECT * WHERE { VALUES ?o {\"obj_A\"^^http://www.w3.org/2001/XMLSchema#string \"obj_B\"^^http://www.w3.org/2001/XMLSchema#string} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES ?o {\"obj_A\" \"obj_B\"} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -1983,7 +1982,7 @@ public class TestParameterizedSparqlString {
objs.add(ResourceFactory.createPlainLiteral("obj_B"));
pss.setValues("objs", objs, true);
- String exp = "SELECT * WHERE { VALUES (?o) {(\"obj_A\"^^http://www.w3.org/2001/XMLSchema#string) (\"obj_B\"^^http://www.w3.org/2001/XMLSchema#string)} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES (?o) {(\"obj_A\") (\"obj_B\")} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -2005,7 +2004,7 @@ public class TestParameterizedSparqlString {
props.add(ResourceFactory.createProperty("http://example.org/prop_B"));
pss.setValues("props", props);
- String exp = "SELECT * WHERE { VALUES ?p {<http://example.org/prop_A> <http://example.org/prop_B>} VALUES ?o {\"obj_A\"^^http://www.w3.org/2001/XMLSchema#string \"obj_B\"^^http://www.w3.org/2001/XMLSchema#string} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES ?p {<http://example.org/prop_A> <http://example.org/prop_B>} VALUES ?o {\"obj_A\" \"obj_B\"} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -2027,7 +2026,7 @@ public class TestParameterizedSparqlString {
props.add(ResourceFactory.createProperty("http://example.org/prop_B"));
pss.setValues("props", props, true);
- String exp = "SELECT * WHERE { VALUES (?p) {(<http://example.org/prop_A>) (<http://example.org/prop_B>)} VALUES ?o {\"obj_A\"^^http://www.w3.org/2001/XMLSchema#string \"obj_B\"^^http://www.w3.org/2001/XMLSchema#string} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES (?p) {(<http://example.org/prop_A>) (<http://example.org/prop_B>)} VALUES ?o {\"obj_A\" \"obj_B\"} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);
@@ -2053,7 +2052,7 @@ public class TestParameterizedSparqlString {
pss.setGroupedValues("vars", vars);
- String exp = "SELECT * WHERE { VALUES (?p ?o) {(<http://example.org/prop_A> \"obj_A\"^^http://www.w3.org/2001/XMLSchema#string) (<http://example.org/prop_B> \"obj_B\"^^http://www.w3.org/2001/XMLSchema#string)} ?s ?p ?o }";
+ String exp = "SELECT * WHERE { VALUES (?p ?o) {(<http://example.org/prop_A> \"obj_A\") (<http://example.org/prop_B> \"obj_B\")} ?s ?p ?o }";
String res = pss.toString();
//System.out.println("Exp: " + exp);
//System.out.println("Res: " + res);