GH-5118 Extend methods of SailConnectionListener with inferred argument.

Author: kenwenzel

core/sail/api/src/main/java/org/eclipse/rdf4j/sail/SailConnectionListener.java

@@ -13,18 +13,39 @@
 import org.eclipse.rdf4j.model.Statement;
 
 public interface SailConnectionListener {
+	/**
+	 * Notifies the listener that a statement has been added in a transaction that it has registered itself with.
+	 *
+	 * @param st       The statement that was added.
+	 * @param inferred The flag that indicates whether the statement is inferred or explicit.
+	 */
+	default void statementAdded(Statement st, boolean inferred) {
+		statementAdded(st);
+	}
+
+	/**
+	 * Notifies the listener that a statement has been removed in a transaction that it has registered itself with.
+	 *
+	 * @param st       The statement that was removed.
+	 * @param inferred The flag that indicates whether the statement was inferred or explicit.
+	 */
+	default void statementRemoved(Statement st, boolean inferred) {
+		statementRemoved(st);
+	}
 
 	/**
 	 * Notifies the listener that a statement has been added in a transaction that it has registered itself with.
 	 *
 	 * @param st The statement that was added.
 	 */
+	@Deprecated(since = "5.2.0", forRemoval = true)
 	void statementAdded(Statement st);
 
 	/**
 	 * Notifies the listener that a statement has been removed in a transaction that it has registered itself with.
 	 *
 	 * @param st The statement that was removed.
 	 */
+	@Deprecated(since = "5.2.0", forRemoval = true)
 	void statementRemoved(Statement st);
 }

core/sail/api/src/main/java/org/eclipse/rdf4j/sail/helpers/AbstractNotifyingSailConnection.java

@@ -48,16 +48,26 @@ protected boolean hasConnectionListeners() {
 		return !listeners.isEmpty();
 	}
 
+	@Deprecated(since = "5.2.0", forRemoval = true)
 	protected void notifyStatementAdded(Statement st) {
+		notifyStatementAdded(st, false);
+	}
+
+	protected void notifyStatementAdded(Statement st, boolean inferred) {
 		for (SailConnectionListener listener : listeners) {
-			listener.statementAdded(st);
+			listener.statementAdded(st, inferred);
 		}
 
 	}
 
+	@Deprecated(since = "5.2.0", forRemoval = true)
 	protected void notifyStatementRemoved(Statement st) {
+		notifyStatementRemoved(st, false);
+	}
+
+	protected void notifyStatementRemoved(Statement st, boolean inferred) {
 		for (SailConnectionListener listener : listeners) {
-			listener.statementRemoved(st);
+			listener.statementRemoved(st, inferred);
 		}
 	}
 }

core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/SailSourceConnection.java

@@ -632,7 +632,7 @@ public void removeStatement(UpdateContext op, Resource subj, IRI pred, Value obj
 				explicitSinks.put(null, source.sink(getIsolationLevel()));
 			}
 			assert explicitSinks.containsKey(op);
-			remove(subj, pred, obj, datasets.get(op), explicitSinks.get(op), contexts);
+			remove(subj, pred, obj, false, datasets.get(op), explicitSinks.get(op), contexts);
 		}
 		removeStatementsInternal(subj, pred, obj, contexts);
 	}
@@ -723,7 +723,7 @@ public boolean addInferredStatement(Resource subj, IRI pred, Value obj, Resource
 						// only report inferred statements that don't already
 						// exist
 						addStatementInternal(subj, pred, obj, contexts);
-						notifyStatementAdded(vf.createStatement(subj, pred, obj));
+						notifyStatementAdded(vf.createStatement(subj, pred, obj), true);
 						setStatementsAdded();
 						modified = true;
 					}
@@ -746,7 +746,7 @@ public boolean addInferredStatement(Resource subj, IRI pred, Value obj, Resource
 							// only report inferred statements that don't
 							// already exist
 							addStatementInternal(subj, pred, obj, ctx);
-							notifyStatementAdded(vf.createStatement(subj, pred, obj, ctx));
+							notifyStatementAdded(vf.createStatement(subj, pred, obj, ctx), true);
 							setStatementsAdded();
 							modified = true;
 						}
@@ -762,9 +762,9 @@ private void add(Resource subj, IRI pred, Value obj, SailDataset dataset, SailSi
 		if (contexts.length == 0 || (contexts.length == 1 && contexts[0] == null)) {
 			if (hasConnectionListeners()) {
 				if (!hasStatement(dataset, subj, pred, obj, NULL_CTX)) {
-					notifyStatementAdded(vf.createStatement(subj, pred, obj));
+					notifyStatementAdded(vf.createStatement(subj, pred, obj), false);
 				} else if (sink instanceof Changeset && ((Changeset) sink).hasDeprecated(subj, pred, obj, NULL_CTX)) {
-					notifyStatementAdded(vf.createStatement(subj, pred, obj));
+					notifyStatementAdded(vf.createStatement(subj, pred, obj), false);
 				}
 
 				// always approve the statement, even if it already exists
@@ -788,10 +788,10 @@ private void add(Resource subj, IRI pred, Value obj, SailDataset dataset, SailSi
 
 				if (hasConnectionListeners()) {
 					if (!hasStatement(dataset, subj, pred, obj, contextsToCheck)) {
-						notifyStatementAdded(vf.createStatement(subj, pred, obj, ctx));
+						notifyStatementAdded(vf.createStatement(subj, pred, obj, ctx), false);
 					} else if (sink instanceof Changeset
 							&& ((Changeset) sink).hasDeprecated(subj, pred, obj, contextsToCheck)) {
-						notifyStatementAdded(vf.createStatement(subj, pred, obj));
+						notifyStatementAdded(vf.createStatement(subj, pred, obj), false);
 					}
 					sink.approve(subj, pred, obj, ctx);
 				} else {
@@ -815,15 +815,16 @@ public boolean removeInferredStatement(Resource subj, IRI pred, Value obj, Resou
 				explicitOnlyDataset = branch(IncludeInferred.explicitOnly).dataset(level);
 			}
 			removeStatementsInternal(subj, pred, obj, contexts);
-			boolean removed = remove(subj, pred, obj, inferredOnlyDataset, inferredOnlySink, contexts);
+			boolean removed = remove(subj, pred, obj, true, inferredOnlyDataset, inferredOnlySink, contexts);
 			if (removed) {
 				setStatementsRemoved();
 			}
 			return removed;
 		}
 	}
 
-	private boolean remove(Resource subj, IRI pred, Value obj, SailDataset dataset, SailSink sink, Resource... contexts)
+	private boolean remove(Resource subj, IRI pred, Value obj, boolean inferred, SailDataset dataset, SailSink sink,
+			Resource... contexts)
 			throws SailException {
 
 		// Use deprecateByQuery if we don't need to notify anyone of which statements have been deleted.
@@ -839,7 +840,7 @@ private boolean remove(Resource subj, IRI pred, Value obj, SailDataset dataset,
 				Statement st = iter.next();
 				sink.deprecate(st);
 				statementsRemoved = true;
-				notifyStatementRemoved(st);
+				notifyStatementRemoved(st, inferred);
 			}
 		}
 		return statementsRemoved;
@@ -857,7 +858,7 @@ protected void clearInternal(Resource... contexts) throws SailException {
 			}
 			assert explicitSinks.containsKey(null);
 			if (this.hasConnectionListeners()) {
-				remove(null, null, null, datasets.get(null), explicitSinks.get(null), contexts);
+				remove(null, null, null, false, datasets.get(null), explicitSinks.get(null), contexts);
 			}
 			explicitSinks.get(null).clear(contexts);
 		}
@@ -876,7 +877,7 @@ public void clearInferred(Resource... contexts) throws SailException {
 				explicitOnlyDataset = branch(IncludeInferred.explicitOnly).dataset(level);
 			}
 			if (this.hasConnectionListeners()) {
-				remove(null, null, null, inferredOnlyDataset, inferredOnlySink, contexts);
+				remove(null, null, null, true, inferredOnlyDataset, inferredOnlySink, contexts);
 			}
 			inferredOnlySink.clear(contexts);
 			setStatementsRemoved();