fixes based on review

Author: hmottestad

core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/ShaclSailConnection.java

@@ -1344,7 +1344,8 @@ public void prepare() throws SailException {
 					: "isShapeRefreshNeeded should trigger shapesModifiedInCurrentTransaction once we have loaded the modified shapes, but shapesModifiedInCurrentTransaction should be null until then";
 
 			if (!shapeRefreshNeeded && !isBulkValidation() && addedStatementsSet.isEmpty()
-					&& removedStatementsSet.isEmpty()) {
+					&& removedStatementsSet.isEmpty() && addedStatementsInferredSet.isEmpty()
+					&& removedStatementsInferredSet.isEmpty()) {
 				logger.debug("Nothing has changed, nothing to validate.");
 				return;
 			}

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/RdfsReasoningShaclSailTest.java

@@ -131,6 +131,28 @@ public void inferredTargetClassChangeIsDetectedWhenInferredStatementsReported()
 		}
 	}
 
+	@Test
+	public void inferredOnlyNotificationsStillTriggerValidation() throws Exception {
+		SailRepository repo = createRepositoryWithExplicitStatementFiltering(true);
+
+		IRI ontologyGraph = repo.getValueFactory().createIRI("urn:ontology");
+		IRI dataGraph = repo.getValueFactory().createIRI("urn:data");
+
+		loadTurtle(repo, ontologyTurtle(), ontologyGraph);
+		loadTurtle(repo, railcarBrakeShapeTurtle(null, null), RDF4J.SHACL_SHAPE_GRAPH);
+
+		IRI wagon1 = repo.getValueFactory().createIRI("urn:wagon1");
+		IRI freightWagon = repo.getValueFactory().createIRI("https://example.com/trains/FreightWagon");
+
+		try (RepositoryConnection conn = repo.getConnection()) {
+			conn.begin();
+			conn.add(wagon1, RDF.TYPE, freightWagon, dataGraph);
+			assertThrows(ShaclSailValidationException.class, () -> commitAndRethrow(conn));
+		} finally {
+			repo.shutDown();
+		}
+	}
+
 	@Test
 	public void targetClassUsesPerShapeRdfsSubClassReasoning() throws Exception {
 		SailRepository repo = createRepository(false, false, false);
@@ -279,6 +301,20 @@ private static SailRepository createRepositoryWithLegacyCallbackForwarding(boole
 		return repo;
 	}
 
+	private static SailRepository createRepositoryWithExplicitStatementFiltering(boolean includeInferredStatements) {
+		NotifyingSail baseSail = new ExplicitStatementFilteringSail(new MemoryStore());
+		NotifyingSail shaclBase = new SchemaCachingRDFSInferencer(baseSail);
+		ShaclSail shaclSail = new ShaclSail(shaclBase);
+		shaclSail.setRdfsSubClassReasoning(false);
+		shaclSail.setIncludeInferredStatements(includeInferredStatements);
+		shaclSail.setEclipseRdf4jShaclExtensions(true);
+		shaclSail.setSerializableValidation(false);
+
+		SailRepository repo = new SailRepository(shaclSail);
+		repo.init();
+		return repo;
+	}
+
 	private static SailRepository createRepository(boolean includeInferredStatements,
 			boolean filterInferredNotifications,
 			boolean useSchemaCachingInferencer) {
@@ -469,6 +505,68 @@ public void removeConnectionListener(SailConnectionListener listener) {
 		}
 	}
 
+	// Test helper: hide explicit change notifications from listeners.
+	private static final class ExplicitStatementFilteringSail extends NotifyingSailWrapper {
+		ExplicitStatementFilteringSail(NotifyingSail baseSail) {
+			super(baseSail);
+		}
+
+		@Override
+		public NotifyingSailConnection getConnection() throws SailException {
+			InferencerConnection connection = (InferencerConnection) super.getConnection();
+			return new ExplicitStatementFilteringConnection(connection);
+		}
+	}
+
+	private static final class ExplicitStatementFilteringConnection extends InferencerConnectionWrapper {
+		private final Map<SailConnectionListener, SailConnectionListener> listenerMap = new IdentityHashMap<>();
+
+		ExplicitStatementFilteringConnection(InferencerConnection wrappedCon) {
+			super(wrappedCon);
+		}
+
+		@Override
+		public void addConnectionListener(SailConnectionListener listener) {
+			SailConnectionListener filteringListener = new SailConnectionListener() {
+				@Override
+				public void statementAdded(Statement st) {
+					statementAdded(st, false);
+				}
+
+				@Override
+				public void statementRemoved(Statement st) {
+					statementRemoved(st, false);
+				}
+
+				@Override
+				public void statementAdded(Statement st, boolean inferred) {
+					if (inferred) {
+						listener.statementAdded(st, true);
+					}
+				}
+
+				@Override
+				public void statementRemoved(Statement st, boolean inferred) {
+					if (inferred) {
+						listener.statementRemoved(st, true);
+					}
+				}
+			};
+			listenerMap.put(listener, filteringListener);
+			super.addConnectionListener(filteringListener);
+		}
+
+		@Override
+		public void removeConnectionListener(SailConnectionListener listener) {
+			SailConnectionListener filteringListener = listenerMap.remove(listener);
+			if (filteringListener != null) {
+				super.removeConnectionListener(filteringListener);
+			} else {
+				super.removeConnectionListener(listener);
+			}
+		}
+	}
+
 	// Test helper: force all notifications through deprecated no-flag listener methods.
 	private static final class LegacyCallbackForwardingSail extends NotifyingSailWrapper {
 		LegacyCallbackForwardingSail(NotifyingSail baseSail) {