GH-4993 check if null before using the removedStatementTarget (#4994)

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/RSXTargetShape.java

@@ -92,7 +92,8 @@ private PlanNode getAddedRemovedInner(ConnectionsGroup connectionsGroup, Resourc
 				dataGraph,
 				statementMatchers,
 				statementMatchers,
-				null, sparqlFragment,
+				null,
+				sparqlFragment,
 				vars,
 				scope,
 				false), false);

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ast/targets/TargetChainRetriever.java

@@ -204,7 +204,7 @@ public void calculateNextStatementMatcher() {
 					this.currentVarNames = currentStatementMatcher.getVarNames(varNames, removedStatement,
 							varNamesInQueryFragment);
 
-					assert !currentVarNames.isEmpty();
+					assert !currentVarNames.isEmpty() : "currentVarNames is empty!";
 
 					statements = connection.getStatements(
 							currentStatementMatcher.getSubjectValue(),
@@ -289,7 +289,7 @@ private List<BindingSet> readStatementsInBulk(Set<String> varNames) {
 					Statement next = statements.next();
 					Stream<EffectiveTarget.StatementsAndMatcher> rootStatements = Stream
 							.of(new EffectiveTarget.StatementsAndMatcher(List.of(next), currentStatementMatcher));
-					if (removedStatement) {
+					if (removedStatement && removedStatementTarget != null) {
 						Stream<EffectiveTarget.StatementsAndMatcher> root = removedStatementTarget.getRoot(
 								connectionsGroup,
 								dataGraph, currentStatementMatcher,

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case4/query1.rq

@@ -0,0 +1,15 @@
+PREFIX ex: <http://example.com/ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+INSERT DATA {
+ex:validPerson1 a ex:Person ;
+        rdfs:label "Jennifer";
+	ex:knows ex:peter.
+
+ex:peter a ex:Person.
+
+}

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case4/query2.rq

@@ -0,0 +1,10 @@
+PREFIX ex: <http://example.com/ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+DELETE DATA {
+ex:validPerson1 a ex:Person .
+}

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case4/report.ttl

@@ -0,0 +1,12 @@
+@prefix ex: <http://example.com/ns#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rsx: <http://rdf4j.org/shacl-extensions#> .
+@prefix rdf4j: <http://rdf4j.org/schema/rdf4j#> .
+
+[] a sh:ValidationReport;
+  rdf4j:truncated false;
+  sh:conforms true .

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case5/query1.rq

@@ -0,0 +1,15 @@
+PREFIX ex: <http://example.com/ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+INSERT DATA {
+ex:validPerson1 a ex:Person ;
+        rdfs:label "Jennifer";
+	ex:knows ex:peter.
+
+ex:peter a ex:Person.
+
+}

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case5/query2.rq

@@ -0,0 +1,11 @@
+PREFIX ex: <http://example.com/ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX sh: <http://www.w3.org/ns/shacl#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+DELETE DATA {
+    ex:validPerson1 rdfs:label "Jennifer" .
+    ex:peter a ex:Person.
+}

core/sail/shacl/src/test/resources/test-cases/class/complexTargetShape2/valid/case5/report.ttl

@@ -0,0 +1,12 @@
+@prefix ex: <http://example.com/ns#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix rsx: <http://rdf4j.org/shacl-extensions#> .
+@prefix rdf4j: <http://rdf4j.org/schema/rdf4j#> .
+
+[] a sh:ValidationReport;
+  rdf4j:truncated false;
+  sh:conforms true .