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 be389ba4dc0c3c6f4339e9f4753b52613ff32318 Author: Andy Seaborne <[email protected]> AuthorDate: Sat May 10 14:21:26 2025 +0100 Deprecate for removal: functions in ModelUtils --- .../org/apache/jena/sparql/util/ModelUtils.java | 24 +++++++--- .../java/org/apache/jena/sparql/api/TestAPI.java | 53 +++++++++++----------- 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java index 920c7d7eb9..e683883271 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java @@ -73,6 +73,10 @@ public class ModelUtils return convertGraphNodeToRDFNode(node, null); } + /** + * @deprecated Use {@link Model#asStatement(Triple)}. + */ + @Deprecated(forRemoval = true) public static Statement tripleToStatement(Model model, Triple t) { if ( model == null ) throw new ARQInternalErrorException("Attempt to create statement with null model"); @@ -81,7 +85,7 @@ public class ModelUtils Node pNode = t.getPredicate(); Node oNode = t.getObject(); - if (!isValidAsStatement(sNode, pNode, oNode)) return null; + if (!NodeUtils.isValidAsRDF(sNode, pNode, oNode)) return null; return model.asStatement(t); } @@ -99,11 +103,15 @@ public class ModelUtils * * @deprecated Use {@link NodeUtils#isValidAsRDF(Node, Node, Node)}. */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean isValidAsStatement(Node s, Node p, Node o) { return NodeUtils.isValidAsRDF(s, p, o); } + /** + * @deprecated Use {@link NodeUtils#isValidAsRDF(Node, Node, Node)}. + */ + @Deprecated(forRemoval = true) public static StmtIterator triplesToStatements(final Iterator<Triple> it, final Model refModel) { return new StmtIteratorImpl(Iter.map(it, refModel::asStatement)) { // Make sure to close the incoming iterator @@ -118,15 +126,19 @@ public class ModelUtils }; } + /** @deprecated To be removed. */ + @Deprecated(forRemoval = true) public static ModelCollector intersectCollector() { return new ModelCollector.IntersectionModelCollector(); } + /** @deprecated To be removed. */ + @Deprecated(forRemoval = true) public static ModelCollector unionCollector() { return new ModelCollector.UnionModelCollector(); } - - public static Iterator<Triple> statementsToTriples(final Iterator<Statement> it) { - return Iter.onClose(Iter.map(it, Statement::asTriple), ()->Iter.close(it)); - } +// +// public static Iterator<Triple> statementsToTriples(final Iterator<Statement> it) { +// return Iter.onClose(Iter.map(it, Statement::asTriple), ()->Iter.close(it)); +// } } diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java index a6be4ee47c..d2abc48462 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java @@ -52,7 +52,6 @@ import org.apache.jena.sparql.core.DatasetGraphFactory; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.graph.GraphFactory; import org.apache.jena.sparql.util.IsoMatcher; -import org.apache.jena.sparql.util.ModelUtils; import org.apache.jena.vocabulary.OWL; import org.apache.jena.vocabulary.RDF; import org.junit.Test; @@ -394,11 +393,11 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Triple> ts = qExec.execConstructTriples(); + Iterator<Triple> iterTriples = qExec.execConstructTriples(); Model result = ModelFactory.createDefaultModel(); - while (ts.hasNext()) { - Triple t = ts.next(); - Statement stmt = ModelUtils.tripleToStatement(result, t); + while (iterTriples.hasNext()) { + Triple triple = iterTriples.next(); + Statement stmt = result.asStatement(triple); if ( stmt != null ) result.add(stmt); } @@ -413,13 +412,13 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Quad> ts = qExec.execConstructQuads(); + Iterator<Quad> iterQuads = qExec.execConstructQuads(); DatasetGraph result = DatasetGraphFactory.create(); long count = 0; - while (ts.hasNext()) { + while (iterQuads.hasNext()) { count++; - Quad qd = ts.next(); - result.add(qd); + Quad quad = iterQuads.next(); + result.add(quad); } DatasetGraph expected = DatasetGraphFactory.create(); @@ -437,12 +436,12 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Quad> ts = qExec.execConstructQuads(); + Iterator<Quad> iterQuads = qExec.execConstructQuads(); DatasetGraph result = DatasetGraphFactory.create(); long count = 0; - while (ts.hasNext()) { + while (iterQuads.hasNext()) { count++; - result.add( ts.next() ); + result.add( iterQuads.next() ); } DatasetGraph expected = DatasetGraphFactory.create(); expected.add(Quad.defaultGraphNodeGenerated, s.asNode(), p.asNode(), o.asNode()); @@ -456,11 +455,11 @@ public class TestAPI String queryString = "CONSTRUCT { ?s ?p ?o GRAPH ?g1 { ?s1 ?p1 ?o1 } } WHERE { ?s ?p ?o. GRAPH ?g1 { ?s1 ?p1 ?o1 } }"; Query q = QueryFactory.create(queryString, Syntax.syntaxARQ); QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Triple> ts = qExec.execConstructTriples(); + Iterator<Triple> iterTriples = qExec.execConstructTriples(); Model result = ModelFactory.createDefaultModel(); - while (ts.hasNext()) { - Triple t = ts.next(); - Statement stmt = ModelUtils.tripleToStatement(result, t); + while (iterTriples.hasNext()) { + Triple triple = iterTriples.next(); + Statement stmt = result.asStatement(triple); if ( stmt != null ) result.add(stmt); } @@ -488,13 +487,13 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Quad> ts = qExec.execConstructQuads(); + Iterator<Quad> iterQuads = qExec.execConstructQuads(); long count = 0; Quad expected = Quad.create( g1.asNode(), s.asNode(), p.asNode(), o.asNode()); - while (ts.hasNext()) { + while (iterQuads.hasNext()) { count++; - Quad qd = ts.next(); - assertEquals(expected, qd); + Quad quad = iterQuads.next(); + assertEquals(expected, quad); } assertEquals(3, count); // 3 duplicated quads } @@ -521,13 +520,13 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Quad> ts = qExec.execConstructQuads(); + Iterator<Quad> iterQuads = qExec.execConstructQuads(); long count = 0; Quad expected = Quad.create( g1.asNode(), s.asNode(), p.asNode(), o.asNode()); - while (ts.hasNext()) { + while (iterQuads.hasNext()) { count++; - Quad qd = ts.next(); - assertEquals(expected, qd); + Quad quad = iterQuads.next(); + assertEquals(expected, quad); } assertEquals(6, count); // 6 duplicated quads } @@ -539,12 +538,12 @@ public class TestAPI QueryExecution qExec = QueryExecutionFactory.create(q, d); - Iterator<Quad> quads = qExec.execConstructQuads(); + Iterator<Quad> iterQuads = qExec.execConstructQuads(); DatasetGraph result = DatasetGraphFactory.create(); long count = 0; - while (quads.hasNext()) { + while (iterQuads.hasNext()) { count++; - Quad qd = quads.next(); + Quad qd = iterQuads.next(); result.add(qd); }
