This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit ccf793da50eb04c4f538c7231324e08b203a533b Author: Andy Seaborne <[email protected]> AuthorDate: Tue Jul 8 12:48:47 2025 +0100 Align naming of IsoAlgRows and IsoAlgTuples --- .../jena/sparql/resultset/ResultsCompare.java | 6 +-- .../apache/jena/sparql/util/iso/IsoAlgRows.java | 4 +- .../apache/jena/sparql/util/iso/IsoAlgTuple.java | 56 ---------------------- 3 files changed, 5 insertions(+), 61 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java index f5e7726548..6810406f78 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultsCompare.java @@ -59,7 +59,7 @@ public class ResultsCompare { /** See {@link #equalsByValue(ResultSet, ResultSet)} */ public static boolean equalsByValue(RowSet rs1, RowSet rs2) { - return IsoAlgRows.isIsomorphic(rs1, rs2, BNodeIso.Match.BNODES_VALUE); + return IsoAlgRows.isomorphic(rs1, rs2, BNodeIso.Match.BNODES_VALUE); } /** @@ -90,12 +90,12 @@ public class ResultsCompare { * @return true if they are equivalent */ public static boolean equalsByTerm(RowSet rs1, RowSet rs2) { - return IsoAlgRows.isIsomorphic(rs1, rs2, BNodeIso.Match.BNODES_TERM); + return IsoAlgRows.isomorphic(rs1, rs2, BNodeIso.Match.BNODES_TERM); } /** Compare two list - unordered */ public static boolean equalsByTerm(List<Binding> list1, List<Binding> list2) { - return IsoAlgRows.isIsomorphic(list1, list2, BNodeIso.Match.BNODES_TERM); + return IsoAlgRows.isomorphic(list1, list2, BNodeIso.Match.BNODES_TERM); } /** diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java index 220de7a008..2d5ef1933c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgRows.java @@ -48,7 +48,7 @@ public class IsoAlgRows { return iout; } - public static boolean isIsomorphic(RowSet rowset1, RowSet rowset2, BNodeIso.Match matching) { + public static boolean isomorphic(RowSet rowset1, RowSet rowset2, BNodeIso.Match matching) { Objects.requireNonNull(rowset1); Objects.requireNonNull(rowset2); if ( rowset1 == rowset2 ) @@ -66,7 +66,7 @@ public class IsoAlgRows { return matcher(rows1, rows2, matching); } - public static boolean isIsomorphic(List<Binding> list1, List<Binding> list2, BNodeIso.Match matching) { + public static boolean isomorphic(List<Binding> list1, List<Binding> list2, BNodeIso.Match matching) { if ( list1.size() != list2.size() ) return false; return matcher(list1, list2, matching); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java index 42a5f709ab..97cec4c06d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/iso/IsoAlgTuple.java @@ -41,62 +41,6 @@ import org.apache.jena.sparql.util.NodeUtils; */ public class IsoAlgTuple { -// /** Record the IsoMapping of a node. This is a one-way linked list. */ -// private static class IsoMapping { -// final Node node1; -// final Node node2; -// final IsoMapping parent; -// -// static final IsoMapping rootIsoMapping = new Mapping(null, null, null); -// -// Mapping(IsoMapping parent, Node node1, Node node2) { -// super(); -// this.parent = parent; -// this.node1 = node1; -// this.node2 = node2; -// } -// -// boolean mapped(Node node) { -// return map(node) != null; -// } -// -// Node map(Node node) { -// IsoMapping IsoMapping = this; -// while (IsoMapping != rootMapping) { -// if ( mapping.node1.equals(node) ) -// return mapping.node2; -// IsoMapping = mapping.parent; -// } -// return null; -// } -// -// boolean reverseMapped(Node node) { -// return reverseMap(node) != null; -// } -// -// Node reverseMap(Node node) { -// IsoMapping IsoMapping = this; -// while (IsoMapping != rootMapping) { -// if ( mapping.node2.equals(node) ) -// return mapping.node1; -// IsoMapping = mapping.parent; -// } -// return null; -// } -// -// @Override -// public String toString() { -// StringBuilder sbuff = new StringBuilder(); -// IsoMapping IsoMapping = this; -// while (IsoMapping != rootMapping) { -// sbuff.append("{" + mapping.node1 + " => " + mapping.node2 + "}"); -// IsoMapping = mapping.parent; -// } -// sbuff.append("{}"); -// return sbuff.toString(); -// } -// } - private record Possibility(Tuple<Node> tuple, IsoMapping mapping) { @Override public String toString() {
