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 140f6afc Bump org.apache.commons:commons-parent from 103 to 104.
140f6afc is described below
commit 140f6afcc5901a77fc6eb77ef6bf631e8ed1c8d2
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Aug 22 09:52:43 2026 -0400
Bump org.apache.commons:commons-parent from 103 to 104.
Fix Checkstyle issues.
---
.../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 17 ++++++-----------
pom.xml | 2 +-
src/changes/changes.xml | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
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 6734fc9e..0b1d67af 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
@@ -168,12 +168,9 @@ abstract class AbstractJsonLdGraphLike<T extends
TripleLike> implements JsonLdGr
final Optional<Node> subjectNode =
Optional.ofNullable(subject).map(factory::asJsonLdNode);
final Optional<Node> predicateNode =
Optional.ofNullable(predicate).map(factory::asJsonLdNode);
final Optional<Node> objectNode =
Optional.ofNullable(object).map(factory::asJsonLdNode);
-
return q -> {
- if (subjectNode.isPresent() &&
subjectNode.get().compareTo(q.getSubject()) != 0) {
- return false;
- }
- if (predicateNode.isPresent() &&
predicateNode.get().compareTo(q.getPredicate()) != 0) {
+ if (subjectNode.isPresent() &&
subjectNode.get().compareTo(q.getSubject()) != 0
+ || predicateNode.isPresent() &&
predicateNode.get().compareTo(q.getPredicate()) != 0) {
return false;
}
if (objectNode.isPresent()) {
@@ -182,14 +179,12 @@ abstract class AbstractJsonLdGraphLike<T extends
TripleLike> implements JsonLdGr
// Less efficient wrapper to a Commons RDF Literal so
// we can use our RDF 1.1-compliant .equals()
final RDFTerm otherObj = factory.asRDFTerm(q.getObject());
- if (! (object.equals(otherObj))) {
- return false;
- }
- } else {
- // JSONLD-Java's .compareTo can handle IRI, BlankNode and
type-mismatch
- if (objectNode.get().compareTo(q.getObject()) != 0) {
+ if (!object.equals(otherObj)) {
return false;
}
+ } else // JSONLD-Java's .compareTo can handle IRI, BlankNode
and type-mismatch
+ if (objectNode.get().compareTo(q.getObject()) != 0) {
+ return false;
}
}
// All patterns checked, must be good!
diff --git a/pom.xml b/pom.xml
index d4b08049..4cf575a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>103</version>
+ <version>104</version>
</parent>
<artifactId>commons-rdf-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 79ec2756..3e000ea1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,7 +36,7 @@
<action type="fix" dev="ggregory" due-to="naturzukunft, Gary
Gregory">stream() implementations should default to being sequential
#328.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix Apache RAT
plugin console warnings.</action>
<!-- UPDATE -->
- <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
org.apache.commons:commons-parent from 52 to 103 #259, #265, #269, #273, #279,
#353, #377.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
org.apache.commons:commons-parent from 52 to 104 #259, #265, #269, #273, #279,
#353, #377.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
actions/cache from 2.1.4 to 3.0.11 and more #77, #97.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
actions/checkout from 2 to 3.1.0 and more #76, #95.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Bump actions/setup-java from 1.4.0 to 3.6.0 and more #81,
#99.</action>
