eclipse-rdf4j/rdf4j#1298 minor cleanup

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
eclipse-rdf4j · Feb 19, 2019 · 152ac17 · 152ac17
1 parent b40d91b
commit 152ac17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/OrPropertyShape.java b/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/OrPropertyShape.java
@@ -74,7 +74,7 @@ public PlanNode getPlan(ShaclSailConnection shaclSailConnection, NodeShape nodeS
 				.stream()
 				.map(shapes -> shapes.stream().map(shape ->
 					{
-						if(shaclSailConnection.stats.baseSailEmpty){
+						if(shaclSailConnection.stats.isBaseSailEmpty()){
 							return shape.getPlan(shaclSailConnection, nodeShape, false, null);
 						}
 						return shape.getPlan(shaclSailConnection, nodeShape, false, new LoggingNode(targetNodesToValidate.getPlanNode(), ""));

diff --git a/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/StandardisedPlanHelper.java b/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/StandardisedPlanHelper.java
@@ -45,7 +45,7 @@ static public PlanNode getGenericSingleObjectPlan(ShaclSailConnection shaclSailC
 
 		PlanNode top = new LoggingNode(new InnerJoin(bufferedSplitter.getPlanNode(), invalidValuesDirectOnPath, null, new PushBasedLoggingNode(discardedRight)), "");
 
-		if(!shaclSailConnection.stats.baseSailEmpty) {
+		if(!shaclSailConnection.stats.isBaseSailEmpty()) {
 			if (nodeShape instanceof TargetClass) {
 				PlanNode typeFilterPlan = new LoggingNode(((TargetClass) nodeShape).getTypeFilterPlan(shaclSailConnection, discardedRight), "");
 

diff --git a/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java b/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java
@@ -74,15 +74,15 @@ public class ShaclSailConnection extends NotifyingSailConnectionWrapper implemen
 
 	RdfsSubClassOfReasoner rdfsSubClassOfReasoner = new RdfsSubClassOfReasoner();
 
-
 	private boolean preparedHasRun = false;
 
 	private SailRepositoryConnection shapesConnection;
 
 	// used to cache Select plan nodes so that we don't query a store for the same data during the same validation step.
 	private Map<Select, BufferedSplitter> selectNodeCache;
-	boolean validating;
 
+	// used to indicate if the transaction is in the validating phase
+	boolean validating;
 
 	ShaclSailConnection(ShaclSail sail, NotifyingSailConnection connection,
 						NotifyingSailConnection previousStateConnection, SailRepositoryConnection shapesConnection) {
@@ -441,9 +441,8 @@ public RdfsSubClassOfReasoner getRdfsSubClassOfReasoner() {
 
 	public class Stats {
 
-		public boolean baseSailEmpty;
+		boolean baseSailEmpty;
 		boolean hasAdded;
-
 		boolean hasRemoved;
 
 		public void added(Statement statement) {