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 ec70d2994c63657c4d77870a6f0b49dbe35c696c Author: Andy Seaborne <[email protected]> AuthorDate: Sat Nov 15 11:23:56 2025 +0000 Remove deprecated classes, methods and constants (jena-querybuilder) --- .../apache/jena/arq/querybuilder/AskBuilder.java | 9 -- .../jena/arq/querybuilder/ConstructBuilder.java | 15 +--- .../jena/arq/querybuilder/DescribeBuilder.java | 13 +-- .../apache/jena/arq/querybuilder/ExprFactory.java | 2 +- .../jena/arq/querybuilder/SelectBuilder.java | 14 +--- .../apache/jena/arq/querybuilder/WhereBuilder.java | 10 +-- .../jena/arq/querybuilder/clauses/WhereClause.java | 27 +----- .../updatebuilder/WhereQuadHolder.java | 33 -------- .../jena/arq/querybuilder/AskBuilderTest.java | 42 +--------- .../arq/querybuilder/ConstructBuilderTest.java | 41 +-------- .../jena/arq/querybuilder/SelectBuilderTest.java | 48 ++--------- .../querybuilder/handlers/WhereHandlerTest.java | 98 +++------------------- 12 files changed, 35 insertions(+), 317 deletions(-) diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java index ae1e9aa043..b71c4b72ec 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java @@ -367,15 +367,6 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> return handlerBlock.getModifierHandler(); } - /* - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") - @Override - public Node list(Object... objs) { - return getWhereHandler().list(objs); - } - @Override public AskBuilder addMinus(AbstractQueryBuilder<?> t) { getWhereHandler().addMinus(t); diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java index 3012378b78..4e538a9371 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java @@ -204,7 +204,7 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> imp getWhereHandler().addWhere(collection); return this; } - + @Override public ConstructBuilder addWhere(Triple t) { getWhereHandler().addWhere(new TriplePath(t)); @@ -280,7 +280,7 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> imp getWhereHandler().addOptional(collection); return this; } - + @Override public ConstructBuilder addOptional(Triple t) { return addOptional(new TriplePath(t)); @@ -355,7 +355,7 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> imp getWhereHandler().addGraph(makeNode(graph), Arrays.asList(triplePath)); return this; } - + @Override public ConstructBuilder addGraph(Object graph, Collection<TriplePath> collection) { getWhereHandler().addGraph(makeNode(graph), collection); @@ -390,15 +390,6 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> imp return addConstruct(Triple.create(makeNode(s), makeNode(p), makeNode(o))); } - /* - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") - @Override - public Node list(Object... objs) { - return getWhereHandler().list(objs); - } - @Override public ConstructBuilder addMinus(AbstractQueryBuilder<?> t) { getWhereHandler().addMinus(t); diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java index c9ee5abfad..3edab55333 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/DescribeBuilder.java @@ -198,7 +198,7 @@ public class DescribeBuilder extends AbstractQueryBuilder<DescribeBuilder> imple getWhereHandler().addWhere(t); return this; } - + @Override public DescribeBuilder addWhere(Collection<TriplePath> collection) { @@ -351,7 +351,7 @@ public class DescribeBuilder extends AbstractQueryBuilder<DescribeBuilder> imple getWhereHandler().addGraph(makeNode(graph), Arrays.asList(triplePath)); return this; } - + @Override public DescribeBuilder addGraph(Object graph, Collection<TriplePath> collection) { getWhereHandler().addGraph(makeNode(graph), collection); @@ -370,15 +370,6 @@ public class DescribeBuilder extends AbstractQueryBuilder<DescribeBuilder> imple return this; } - /* - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") - @Override - public Node list(Object... objs) { - return getWhereHandler().list(objs); - } - @Override public DescribeBuilder addMinus(AbstractQueryBuilder<?> t) { getWhereHandler().addMinus(t); diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java index 99de3c3454..7a4d092055 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ExprFactory.java @@ -1096,7 +1096,7 @@ public class ExprFactory { * Converts expr to an Expr object via expr() * * @see #asExpr(Object) - * @see org.apache.jena.sparql.expr.E_Conditional + * @see org.apache.jena.sparql.expr.E_If * * @param condition the condition to check. * @param thenExpr the expression to execute if condition is true. diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java index d3f162d404..5d71409eb6 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java @@ -296,8 +296,8 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder> implement getWhereHandler().addWhere(collection); return this; } - - + + @Override public SelectBuilder addWhere(Triple t) { @@ -455,7 +455,7 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder> implement getWhereHandler().addGraph(makeNode(graph), collection); return this; } - + @Override public SelectBuilder addBind(Expr expression, Object var) { getWhereHandler().addBind(expression, Converters.makeVar(var)); @@ -473,14 +473,6 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder> implement return handlerBlock.getSelectHandler(); } - /* - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") @Override - public Node list(Object... objs) { - return getWhereHandler().list(objs); - } - @Override public SelectBuilder addMinus(AbstractQueryBuilder<?> t) { getWhereHandler().addMinus(t); diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java index 3b05fa7aaa..62aeb43288 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/WhereBuilder.java @@ -223,7 +223,7 @@ public class WhereBuilder extends AbstractQueryBuilder<WhereBuilder> implements getWhereHandler().addGraph(makeNode(graph), collection); return this; } - + @Override public WhereBuilder addBind(Expr expression, Object var) { getWhereHandler().addBind(expression, Converters.makeVar(var)); @@ -236,14 +236,6 @@ public class WhereBuilder extends AbstractQueryBuilder<WhereBuilder> implements return this; } - /* - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") @Override - public Node list(Object... objs) { - return getWhereHandler().list(objs); - } - @Override public WhereBuilder addMinus(AbstractQueryBuilder<?> t) { getWhereHandler().addMinus(t); diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java index 1c5dcf914e..e9fc6c45f3 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/WhereClause.java @@ -55,7 +55,7 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> { * @return This Builder for chaining. */ public T addWhere(TriplePath t); - + /** * Adds a collections of triple paths to the where clause. * @@ -236,7 +236,7 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> { * @return This Builder for chaining. */ public T addOptional(TriplePath t); - + /** * Adds a collection of triple paths as the optional clauses. * @@ -374,7 +374,7 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> { * @return This builder for chaining. */ public T addGraph(Object graph, TriplePath triplePath); - + /** * Adds a collection of triple paths as the optional clauses. * @@ -411,27 +411,6 @@ public interface WhereClause<T extends AbstractQueryBuilder<T>> { */ public WhereHandler getWhereHandler(); - /** - * Create a list node from a list of objects as per RDF Collections. - * - * http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#collections - * - * See {@link AbstractQueryBuilder#makeNode} for conversion of the param values. - * <p> - * usage: - * <ul> - * <li>list( param1, param2, param3, ... )</li> - * <li>addWhere( list( param1, param2, param3, ... ), p, o )</li> - * <li>addOptional( list( param1, param2, param3, ... ), p, o )</li> - * </ul> - * - * @param objs the list of objects for the list. - * @return the first blank node in the list. - * @deprecated use {@code addWhere(Converters.makeCollection(List.of(Object...)))}, or simply call {@link #addWhere(Object, Object, Object)} passing the collection for one of the objects. - */ - @Deprecated(since="5.0.0") - public Node list(Object... objs); - /** * Add a minus clause to the query. * diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java index 98cf1c9c39..a01a949e61 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java @@ -24,14 +24,11 @@ import java.util.Map; import java.util.function.Predicate; import org.apache.jena.arq.querybuilder.AbstractQueryBuilder; -import org.apache.jena.arq.querybuilder.Converters; import org.apache.jena.arq.querybuilder.clauses.SelectClause; import org.apache.jena.arq.querybuilder.handlers.WhereHandler; import org.apache.jena.arq.querybuilder.rewriters.BuildElementVisitor; import org.apache.jena.arq.querybuilder.rewriters.ElementRewriter; import org.apache.jena.graph.Node; -import org.apache.jena.graph.NodeFactory; -import org.apache.jena.graph.Triple; import org.apache.jena.query.Query; import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.core.TriplePath; @@ -41,7 +38,6 @@ import org.apache.jena.sparql.syntax.*; import org.apache.jena.sparql.util.ExprUtils; import org.apache.jena.util.iterator.ExtendedIterator; import org.apache.jena.util.iterator.NiceIterator; -import org.apache.jena.vocabulary.RDF; /** * The where processor. Generally handles update where clause. @@ -395,35 +391,6 @@ public class WhereQuadHolder implements QuadHolder { return this; } - /** - * Create a list node from a list of objects as per RDF Collections. - * - * http://www.w3.org/TR/2013/REC-sparql11-query-20130321/#collections - * - * @param objs the list of objects for the list. - * @return the first blank node in the list. - * @deprecated use {@code Converters.makeCollection(List.of(Object...))} - */ - @Deprecated(since="5.0.0") - public Node list(Object... objs) { - Node retval = NodeFactory.createBlankNode(); - Node lastObject = retval; - for (int i = 0; i < objs.length; i++) { - Node n = Converters.makeNode(objs[i], prefixHandler.getPrefixes()); - addWhere(new TriplePath(Triple.create(lastObject, RDF.first.asNode(), n))); - if (i + 1 < objs.length) { - Node nextObject = NodeFactory.createBlankNode(); - addWhere(new TriplePath(Triple.create(lastObject, RDF.rest.asNode(), nextObject))); - lastObject = nextObject; - } else { - addWhere(new TriplePath(Triple.create(lastObject, RDF.rest.asNode(), RDF.nil.asNode()))); - } - - } - - return retval; - } - /** * Add a minus operation to the where clause. The prefixes will be updated with * the prefixes from the abstract query builder. diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java index de5bf8840e..9081d9d7d3 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java @@ -21,18 +21,12 @@ package org.apache.jena.arq.querybuilder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.apache.jena.arq.AbstractRegexpBasedTest; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.NodeFactory; -import org.apache.jena.graph.Triple; -import org.apache.jena.query.Query; -import org.apache.jena.sparql.core.TriplePath; -import org.apache.jena.sparql.core.Var; -import org.apache.jena.sparql.syntax.ElementPathBlock; -import org.apache.jena.vocabulary.RDF; import org.junit.Before; import org.junit.Test; +import org.apache.jena.arq.AbstractRegexpBasedTest; +import org.apache.jena.vocabulary.RDF; + public class AskBuilderTest extends AbstractRegexpBasedTest { private AskBuilder builder; @@ -99,36 +93,6 @@ public class AskBuilderTest extends AbstractRegexpBasedTest { query); } - @SuppressWarnings("deprecation") - @Test - public void testList() { - builder.addWhere(builder.list("<one>", "?two", "'three'"), "<foo>", "<bar>"); - Query query = builder.build(); - - Node one = NodeFactory.createURI("one"); - Node two = Var.alloc("two"); - Node three = NodeFactory.createLiteralString("three"); - Node foo = NodeFactory.createURI("foo"); - Node bar = NodeFactory.createURI("bar"); - - ElementPathBlock epb = new ElementPathBlock(); - Node firstObject = NodeFactory.createBlankNode(); - Node secondObject = NodeFactory.createBlankNode(); - Node thirdObject = NodeFactory.createBlankNode(); - - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.first.asNode(), one))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.rest.asNode(), secondObject))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.first.asNode(), two))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.rest.asNode(), thirdObject))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.first.asNode(), three))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.rest.asNode(), RDF.nil.asNode()))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, foo, bar))); - - WhereValidator visitor = new WhereValidator(epb); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - } - @Test public void testClone() { builder.addWhere("?two", "<foo>", "<bar>"); diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java index cd90b0ac56..2fe52bc82c 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java @@ -21,17 +21,12 @@ package org.apache.jena.arq.querybuilder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + import org.apache.jena.arq.AbstractRegexpBasedTest; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.NodeFactory; import org.apache.jena.graph.Triple; -import org.apache.jena.query.Query; -import org.apache.jena.sparql.core.TriplePath; -import org.apache.jena.sparql.core.Var; -import org.apache.jena.sparql.syntax.ElementPathBlock; import org.apache.jena.vocabulary.RDF; -import org.junit.Before; -import org.junit.Test; public class ConstructBuilderTest extends AbstractRegexpBasedTest { @@ -102,36 +97,6 @@ public class ConstructBuilderTest extends AbstractRegexpBasedTest { query); } - @SuppressWarnings("deprecation") - @Test - public void testList() { - builder.addWhere(builder.list("<one>", "?two", "'three'"), "<foo>", "<bar>"); - Query query = builder.build(); - - Node one = NodeFactory.createURI("one"); - Node two = Var.alloc("two"); - Node three = NodeFactory.createLiteralString("three"); - Node foo = NodeFactory.createURI("foo"); - Node bar = NodeFactory.createURI("bar"); - - ElementPathBlock epb = new ElementPathBlock(); - Node firstObject = NodeFactory.createBlankNode(); - Node secondObject = NodeFactory.createBlankNode(); - Node thirdObject = NodeFactory.createBlankNode(); - - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.first.asNode(), one))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.rest.asNode(), secondObject))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.first.asNode(), two))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.rest.asNode(), thirdObject))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.first.asNode(), three))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.rest.asNode(), RDF.nil.asNode()))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, foo, bar))); - - WhereValidator visitor = new WhereValidator(epb); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - } - @Test public void testClone() { builder.addWhere("?two", "<foo>", "<bar>"); diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java index 2110f9537c..c7859c9211 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java @@ -22,25 +22,17 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + import org.apache.jena.arq.AbstractRegexpBasedTest; -import org.apache.jena.graph.Node; -import org.apache.jena.graph.NodeFactory; -import org.apache.jena.graph.Triple; -import org.apache.jena.query.Query; -import org.apache.jena.query.QueryExecution; -import org.apache.jena.query.QueryExecutionFactory; -import org.apache.jena.query.QuerySolution; -import org.apache.jena.query.ResultSet; +import org.apache.jena.query.*; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.Resource; -import org.apache.jena.sparql.core.TriplePath; import org.apache.jena.sparql.core.Var; -import org.apache.jena.sparql.syntax.ElementPathBlock; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.XSD; -import org.junit.Before; -import org.junit.Test; public class SelectBuilderTest extends AbstractRegexpBasedTest { @@ -54,7 +46,7 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest { @Test public void testSelectAsterisk() { builder.addVar("*").addWhere("?s", "?p", "?o"); - + assertContainsRegex(SELECT + "\\*" + SPACE + WHERE + OPEN_CURLY + var("s") + SPACE + var("p") + SPACE + var("o") + OPT_SPACE + CLOSE_CURLY, builder.buildString()); @@ -129,36 +121,6 @@ public class SelectBuilderTest extends AbstractRegexpBasedTest { assertTrue( q.isQueryResultStar() ); } - @SuppressWarnings("deprecation") - @Test - public void testList() { - builder.addVar("*").addWhere(builder.list("<one>", "?two", "'three'"), "<foo>", "<bar>"); - Query query = builder.build(); - - Node one = NodeFactory.createURI("one"); - Node two = Var.alloc("two"); - Node three = NodeFactory.createLiteralString("three"); - Node foo = NodeFactory.createURI("foo"); - Node bar = NodeFactory.createURI("bar"); - - ElementPathBlock epb = new ElementPathBlock(); - Node firstObject = NodeFactory.createBlankNode(); - Node secondObject = NodeFactory.createBlankNode(); - Node thirdObject = NodeFactory.createBlankNode(); - - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.first.asNode(), one))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.rest.asNode(), secondObject))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.first.asNode(), two))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.rest.asNode(), thirdObject))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.first.asNode(), three))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.rest.asNode(), RDF.nil.asNode()))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, foo, bar))); - - WhereValidator visitor = new WhereValidator(epb); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - } - @Test public void testClone() { builder.addVar("*").addWhere("?two", "<foo>", "<bar>"); diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java index d962eb67a4..1aa766f923 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java @@ -24,6 +24,9 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import java.util.*; +import org.junit.Before; +import org.junit.Test; + import org.apache.jena.arq.querybuilder.*; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; @@ -42,13 +45,10 @@ import org.apache.jena.sparql.expr.E_Function; import org.apache.jena.sparql.expr.E_LessThan; import org.apache.jena.sparql.expr.E_Random; import org.apache.jena.sparql.expr.aggregate.AggCount; -import org.apache.jena.sparql.path.P_Link; import org.apache.jena.sparql.path.Path; import org.apache.jena.sparql.path.PathParser; import org.apache.jena.sparql.syntax.*; import org.apache.jena.vocabulary.RDF; -import org.junit.Before; -import org.junit.Test; public class WhereHandlerTest extends AbstractHandlerTest { @@ -161,20 +161,20 @@ public class WhereHandlerTest extends AbstractHandlerTest { assertTrue(wv.matching); } - + @Test public void testAddWhereCollection() { PrefixMapping pmap = new PrefixMappingImpl(); pmap.setNsPrefix("ts", "urn:test:"); Path path = PathParser.parse("ts:two/ts:dos", pmap); - + TriplePath[] expected = { new TriplePath(Triple.create(Node.ANY, RDF.first.asNode(), Node.ANY)), new TriplePath(Triple.create(NodeFactory.createURI("one"), ResourceFactory.createResource("two").asNode(), ResourceFactory.createLangLiteral("three", "en-US").asNode())), new TriplePath(NodeFactory.createURI("one"), path, ResourceFactory.createLangLiteral("three", "en-US").asNode()) }; - + handler.addWhere(Arrays.asList(expected)); handler.build(); @@ -208,10 +208,10 @@ public class WhereHandlerTest extends AbstractHandlerTest { NodeFactory.createURI("three"))), new TriplePath(Triple.create(Node.ANY, RDF.first.asNode(), Node.ANY)) }; - + handler.addOptional(Arrays.asList(expected)); handler.build(); - + ElementPathBlock epb = new ElementPathBlock(); Arrays.stream(expected).forEach(epb::addTriple); ElementOptional opt = new ElementOptional(epb); @@ -251,7 +251,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { @Test public void testAddOptionalObjects() { - + handler.addOptional(Arrays.asList( new TriplePath(Triple.create(NodeFactory.createURI("one"), ResourceFactory.createResource("two").asNode(), ResourceFactory.createLangLiteral("three", "en-US").asNode())))); @@ -574,7 +574,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { handler.getQueryPattern().visit(visitor); assertTrue(visitor.matching); } - + @Test public void testAddGraphTriplePaths() { @@ -583,7 +583,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { NodeFactory.createURI("three"))), new TriplePath(Triple.create(NodeFactory.createURI("four"), NodeFactory.createURI("five"), NodeFactory.createURI("six"))) }; - + handler.addGraph(NodeFactory.createURI("graph"), Arrays.asList(expected)); handler.build(); @@ -779,82 +779,6 @@ public class WhereHandlerTest extends AbstractHandlerTest { assertTrue(visitor.matching); } - @SuppressWarnings("deprecation") - @Test - public void testList() { - Node n = handler.list("<one>", "?var", "'three'"); - - Node one = NodeFactory.createURI("one"); - Node two = Var.alloc("var"); - Node three = NodeFactory.createLiteralString("three"); - - ElementPathBlock epb = new ElementPathBlock(); - Node firstObject = NodeFactory.createBlankNode(); - Node secondObject = NodeFactory.createBlankNode(); - Node thirdObject = NodeFactory.createBlankNode(); - - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.first.asNode(), one))); - epb.addTriplePath(new TriplePath(Triple.create(firstObject, RDF.rest.asNode(), secondObject))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.first.asNode(), two))); - epb.addTriplePath(new TriplePath(Triple.create(secondObject, RDF.rest.asNode(), thirdObject))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.first.asNode(), three))); - epb.addTriplePath(new TriplePath(Triple.create(thirdObject, RDF.rest.asNode(), RDF.nil.asNode()))); - - WhereValidator visitor = new WhereValidator(epb); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - - assertTrue(n.isBlank()); - } - - @SuppressWarnings("deprecation") - @Test - public void testListInTriple() { - handler.addWhere(new TriplePath(Triple.create(handler.list("<one>", "?var", "'three'"), - ResourceFactory.createResource("foo").asNode(), ResourceFactory.createResource("bar").asNode()))); - handler.build(); - - P_Link first = new P_Link(RDF.first.asNode()); - P_Link rest = new P_Link(RDF.rest.asNode()); - Node n = NodeFactory.createURI("foo"); - P_Link foo = new P_Link(n); - // ElementPathBlock epb = (ElementPathBlock) query.getQueryPattern(); - ElementPathBlock epb = new ElementPathBlock(); - Node list = NodeFactory.createBlankNode(); - Node s = list; - epb.addTriple(new TriplePath(s, first, NodeFactory.createURI("one"))); - Node o = NodeFactory.createBlankNode(); - epb.addTriple(new TriplePath(s, rest, o)); - s = o; - epb.addTriple(new TriplePath(s, first, Var.alloc("var"))); - o = NodeFactory.createBlankNode(); - epb.addTriple(new TriplePath(s, rest, o)); - s = o; - epb.addTriple(new TriplePath(s, first, NodeFactory.createLiteralString("three"))); - epb.addTriple(new TriplePath(s, rest, RDF.nil.asNode())); - epb.addTriple(new TriplePath(list, foo, NodeFactory.createURI("bar"))); - - WhereValidator visitor = new WhereValidator(epb); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - } - - @Test - public void testAddMinus() { - SelectBuilder sb = new SelectBuilder(); - sb.addPrefix("pfx", "uri").addWhere("<one>", "<two>", "three"); - handler.addMinus(sb); - handler.build(); - - ElementPathBlock epb = new ElementPathBlock(); - ElementMinus minus = new ElementMinus(epb); - epb.addTriplePath(new TriplePath(Triple.create(NodeFactory.createURI("one"), NodeFactory.createURI("two"), - NodeFactory.createLiteralString("three")))); - WhereValidator visitor = new WhereValidator(minus); - query.getQueryPattern().visit(visitor); - assertTrue(visitor.matching); - } - @Test public void testAddValueVar_pfx_obj() { handler.addValueVar(query.getPrefixMapping(), "?v");
