You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/01/17 03:36:09 UTC
[commons-rdf] branch master updated: Use isEmpty().
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-rdf.git
The following commit(s) were added to refs/heads/master by this push:
new 6af4086 Use isEmpty().
6af4086 is described below
commit 6af4086914e2961df2658e4be3104c621c7c6a79
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 22:36:04 2021 -0500
Use isEmpty().
---
.../main/java/org/apache/commons/rdf/api/Dataset.java | 10 ++++++++++
.../src/main/java/org/apache/commons/rdf/api/Graph.java | 10 ++++++++++
.../org/apache/commons/rdf/api/AbstractDatasetTest.java | 2 +-
.../org/apache/commons/rdf/api/AbstractGraphTest.java | 4 ++--
.../rdf/simple/experimental/AbstractRDFParserTest.java | 16 ++++++++--------
5 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Dataset.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Dataset.java
index 8184179..aa0211f 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Dataset.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Dataset.java
@@ -168,6 +168,15 @@ public interface Dataset extends AutoCloseable, GraphLike<Quad> {
Stream<BlankNodeOrIRI> getGraphNames();
/**
+ * Tests if this is empty.
+ *
+ * @return true if this is empty.
+ */
+ default boolean isEmpty() {
+ return size() == 0;
+ }
+
+ /**
* Remove a concrete quad from the dataset.
*
* @param quad
@@ -351,4 +360,5 @@ public interface Dataset extends AutoCloseable, GraphLike<Quad> {
final RDFTerm object) throws ConcurrentModificationException, IllegalStateException {
return ((Stream<Quad>) stream(graphName, subject, predicate, object))::iterator;
}
+
}
diff --git a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Graph.java b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Graph.java
index bd10c26..5685413 100644
--- a/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Graph.java
+++ b/commons-rdf-api/src/main/java/org/apache/commons/rdf/api/Graph.java
@@ -205,6 +205,15 @@ public interface Graph extends AutoCloseable, GraphLike<Triple> {
}
/**
+ * Tests if this is empty.
+ *
+ * @return true if this is empty.
+ */
+ default boolean isEmpty() {
+ return size() == 0;
+ }
+
+ /**
* Gets an Iterable for iterating over all triples in the graph.
* <p>
* This method is meant to be used with a Java for-each loop, e.g.:
@@ -295,4 +304,5 @@ public interface Graph extends AutoCloseable, GraphLike<Triple> {
throws ConcurrentModificationException, IllegalStateException {
return ((Stream<Triple>) stream(subject, predicate, object))::iterator;
}
+
}
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 51010bf..e931afc 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
@@ -129,7 +129,7 @@ public abstract class AbstractDatasetTest {
@Test
public void iterate() throws Exception {
- Assume.assumeTrue(dataset.size() > 0);
+ Assume.assumeFalse(dataset.isEmpty());
final List<Quad> quads = new ArrayList<>();
for (final Quad t : dataset.iterate()) {
quads.add(t);
diff --git a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
index 112a618..898740f 100644
--- a/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
+++ b/commons-rdf-api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
@@ -135,7 +135,7 @@ public abstract class AbstractGraphTest {
@Test
public void size() throws Exception {
- assertTrue(graph.size() > 0);
+ assertFalse(graph.isEmpty());
Assume.assumeNotNull(bnode1, bnode2, aliceName, bobName, secretClubName, companyName, bobNameTriple);
// Can only reliably predict size if we could create all triples
assertEquals(8, graph.size());
@@ -144,7 +144,7 @@ public abstract class AbstractGraphTest {
@Test
public void iterate() throws Exception {
- Assume.assumeTrue(graph.size() > 0);
+ Assume.assumeFalse(graph.isEmpty());
final List<Triple> triples = new ArrayList<>();
for (final Triple t : graph.iterate()) {
diff --git a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
index d89f0e4..5113f22 100644
--- a/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
+++ b/commons-rdf-simple/src/test/java/org/apache/commons/rdf/simple/experimental/AbstractRDFParserTest.java
@@ -89,12 +89,12 @@ public class AbstractRDFParserTest {
assertFalse(AbstractRDFParser.guessRDFSyntax(testXml).isPresent());
}
- private void checkGraph(final Graph g) throws Exception {
- assertTrue(g.size() > 0);
+ private void checkGraph(final Graph graph) throws Exception {
+ assertFalse(graph.isEmpty());
final IRI greeting = factory.createIRI("http://example.com/greeting");
// Should only have parsed once!
- assertEquals(1, g.stream(null, greeting, null).count());
- final Triple triple = g.stream(null, greeting, null).findAny().get();
+ assertEquals(1, graph.stream(null, greeting, null).count());
+ final Triple triple = graph.stream(null, greeting, null).findAny().get();
assertTrue(triple.getSubject() instanceof IRI);
final IRI parsing = (IRI) triple.getSubject();
assertTrue(parsing.getIRIString().startsWith("urn:uuid:"));
@@ -108,12 +108,12 @@ public class AbstractRDFParserTest {
assertEquals(Types.XSD_STRING, literal.getDatatype());
// Check uniqueness of properties that are always present
- assertEquals(1, g.stream(null, factory.createIRI("http://example.com/source"), null).count());
+ assertEquals(1, graph.stream(null, factory.createIRI("http://example.com/source"), null).count());
// Check optional properties that are unique
- assertTrue(2 > g.stream(null, factory.createIRI("http://example.com/base"), null).count());
- assertTrue(2 > g.stream(null, factory.createIRI("http://example.com/contentType"), null).count());
- assertTrue(2 > g.stream(null, factory.createIRI("http://example.com/contentTypeSyntax"), null).count());
+ assertTrue(2 > graph.stream(null, factory.createIRI("http://example.com/base"), null).count());
+ assertTrue(2 > graph.stream(null, factory.createIRI("http://example.com/contentType"), null).count());
+ assertTrue(2 > graph.stream(null, factory.createIRI("http://example.com/contentTypeSyntax"), null).count());
}
@Test