GraphLike with addAll

commons-rdf-api/src/main/java/org/apache/commons/rdf/api/GraphLike.java

@@ -55,6 +55,16 @@ public interface GraphLike<T extends TripleLike> {
      */
     void add(T statement);
 
+    /**
+     * Adds all statements.
+     * 
+     * @param statements The TripleLike statements to add.
+     * @since 0.6.0
+     */
+    default void addAll(Iterable<? extends T> statements) {
+        statements.forEach(this::add);
+    }
+
     /**
      * Remove all statements.
      */

commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/AbstractRepositoryGraphLike.java

@@ -20,6 +20,8 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.Triple;
 import org.apache.commons.rdf.api.TripleLike;
 import org.apache.commons.rdf.rdf4j.RDF4J;
 import org.apache.commons.rdf.rdf4j.RDF4JGraphLike;
@@ -48,6 +50,17 @@ abstract class AbstractRepositoryGraphLike<T extends TripleLike> implements RDF4
         rdf4jTermFactory = new RDF4J(repository.getValueFactory(), salt);
     }
 
+    /**
+     * Delegates to {@link RDF4J}{@link #asStatement(TripleLike)}
+     * 
+     * @param tripleLike A {@link Triple} or {@link Quad} to adapt
+     * @return A corresponding {@link Statement}
+     * @since 0.6.0
+     */
+    protected Statement asStatement(final TripleLike tripleLike) {
+        return rdf4jTermFactory.asStatement(tripleLike);
+    }
+
     @Override
     public Optional<Model> asModel() {
         return Optional.empty();

commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryDatasetImpl.java

@@ -18,9 +18,12 @@
 package org.apache.commons.rdf.rdf4j.impl;
 
 import java.util.ConcurrentModificationException;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import org.apache.commons.rdf.api.BlankNodeOrIRI;
 import org.apache.commons.rdf.api.Graph;
@@ -65,6 +68,15 @@ public void add(final Quad tripleLike) {
         }
     }
 
+    @Override
+    public void addAll(Iterable<? extends Quad> statements) {
+        List<Statement> stmts = StreamSupport.stream(statements.spliterator(), false).map(this::asStatement).collect(Collectors.toList());
+        try (RepositoryConnection conn = getRepositoryConnection()) {
+            conn.add(stmts);
+            conn.commit();
+        }
+    }
+
     private Resource[] asContexts(final Optional<BlankNodeOrIRI> graphName) {
         Resource[] contexts;
         if (graphName == null) {

commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java

@@ -20,10 +20,13 @@
 import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import org.apache.commons.rdf.api.BlankNodeOrIRI;
 import org.apache.commons.rdf.api.IRI;
@@ -71,6 +74,15 @@ public void add(final Triple tripleLike) {
         }
     }
 
+    @Override
+    public void addAll(Iterable<? extends Triple> statements) {
+        List<Statement> stmts = StreamSupport.stream(statements.spliterator(), false).map(this::asStatement).collect(Collectors.toList());
+        try (RepositoryConnection conn = getRepositoryConnection()) {
+            conn.add(stmts);
+            conn.commit();
+        }
+    }
+
     @Override
     protected RDF4JTriple asTripleLike(final Statement statement) {
         return getRdf4jTermFactory().asTriple(statement);

commons-rdf-rdf4j/src/test/java/org/apache/commons/rdf/rdf4j/impl/BulkAddTest.java

@@ -0,0 +1,101 @@
+package org.apache.commons.rdf.rdf4j.impl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.rdf4j.RDF4J;
+import org.eclipse.rdf4j.repository.Repository;
+import org.eclipse.rdf4j.repository.sail.SailRepository;
+import org.eclipse.rdf4j.sail.Sail;
+import org.eclipse.rdf4j.sail.memory.MemoryStore;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link RepositoryDatasetImpl#addAll(Iterable) & RepositoryGraphImpl#addAll(Iterable)}.
+ */
+class BulkAddTest {
+
+	private RDF4J rdf4j;
+	private RDFTerm literal1;
+	private RDFTerm literal2;
+	private RDFTerm literal3;
+	private IRI subject;
+	private IRI predicate1;
+	private IRI predicate2;
+	private IRI predicate3;
+
+	@BeforeEach
+	public void setup() {
+		rdf4j = new RDF4J();		
+		subject = rdf4j.createIRI("http://example.com/test1");
+		predicate1 = rdf4j.createIRI("http://example.com/predicate1");
+		predicate2 = rdf4j.createIRI("http://example.com/predicate2");
+		predicate3 = rdf4j.createIRI("http://example.com/predicate3");
+		literal1 = rdf4j.createLiteral("TestString1");
+		literal2 = rdf4j.createLiteral("TestString2");
+		literal3 = rdf4j.createLiteral("TestString3");
+	}
+
+	/**
+	 * Tests {@link RepositoryDatasetImpl#addAll(Iterable)}.
+	 * @throws Exception
+	 */
+	@Test
+	void testRepositoryDatasetImplAddAll() throws Exception {
+		IRI graphName = rdf4j.createIRI("http://example.com/g1");
+
+		List<Quad> quads = new ArrayList<>();
+		quads.add(rdf4j.createQuad(graphName, subject, predicate1, literal1));
+		quads.add(rdf4j.createQuad(graphName, subject, predicate2, literal2));
+		quads.add(rdf4j.createQuad(graphName, subject, predicate3, literal3));
+
+        try(Dataset ds = createDataset()) {
+        	ds.addAll(quads);
+    		Graph g = ds.getGraph(graphName).orElseThrow(()->new IllegalStateException());
+    		assertEquals(3, g.stream().count());
+    		assertEquals(literal1, findTriple(g, subject, predicate1).getObject());
+    		assertEquals(literal2, findTriple(g, subject, predicate2).getObject());
+    		assertEquals(literal3, findTriple(g, subject, predicate3).getObject());
+        }
+	}
+
+	/**
+	 * Tests RepositoryGraphImpl#addAll(Iterable)}. 
+	 */	
+	@Test
+	void testRepositoryGraphImplAddAll() {
+		List<Triple> triples = new ArrayList<>();
+		triples.add(rdf4j.createTriple(subject, predicate1, literal1));
+		triples.add(rdf4j.createTriple(subject, predicate2, literal2));
+		triples.add(rdf4j.createTriple(subject, predicate3, literal3));
+
+		Dataset ds = createDataset();
+		Graph g = ds.getGraph();		
+		g.addAll(triples);		
+
+		assertEquals(3, g.stream().count());
+		assertEquals(literal1, findTriple(g, subject, predicate1).getObject());
+		assertEquals(literal2, findTriple(g, subject, predicate2).getObject());
+		assertEquals(literal3, findTriple(g, subject, predicate3).getObject());
+	}
+
+	private Dataset createDataset() {
+        final Sail sail = new MemoryStore();
+        final Repository repository = new SailRepository(sail);
+        return new RepositoryDatasetImpl(repository, UUID.randomUUID(), true, false);		
+	}
+
+    private Triple findTriple(Graph g, IRI subject, IRI predicate1) {
+		return g.stream(subject, predicate1, null).findFirst().orElseThrow(()->new IllegalStateException());
+	}
+}