Merge pull request eclipse-rdf4j#4217 from eclipse/main

Merge main into develop
Fedict · Oct 3, 2022 · 8808a62 · 8808a62
2 parents 15fff36 + 2d24c71
commit 8808a62
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/TripleSourceBase.java b/tools/federation/src/main/java/org/eclipse/rdf4j/federated/evaluation/TripleSourceBase.java
@@ -88,6 +88,7 @@ public CloseableIteration<BindingSet, QueryEvaluationException> getStatements(
 				}
 				return;
 			case CONSTRUCT:
+			case DESCRIBE:
 				monitorRemoteRequest();
 				GraphQuery gQuery = conn.prepareGraphQuery(QueryLanguage.SPARQL, preparedQuery, baseURI);
 				applyBindings(gQuery, queryBindings);

diff --git a/tools/federation/src/test/java/org/eclipse/rdf4j/federated/BasicTests.java b/tools/federation/src/test/java/org/eclipse/rdf4j/federated/BasicTests.java
@@ -476,4 +476,12 @@ public void testDescribe_MultipleResources() throws Exception {
 		prepareTest(Arrays.asList("/tests/basic/data01endpoint1.ttl", "/tests/basic/data01endpoint2.ttl"));
 		execute("/tests/basic/query_describe2.rq", "/tests/basic/query_describe2.ttl", false, true);
 	}
+
+	@Test
+	public void testDescribe_SingleSource() throws Exception {
+
+		/* test DESCRIBE query for a single resource (one federation member to simulate single source) */
+		prepareTest(Arrays.asList("/tests/basic/data01endpoint1.ttl"));
+		execute("/tests/basic/query_describe1.rq", "/tests/basic/query_describe1_singleSource.ttl", false, true);
+	}
 }
diff --git a/tools/federation/src/test/resources/tests/basic/query_describe1_singleSource.ttl b/tools/federation/src/test/resources/tests/basic/query_describe1_singleSource.ttl
@@ -0,0 +1,4 @@
+@prefix : <http://example.org/> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+
+:a foaf:name "Alan" .