code cleanup

Author: hmottestad

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

@@ -723,6 +723,9 @@ public void addStatement(UpdateContext op, Resource subj, IRI pred, Value obj, R
 				startUpdate(op);
 			}
 		}
+		if (op != null) {
+			incrementDataImportMetricsStatementsAdded(contexts);
+		}
 		statementsAdded = true;
 	}
 

core/sail/api/src/test/java/org/eclipse/rdf4j/sail/helpers/AbstractSailConnectionDataImportMetricsTest.java

@@ -31,6 +31,7 @@
 import org.eclipse.rdf4j.model.vocabulary.RDF;
 import org.eclipse.rdf4j.query.BindingSet;
 import org.eclipse.rdf4j.query.Dataset;
+import org.eclipse.rdf4j.query.algebra.InsertData;
 import org.eclipse.rdf4j.query.algebra.TupleExpr;
 import org.eclipse.rdf4j.sail.SailConnection;
 import org.eclipse.rdf4j.sail.SailException;
@@ -161,6 +162,30 @@ void logsDataImportMetricsWhenUpdateAddStatementIsOverridden() {
 		assertThat(messages.get(0)).contains("statementsAdded=1");
 	}
 
+	@Test
+	void logsDataImportMetricsForBufferedUpdateStatements() {
+		TestSail sail = new TestSail();
+		try {
+			sail.init();
+			try (SailConnection connection = sail.getConnection()) {
+				UpdateContext updateContext = new UpdateContext(new InsertData("INSERT DATA {}"), null, null, false);
+				connection.setTransactionSettings(loadDataImportMetricsEnabled());
+				connection.begin();
+				connection.startUpdate(updateContext);
+				connection.addStatement(updateContext, RDF.TYPE, RDF.TYPE, RDF.PROPERTY, VF.createIRI("urn:ctx:one"),
+						VF.createIRI("urn:ctx:two"));
+				connection.endUpdate(updateContext);
+				connection.commit();
+			}
+		} finally {
+			sail.shutDown();
+		}
+
+		List<String> messages = appender.messages(Level.INFO);
+		assertThat(messages).hasSize(1);
+		assertThat(messages.get(0)).contains("statementsAdded=2");
+	}
+
 	private static TransactionSetting loadDataImportMetricsEnabled() {
 		return DataImportMetrics.ENABLED;
 	}