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 2025/11/30 20:39:02 UTC
(jena) 03/15: Clean-up SHACL SPARQL constraints
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 84d1ab62bf76f33d721b9f3c77d8cc2699d9eecb
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri Nov 14 16:48:23 2025 +0000
Clean-up SHACL SPARQL constraints
---
.../org/apache/jena/shacl/engine/constraint/SparqlComponent.java | 8 --------
.../org/apache/jena/shacl/engine/constraint/SparqlValidation.java | 8 ++++----
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
index 64fadb99de..d547c98a9f 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlComponent.java
@@ -74,14 +74,6 @@ public class SparqlComponent {
return query;
}
-// public String getSparqlString() {
-// return sparqlString;
-// }
-//
-// public boolean isSelect() {
-// return query.isSelectType();
-// }
-
public List<Parameter> getParams() {
return params;
}
diff --git a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
index c6cc0f0b11..c5d71f0a98 100644
--- a/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
+++ b/jena-shacl/src/main/java/org/apache/jena/shacl/engine/constraint/SparqlValidation.java
@@ -137,16 +137,16 @@ import org.apache.jena.sparql.util.ModelUtils;
// ASK validator.
if ( qExec.getQuery().isAskType() ) {
- boolean b = qExec.execAsk();
- if ( ! b ) {
+ boolean askResult = qExec.execAsk();
+ if ( ! askResult ) {
String msg = ( violationTemplate == null )
? "SPARQL ASK constraint for "+ShLib.displayStr(valueNode)+" returns false"
: substitute(violationTemplate, parameterMap, focusNode, path, valueNode);
vCxt.reportEntry(msg, shape, focusNode, path, valueNode, reportConstraint);
}
vCxt.notifyValidationListener(() ->
- new ConstraintEvaluatedOnSinglePathNodeEvent(vCxt, shape, focusNode, reportConstraint, path, valueNode,b));
- return b;
+ new ConstraintEvaluatedOnSinglePathNodeEvent(vCxt, shape, focusNode, reportConstraint, path, valueNode, askResult));
+ return askResult;
}
// SELECT validator.