Merge branch 'apache:master' into rdf4j_2025
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/QuadLike.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
index 25e7a7d..82e59f7 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/QuadLike.java
@@ -29,11 +29,14 @@
* required to be <em>immutable</em> or <em>thread-safe</em>. This interface can
* also be used for <em>generalized quads</em> (e.g. a {@link BlankNode} as
* predicate).
+ * </p>
* <p>
* Implementations should specialize which specific {@link RDFTerm} types they
* return by overriding {@link #getSubject()}, {@link #getPredicate()},
* {@link #getObject()} and {@link #getGraphName()}.
+ * </p>
*
+ * @param <G> Optional value type.
* @since 0.3.0-incubating
* @see Quad
*/
@@ -46,6 +49,7 @@
* the graph name of this statement. If the graph name is not present,e.g.
* the value is {@link Optional#empty()}, it indicates that this Quad is in
* the default graph.
+ * </p>
*
* @return If {@link Optional#isPresent()}, the graph name of this quad,
* otherwise {@link Optional#empty()}, indicating the default graph.
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
index 0f78a05..85ab8a7 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/RDFTermFactory.java
@@ -29,6 +29,8 @@
public interface RDFTermFactory {
/**
+ * Deprecated.
+ *
* @return By default, throws UnsupportedOperationException
*/
default BlankNode createBlankNode() throws UnsupportedOperationException {
@@ -36,6 +38,8 @@
}
/**
+ * Deprecated.
+ *
* @param name TODO
* @return By default, throws UnsupportedOperationException
*/
@@ -44,6 +48,8 @@
}
/**
+ * Deprecated.
+ *
* @return By default, throws UnsupportedOperationException
*/
default Graph createGraph() throws UnsupportedOperationException {
@@ -51,6 +57,8 @@
}
/**
+ * Deprecated.
+ *
* @param iri TODO
* @return TODO
*/
@@ -59,6 +67,8 @@
}
/**
+ * Deprecated.
+ *
* @param lexicalForm TODO
* @return TODO
*/
@@ -67,6 +77,8 @@
}
/**
+ * Deprecated.
+ *
* @param lexicalForm TODO
* @param dataType TODO
* @return TODO
@@ -77,6 +89,8 @@
}
/**
+ * Deprecated.
+ *
* @param lexicalForm TODO
* @param languageTag TODO
* @return TODO
@@ -87,6 +101,8 @@
}
/**
+ * Deprecated.
+ *
* @param subject TODO
* @param predicate TODO
* @param object TODO
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
index df93d33..389420b 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
@@ -699,12 +699,15 @@
@Test
public void testStreamDefaultGraphNameByPattern() throws Exception {
- // Explicitly select in only the default graph Optional.empty()
- final Optional<? extends Quad> aliceTopic = dataset.stream(Optional.empty(), null, null, null).findAny();
- assertTrue(aliceTopic.isPresent());
- // COMMONSRDF-55: should not be <urn:x-arq:defaultgraph> or similar
- assertNull(aliceTopic.get().getGraphName().orElse(null));
- assertFalse(aliceTopic.get().getGraphName().isPresent());
+ dataset.stream(Optional.empty(), null, null, null).forEach(quad -> {
+ // COMMONSRDF-55: should not be <urn:x-arq:defaultgraph> or similar
+ Boolean isGraph1 = quad.getGraphName().map(gn->gn.equals(graph1)).orElse(false);
+ Boolean isGraph2 = quad.getGraphName().map(gn->gn.equals(graph2)).orElse(false);
+ if(!(isGraph1||isGraph2)) {
+ assertNull(quad.getGraphName().orElse(null));
+ assertFalse(quad.getGraphName().isPresent());
+ }
+ });
}
@Test
diff --git a/pom.xml b/pom.xml
index 1cd4840..7890596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@
<!--
<commons.scmPubCheckoutDirectory>${project.build.directory}/site-content</commons.scmPubCheckoutDirectory>
-->
- <commons.javadoc.java.link>https://docs.oracle.com/javase/8/docs/api/</commons.javadoc.java.link>
<!-- NOTE: jsonldjava is also used by rdf4j and jena, check the version
is cross-compatible -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 27018ca..66edfaa 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -37,6 +37,7 @@
[StepSecurity] ci: Harden GitHub Actions #137.
</action>
<action type="fix" dev="ggregory" due-to="strangelookingnerd, Gary Gregory">Migrate tests to JUnit5 #289.</action>
+ <action type="fix" dev="ggregory" due-to="naturzukunft">Fix AbstractDatasetTest #327.</action>
<!-- UPDATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory">
Bump org.apache.commons:commons-parent from 52 to 78 #259, #265, #269, #273, #279.
