This is an automated email from the ASF dual-hosted git repository.
arnebdt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 6906cbf0fd GH-3844: Using JEP 394: Pattern Matching for instanceof for
#equals in Node and Triple implementations
6906cbf0fd is described below
commit 6906cbf0fd96656fdbe8f4868f109083d79ab8a1
Author: bern-SOPTIM <[email protected]>
AuthorDate: Tue Dec 30 16:21:41 2025 +0100
GH-3844: Using JEP 394: Pattern Matching for instanceof for #equals in Node
and Triple implementations
- Using JEP 394: Pattern Matching for instanceof for #equals in Node and
Triple implementations
---
jena-core/src/main/java/org/apache/jena/graph/Node_ANY.java | 4 +---
jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Node_Ext.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Node_Graph.java | 3 +--
jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Node_URI.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java | 5 +----
jena-core/src/main/java/org/apache/jena/graph/Triple.java | 2 +-
9 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_ANY.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_ANY.java
index daf135099b..0d54f46ad3 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_ANY.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_ANY.java
@@ -45,9 +45,7 @@ public class Node_ANY extends Node {
@Override
public boolean equals(Object other) {
// There is only one such object.
- if ( this == other )
- return true;
- return false;
+ return this == other;
}
@Override
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
index 7495ccedd1..79c89ba6e2 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
@@ -58,11 +58,8 @@ public class Node_Blank extends Node
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
+ if ( !(obj instanceof Node_Blank other) )
return false;
- if ( getClass() != obj.getClass() )
- return false;
- Node_Blank other = (Node_Blank)obj;
return Objects.equals(label, other.label);
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Ext.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Ext.java
index 2175e07991..ca9f5a137c 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Ext.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Ext.java
@@ -71,11 +71,8 @@ public abstract class Node_Ext<X> extends Node {
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
+ if ( !( obj instanceof Node_Ext<?> other ) )
return false;
- if ( getClass() != obj.getClass() )
- return false;
- Node_Ext<?> other = (Node_Ext<?>)obj;
return Objects.equals(object, other.object);
}
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Graph.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Graph.java
index b51626913c..3cf7b0b0d9 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Graph.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Graph.java
@@ -67,9 +67,8 @@ public class Node_Graph extends Node {
public boolean equals(Object o) {
if ( o == this )
return true;
- if ( !(o instanceof Node_Graph) )
+ if ( !(o instanceof Node_Graph other) )
return false;
- Node_Graph other = (Node_Graph)o;
return this.getGraph() == other.getGraph();
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
index 202254f63b..61fdaa58da 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
@@ -120,11 +120,8 @@ public class Node_Literal extends Node
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
+ if ( !( obj instanceof Node_Literal other ) )
return false;
- if ( getClass() != obj.getClass() )
- return false;
- Node_Literal other = (Node_Literal)obj;
return label.equals(other.label);
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
index 864bafe36b..77c81b067a 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
@@ -68,11 +68,8 @@ public class Node_Triple extends Node {
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
+ if ( !( obj instanceof Node_Triple other ) )
return false;
- if ( getClass() != obj.getClass() )
- return false;
- Node_Triple other = (Node_Triple)obj;
return triple.equals(other.triple);
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
index dbf1f5b11b..ce6626ceee 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
@@ -98,11 +98,8 @@ public class Node_URI extends Node
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
+ if ( !( obj instanceof Node_URI other ) )
return false;
- if ( getClass() != obj.getClass() )
- return false;
- Node_URI other = (Node_URI)obj;
return uriStr.equals(other.uriStr);
}
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
b/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
index efa7211add..12cc7cbda9 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
@@ -66,12 +66,9 @@ public class Node_Variable extends Node
public boolean equals(Object obj) {
if ( this == obj )
return true;
- if ( obj == null )
- return false;
// For jena-arq Var
- if ( ! (obj instanceof Node_Variable) )
+ if ( ! (obj instanceof Node_Variable other) )
return false;
- Node_Variable other = (Node_Variable)obj;
return Objects.equals(varName, other.varName);
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Triple.java
b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
index 3242aef877..2ebd08f37a 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
@@ -156,7 +156,7 @@ public class Triple implements Serializable
*/
@Override
public boolean equals(Object o)
- { return o instanceof Triple && ((Triple) o).sameAs( subj, pred, obj );
}
+ { return o instanceof Triple t && t.sameAs( subj, pred, obj ); }
/**
Answer true iff this triple has subject s, predicate p, and object o.
