GH-2749 Include Namespaces in Statement imports from NamespaceAware collections

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLStoreConnectionTest.java

@@ -255,6 +255,13 @@ public void testGetNamespace() throws Exception {
  System.err.println("disabled testGetNamespace() as namespace retrieval is not supported by SPARQL");
  }
 
+ @Override
+ @Ignore
+ public void testImportNamespacesFromIterable() throws Exception {
+ System.err
+ .println("disabled testImportNamespacesFromIterable() as namespace setting is not supported by SPARQL");
+ }
+
  @Override
  @Ignore
  public void testTransactionIsolation() throws Exception {

core/repository/api/src/main/java/org/eclipse/rdf4j/repository/RepositoryConnection.java

@@ -940,7 +940,9 @@ void add(File file, String baseURI, RDFFormat dataFormat, Resource... contexts)
  /**
  * Adds the supplied statements to this repository, optionally to one or more named contexts.
  *
- * @param statements The statements that should be added.
+ * @param statements The statements that should be added. In case the iterable is
+ * {@link org.eclipse.rdf4j.model.NamespaceAware} and the target repository supports it, the
+ * iterable's namespaces are also added to the repository, without overwriting existing ones.
  * @param contexts The contexts to add the statements to. Note that this parameter is a vararg and as such is
  * optional. If no contexts are specified, each statement is added to any context specified in the
  * statement, or if the statement contains no context, it is added without context. If one or more

core/repository/api/src/main/java/org/eclipse/rdf4j/repository/base/AbstractRepositoryConnection.java

@@ -22,6 +22,8 @@
 import org.eclipse.rdf4j.common.iteration.Iterations;
 import org.eclipse.rdf4j.common.transaction.IsolationLevel;
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.NamespaceAware;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
 import org.eclipse.rdf4j.model.Value;
@@ -366,10 +368,22 @@ public void add(Iterable<? extends Statement> statements, Resource... contexts)
  "contexts argument may not be null; either the value should be cast to Resource or an empty array should be supplied");
 
  boolean localTransaction = startLocalTransaction();
+
  try {
  for (Statement st : statements) {
  addWithoutCommit(st, contexts);
  }
+
+ if (statements instanceof NamespaceAware) {
+ var newNamespaces = ((NamespaceAware) statements).getNamespaces();
+ for (Namespace newNamespace : newNamespaces) {
+ String nsPrefix = newNamespace.getPrefix();
+ if (getNamespace(nsPrefix) == null) {
+ setNamespace(nsPrefix, newNamespace.getName());
+ }
+ }
+ }
+
  conditionalCommit(localTransaction);
  } catch (RuntimeException e) {
  conditionalRollback(localTransaction);
@@ -407,6 +421,7 @@ public void add(Statement st, Resource... contexts) throws RepositoryException {
 
  Objects.requireNonNull(contexts,
  "contexts argument may not be null; either the value should be cast to Resource or an empty array should be supplied");
+
  addWithoutCommit(st, contexts);
 
  conditionalCommit(localTransaction);
@@ -490,6 +505,10 @@ public void clear(Resource... contexts) throws RepositoryException {
  remove(null, null, null, contexts);
  }
 
+ public abstract String getNamespace(String prefix) throws RepositoryException;
+
+ public abstract void setNamespace(String prefix, String name) throws RepositoryException;
+
  protected void addWithoutCommit(Statement st, Resource... contexts) throws RepositoryException {
  if (contexts.length == 0 && st.getContext() != null) {
  contexts = new Resource[] { st.getContext() };

testsuites/repository/src/main/java/org/eclipse/rdf4j/testsuite/repository/RepositoryConnectionTest.java

@@ -1127,6 +1127,22 @@ public void testGetNamespaces() throws Exception {
  assertThat(map.get(RDF_PREFIX)).isEqualTo("http://www.w3.org/1999/02/22-rdf-syntax-ns#");
  }
 
+ @Test
+ public void testImportNamespacesFromIterable() throws Exception {
+ Model nsAwareModel = new LinkedHashModel();
+ nsAwareModel.setNamespace(RDFS_PREFIX, RDFS_NS);
+ nsAwareModel.setNamespace(EXAMPLE, EXAMPLE_NS);
+
+ testCon.add(nsAwareModel);
+ assertThat(testCon.getNamespace(RDFS_PREFIX)).isEqualTo(RDFS_NS);
+ assertThat(testCon.getNamespace(EXAMPLE)).isEqualTo(EXAMPLE_NS);
+
+ // Test that existing namespaces are not overwritten
+ nsAwareModel.setNamespace(EXAMPLE, "http://something.else/");
+ testCon.add(nsAwareModel);
+ assertThat(testCon.getNamespace(EXAMPLE)).isEqualTo(EXAMPLE_NS);
+ }
+
  private void setupNamespaces() throws IOException, RDFParseException, RepositoryException {
  testCon.setNamespace(EXAMPLE, EXAMPLE_NS);
  testCon.setNamespace(RDF_PREFIX, "http://www.w3.org/1999/02/22-rdf-syntax-ns#");