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:41 UTC
[16/19] jena git commit: ARQ:Query:ParameterizedSparqlString -
replacement values now use the same mechanism to apply context prefixes as
the remainder of class to provide consistency.
ARQ:Query:ParameterizedSparqlString
- replacement values now use the same mechanism to apply context prefixes as the remainder of class to provide consistency.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d1ee09b4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d1ee09b4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d1ee09b4
Branch: refs/heads/master
Commit: d1ee09b4d4e844bcced79e9ef2ab04cd26018997
Parents: 9c72875
Author: Greg Albiston <gr...@hotmail.com>
Authored: Thu Aug 2 15:01:13 2018 +0100
Committer: Greg Albiston <gr...@hotmail.com>
Committed: Thu Aug 2 15:01:13 2018 +0100
----------------------------------------------------------------------
.../jena/query/ParameterizedSparqlString.java | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d1ee09b4/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 5305654..b8b8978 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
@@ -1334,7 +1334,7 @@ public class ParameterizedSparqlString implements PrefixMapping {
}
// Inject Values Parameters
- command = applyValues(command);
+ command = applyValues(command, context);
// Then inject Positional Parameters
// To do this we need to find the ? we will replace
@@ -1807,10 +1807,10 @@ public class ParameterizedSparqlString implements PrefixMapping {
this.valuesReplacements.put(varName, new ValueReplacement(varName, rowItems));
}
- private String applyValues(String command) {
+ private String applyValues(String command, SerializationContext context) {
for (ValueReplacement valueReplacement : valuesReplacements.values()) {
- command = valueReplacement.apply(command);
+ command = valueReplacement.apply(command, context);
}
return command;
}
@@ -1848,7 +1848,7 @@ public class ParameterizedSparqlString implements PrefixMapping {
this.rowItems = rowItems;
}
- public String apply(String command) {
+ public String apply(String command, SerializationContext context) {
if (rowItems.isEmpty()) {
return command;
@@ -1863,29 +1863,29 @@ public class ParameterizedSparqlString implements PrefixMapping {
validateValuesSafeToInject(command, targetVars);
String target = createTarget();
- String replacement = buildReplacement(targetVars.length);
+ String replacement = buildReplacement(targetVars.length, context);
return command.replaceAll(target, replacement);
}
- private String buildReplacement(int targetVarCount) {
+ private String buildReplacement(int targetVarCount, SerializationContext context) {
StringBuilder replacement = new StringBuilder("");
if (targetVarCount == 1) {
for (List<? extends RDFNode> row : rowItems) {
for (RDFNode item : row) {
- replacement.append("(");
- String insert = FmtUtils.stringForNode(item.asNode(), (PrefixMapping) null);
- replacement.append(insert);
- replacement.append(") ");
+ replacement.append("(");
+ String insert = stringForNode(item.asNode(), context);
+ replacement.append(insert);
+ replacement.append(") ");
}
}
} else {
for (List<? extends RDFNode> row : rowItems) {
replacement.append("(");
for (RDFNode item : row) {
- String insert = FmtUtils.stringForNode(item.asNode(), (PrefixMapping) null);
+ String insert = stringForNode(item.asNode(), context);
replacement.append(insert);
replacement.append(" ");
}