This is an automated email from the ASF dual-hosted git repository.
garydgregory 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 d324f244 Add messages when throwing NullPointerException.
d324f244 is described below
commit d324f244c5ed45c01f150a6ea7fe95df83a4ec5e
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Jul 22 15:10:43 2026 -0400
Add messages when throwing NullPointerException.
---
.../org/apache/commons/rdf/jena/impl/AbstractQuadLike.java | 12 ++++++------
.../java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java | 2 +-
.../org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 4 ++--
.../java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java | 2 +-
.../src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java | 2 +-
.../apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java | 2 +-
.../java/org/apache/commons/rdf/simple/BlankNodeImpl.java | 2 +-
.../main/java/org/apache/commons/rdf/simple/DatasetImpl.java | 4 ++--
.../main/java/org/apache/commons/rdf/simple/LiteralImpl.java | 8 ++++----
.../main/java/org/apache/commons/rdf/simple/QuadImpl.java | 6 +++---
.../main/java/org/apache/commons/rdf/simple/TripleImpl.java | 6 +++---
11 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
b/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
index 21e617f6..d56cfb1e 100644
---
a/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
+++
b/commons-rdf-jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractQuadLike.java
@@ -108,7 +108,7 @@ abstract class AbstractQuadLike<S extends RDFTerm, P
extends RDFTerm, O extends
@SuppressWarnings("unchecked")
AbstractQuadLike(final org.apache.jena.graph.Triple triple, final UUID
salt) {
- this.triple = Objects.requireNonNull(triple);
+ this.triple = Objects.requireNonNull(triple, "triple");
this.subject = (S)
INTERNAL_JENA_FACTORY.createRDFTerm(triple.getSubject(), salt);
this.predicate = (P)
INTERNAL_JENA_FACTORY.createRDFTerm(triple.getPredicate(), salt);
this.object = (O)
INTERNAL_JENA_FACTORY.createRDFTerm(triple.getObject(), salt);
@@ -117,7 +117,7 @@ abstract class AbstractQuadLike<S extends RDFTerm, P
extends RDFTerm, O extends
@SuppressWarnings("unchecked")
AbstractQuadLike(final org.apache.jena.sparql.core.Quad quad, final UUID
salt) {
- this.quad = Objects.requireNonNull(quad);
+ this.quad = Objects.requireNonNull(quad, "quad");
this.subject = (S)
INTERNAL_JENA_FACTORY.createRDFTerm(quad.getSubject(), salt);
this.predicate = (P)
INTERNAL_JENA_FACTORY.createRDFTerm(quad.getPredicate(), salt);
this.object = (O)
INTERNAL_JENA_FACTORY.createRDFTerm(quad.getObject(), salt);
@@ -133,11 +133,11 @@ abstract class AbstractQuadLike<S extends RDFTerm, P
extends RDFTerm, O extends
}
AbstractQuadLike(final S subject, final P predicate, final O object, final
Optional<G> graphName) {
- this.subject = Objects.requireNonNull(subject);
- this.predicate = Objects.requireNonNull(predicate);
- this.object = Objects.requireNonNull(object);
+ this.subject = Objects.requireNonNull(subject, "subject");
+ this.predicate = Objects.requireNonNull(predicate, "predicate");
+ this.object = Objects.requireNonNull(object, "object");
// Enforce
- this.graphName =
Objects.requireNonNull(graphName).filter(DEFAULT_GRAPH_CHECKER::isNotDefaultGraphJenaNode);
+ this.graphName = Objects.requireNonNull(graphName,
"graphName").filter(DEFAULT_GRAPH_CHECKER::isNotDefaultGraphJenaNode);
}
@Override
diff --git
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index d7d0ee06..fda83840 100644
---
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -47,7 +47,7 @@ final class JsonLdGraphImpl extends
AbstractJsonLdGraphLike<Triple> implements J
JsonLdGraphImpl(final RDFDataset rdfDataSet, final
Optional<BlankNodeOrIRI> graphName, final String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
- this.graphName = Objects.requireNonNull(graphName);
+ this.graphName = Objects.requireNonNull(graphName, "graphName");
}
JsonLdGraphImpl(final String bnodePrefix) {
diff --git
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index 7ffc0dbf..6734fc9e 100644
---
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -63,8 +63,8 @@ abstract class AbstractJsonLdGraphLike<T extends TripleLike>
implements JsonLdGr
}
AbstractJsonLdGraphLike(final RDFDataset rdfDataSet, final String
bnodePrefix) {
- this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
- this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
+ this.rdfDataSet = Objects.requireNonNull(rdfDataSet, "rdfDataSet");
+ this.bnodePrefix = Objects.requireNonNull(bnodePrefix, "bnodePrefix");
this.factory = new JsonLdRDF(bnodePrefix);
}
diff --git
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
index a9985bb5..d432abe8 100644
---
a/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
+++
b/commons-rdf-jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
@@ -51,7 +51,7 @@ public final class JsonLdRDF implements RDF {
}
JsonLdRDF(final String bnodePrefix) {
- this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
+ this.bnodePrefix = Objects.requireNonNull(bnodePrefix, "bnodePrefix");
}
/**
diff --git
a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
index b9e974a9..6030ccb2 100644
--- a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
+++ b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/RDF4J.java
@@ -312,7 +312,7 @@ public final class RDF4J implements RDF {
/** NOTE: asValue() deliberately CAN handle {@code null} */
final Resource[] resources = contexts.stream().map(g -> (Resource)
asValue(g)).toArray(Resource[]::new);
- return
RDF4J.createRepositoryGraphImpl(Objects.requireNonNull(repository),
+ return
RDF4J.createRepositoryGraphImpl(Objects.requireNonNull(repository,
"repository"),
opts.contains(Option.handleInitAndShutdown),
opts.contains(Option.includeInferred), resources);
}
diff --git
a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
index 05824482..86fcb8a1 100644
---
a/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
+++
b/commons-rdf-rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/impl/RepositoryGraphImpl.java
@@ -48,7 +48,7 @@ final class RepositoryGraphImpl extends
AbstractRepositoryGraphLike<Triple> impl
RepositoryGraphImpl(final Repository repository, final UUID salt, final
boolean handleInitAndShutdown, final boolean includeInferred,
final Resource... contextMask) {
super(repository, salt, handleInitAndShutdown, includeInferred);
- this.contextMask = Objects.requireNonNull(contextMask);
+ this.contextMask = Objects.requireNonNull(contextMask, "contextMask");
}
@Override
diff --git
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
index fd218074..d2a81e6e 100644
---
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
+++
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/BlankNodeImpl.java
@@ -40,7 +40,7 @@ final class BlankNodeImpl implements BlankNode, SimpleRDFTerm
{
}
public BlankNodeImpl(final UUID uuidSalt, final String name) {
- if (Objects.requireNonNull(name).isEmpty()) {
+ if (Objects.requireNonNull(name, "name").isEmpty()) {
throw new IllegalArgumentException("Invalid blank node id: " +
name);
}
diff --git
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
index 461acc8e..1f3aa2d0 100644
---
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
+++
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/DatasetImpl.java
@@ -96,7 +96,7 @@ final class DatasetImpl implements Dataset {
@Override
public boolean contains(final Quad quad) {
- return quads.contains(Objects.requireNonNull(quad));
+ return quads.contains(Objects.requireNonNull(quad, "quad"));
}
@Override
@@ -156,7 +156,7 @@ final class DatasetImpl implements Dataset {
@Override
public void remove(final Quad quad) {
- quads.remove(Objects.requireNonNull(quad));
+ quads.remove(Objects.requireNonNull(quad, "quad"));
}
@Override
diff --git
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
index 7de4bcca..d474dc2c 100644
---
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
+++
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
@@ -45,8 +45,8 @@ final class LiteralImpl implements Literal,
SimpleRDF.SimpleRDFTerm {
}
public LiteralImpl(final String lexicalForm, final IRI dataType) {
- this.lexicalForm = Objects.requireNonNull(lexicalForm);
- this.dataType =
Types.get(Objects.requireNonNull(dataType)).orElse(dataType);
+ this.lexicalForm = Objects.requireNonNull(lexicalForm, "lexicalForm");
+ this.dataType = Types.get(Objects.requireNonNull(dataType,
"dataType")).orElse(dataType);
if (Types.RDF_LANGSTRING.equals(this.dataType)) {
throw new IllegalArgumentException(
"Cannot create a non-language literal with type " +
Types.RDF_LANGSTRING);
@@ -55,8 +55,8 @@ final class LiteralImpl implements Literal,
SimpleRDF.SimpleRDFTerm {
}
public LiteralImpl(final String literal, final String languageTag) {
- this.lexicalForm = Objects.requireNonNull(literal);
- this.languageTag = Objects.requireNonNull(lowerCase(languageTag));
+ this.lexicalForm = Objects.requireNonNull(literal, "Literal");
+ this.languageTag = lowerCase(Objects.requireNonNull(languageTag,
"languageTag"));
if (languageTag.isEmpty()) {
// TODO: Check against
// http://www.w3.org/TR/n-triples/#n-triples-grammar
diff --git
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
index a5af5adc..1f34a375 100644
---
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
+++
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/QuadImpl.java
@@ -53,9 +53,9 @@ final class QuadImpl implements Quad {
*/
public QuadImpl(final BlankNodeOrIRI graphName, final BlankNodeOrIRI
subject, final IRI predicate, final RDFTerm object) {
this.graphName = graphName; // possibly null
- this.subject = Objects.requireNonNull(subject);
- this.predicate = Objects.requireNonNull(predicate);
- this.object = Objects.requireNonNull(object);
+ this.subject = Objects.requireNonNull(subject, "subject");
+ this.predicate = Objects.requireNonNull(predicate, "predicate");
+ this.object = Objects.requireNonNull(object, "object");
}
@Override
diff --git
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
index 36af9fe7..feb2fc4c 100644
---
a/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
+++
b/commons-rdf-simple/src/main/java/org/apache/commons/rdf/simple/TripleImpl.java
@@ -47,9 +47,9 @@ final class TripleImpl implements Triple {
* object of triple
*/
public TripleImpl(final BlankNodeOrIRI subject, final IRI predicate, final
RDFTerm object) {
- this.subject = Objects.requireNonNull(subject);
- this.predicate = Objects.requireNonNull(predicate);
- this.object = Objects.requireNonNull(object);
+ this.subject = Objects.requireNonNull(subject, "subject");
+ this.predicate = Objects.requireNonNull(predicate, "predicate");
+ this.object = Objects.requireNonNull(object, "object");
}
@Override