You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2016/03/08 21:57:43 UTC
[1/5] jena git commit: Fixes for JENA-1153.
Repository: jena
Updated Branches:
refs/heads/master b8540b431 -> 84f3b6734
Fixes for JENA-1153.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/581d2892
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/581d2892
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/581d2892
Branch: refs/heads/master
Commit: 581d2892d699e6127559fca94dd37f2fc4439df4
Parents: b8540b4
Author: Claude Warren <cl...@apache.org>
Authored: Tue Mar 8 19:52:50 2016 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Mar 8 19:52:50 2016 +0000
----------------------------------------------------------------------
.../arq/querybuilder/AbstractQueryBuilder.java | 38 ++++++
.../jena/arq/querybuilder/AskBuilder.java | 29 ++++-
.../jena/arq/querybuilder/ConstructBuilder.java | 29 ++++-
.../org/apache/jena/arq/querybuilder/Order.java | 8 ++
.../jena/arq/querybuilder/SelectBuilder.java | 28 +++-
.../clauses/SolutionModifierClause.java | 50 +++++++-
.../handlers/SolutionModifierHandler.java | 55 ++------
.../clauses/SolutionModifierTest.java | 127 +++++++++++++------
.../handlers/SolutionModifierHandlerTest.java | 8 +-
9 files changed, 279 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
index 0da573f..59f4bf2 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java
@@ -27,14 +27,17 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryParseException;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.riot.RiotException;
import org.apache.jena.riot.system.PrefixMapFactory;
import org.apache.jena.shared.PrefixMapping;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.expr.ExprVar ;
import org.apache.jena.sparql.syntax.ElementGroup;
+import org.apache.jena.sparql.util.ExprUtils;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
/**
@@ -74,6 +77,41 @@ public abstract class AbstractQueryBuilder<T extends AbstractQueryBuilder<T>>
}
/**
+ * A convenience method to make an expression from a string. Evaluates the
+ * expression with respect to the current query.
+ *
+ * @param expression The expression to parse.
+ * @return the Expr object.
+ * @throws QueryParseExcpetion on error.
+ */
+ public Expr makeExpr(String expression) throws QueryParseException
+ {
+ return ExprUtils.parse(query, expression, true);
+ }
+
+ /**
+ * A convenience method to quote a string.
+ * @param q the string to quote.
+ *
+ * Will use single quotes if there are no single quotes in the string or if the
+ * double quote is before the single quote in the string.
+ *
+ * Will use double quote otherwise.
+ *
+ * @return the quoted string.
+ */
+ public String quote(String q) {
+ int qt = q.indexOf('"');
+ int sqt = q.indexOf("'");
+
+ if (sqt == -1 || qt<sqt)
+ {
+ return String.format( "'%s'", q);
+ }
+ return String.format( "\"%s\"", q);
+ }
+
+ /**
* Make a node from an object while using the associated prefix mapping.
* <ul>
* <li>Will return Node.ANY if object is null.</li>
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
----------------------------------------------------------------------
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 9ae7fa2..23965a8 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
@@ -29,6 +29,7 @@ import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
import org.apache.jena.graph.FrontsTriple ;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple ;
+import org.apache.jena.query.SortCondition;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
@@ -177,13 +178,38 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
getWhereHandler().addBind( expression, makeVar(var) );
return this;
}
+
+ @Override
+ public AskBuilder addOrderBy(Expr orderBy) {
+ getSolutionModifierHandler().addOrderBy(orderBy);
+ return this;
+ }
+
+ @Override
+ public AskBuilder addOrderBy(Object orderBy) {
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy));
+ return this;
+ }
+
@Override
- public AskBuilder addOrderBy(String orderBy) {
+ public AskBuilder addOrderBy(SortCondition orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
return this;
}
@Override
+ public AskBuilder addOrderBy(Expr orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(orderBy, order);
+ return this;
+ }
+
+ @Override
+ public AskBuilder addOrderBy(Object orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy), order);
+ return this;
+ }
+
+ @Override
public AskBuilder addGroupBy(String groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
@@ -216,4 +242,5 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
public Node list(Object... objs) {
return getWhereHandler().list(objs);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
----------------------------------------------------------------------
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 64324a4..9db1dae 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
@@ -28,9 +28,11 @@ import org.apache.jena.arq.querybuilder.handlers.DatasetHandler;
import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
+import org.apache.jena.graph.FrontsNode;
import org.apache.jena.graph.FrontsTriple ;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple ;
+import org.apache.jena.query.SortCondition;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
@@ -111,14 +113,38 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
getDatasetHandler().from(graphName);
return this;
}
+
+ @Override
+ public ConstructBuilder addOrderBy(Expr orderBy) {
+ getSolutionModifierHandler().addOrderBy(orderBy);
+ return this;
+ }
+
+ @Override
+ public ConstructBuilder addOrderBy(Object orderBy) {
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy));
+ return this;
+ }
@Override
- public ConstructBuilder addOrderBy(String orderBy) {
+ public ConstructBuilder addOrderBy(SortCondition orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
return this;
}
@Override
+ public ConstructBuilder addOrderBy(Expr orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(orderBy, order);
+ return this;
+ }
+
+ @Override
+ public ConstructBuilder addOrderBy(Object orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy), order);
+ return this;
+ }
+
+ @Override
public ConstructBuilder addGroupBy(String groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
@@ -242,4 +268,5 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
public Node list(Object... objs) {
return getWhereHandler().list(objs);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
new file mode 100644
index 0000000..c72d4de
--- /dev/null
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
@@ -0,0 +1,8 @@
+package org.apache.jena.arq.querybuilder;
+
+/**
+ * The order for the ORDER BY modifiers.
+ */
+public enum Order {
+ ASCENDING, DESCENDING
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
----------------------------------------------------------------------
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 03796e9..5979e07 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
@@ -33,6 +33,7 @@ import org.apache.jena.graph.FrontsNode ;
import org.apache.jena.graph.FrontsTriple ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
+import org.apache.jena.query.SortCondition;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
@@ -144,12 +145,36 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
@Override
- public SelectBuilder addOrderBy(String orderBy) {
+ public SelectBuilder addOrderBy(Expr orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
return this;
}
@Override
+ public SelectBuilder addOrderBy(Object orderBy) {
+ getSolutionModifierHandler().addOrderBy( makeVar(orderBy));
+ return this;
+ }
+
+ @Override
+ public SelectBuilder addOrderBy(SortCondition orderBy) {
+ getSolutionModifierHandler().addOrderBy(orderBy);
+ return this;
+ }
+
+ @Override
+ public SelectBuilder addOrderBy(Expr orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(orderBy, order);
+ return this;
+ }
+
+ @Override
+ public SelectBuilder addOrderBy(Object orderBy, Order order) {
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy), order);
+ return this;
+ }
+
+ @Override
public SelectBuilder addGroupBy(String groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
@@ -313,4 +338,5 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
public Node list(Object... objs) {
return getWhereHandler().list(objs);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
index d38e715..af0b602 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
@@ -18,7 +18,11 @@
package org.apache.jena.arq.querybuilder.clauses;
import org.apache.jena.arq.querybuilder.AbstractQueryBuilder;
+import org.apache.jena.arq.querybuilder.Order;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
+import org.apache.jena.graph.FrontsNode;
+import org.apache.jena.query.SortCondition;
+import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
/**
@@ -29,15 +33,53 @@ import org.apache.jena.sparql.lang.sparql_11.ParseException ;
* The Builder type that the clause is part of.
*/
public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
-
+
+ /**
+ * Add an ascending order by.
+ *
+ * @param orderBy
+ * The expression to order by.
+ * @return The builder for chaining.
+ */
+ public T addOrderBy(Expr orderBy);
+
+ /**
+ * Add an ascending order by.
+ *
+ * @param orderBy
+ * The object to order by.
+ * @return The builder for chaining.
+ */
+ public T addOrderBy(Object orderBy);
+
+ /**
+ * Add an ascending order by.
+ *
+ * @param orderBy
+ * The SortCondition to order by.
+ * @return The builder for chaining.
+ */
+ public T addOrderBy(SortCondition orderBy);
+
+ /**
+ * Add an order by with direction specified.
+ *
+ * @param orderBy
+ * The expression to order by.
+ * @param order The direction to order.
+ * @return The builder for chaining.
+ */
+ public T addOrderBy(Expr orderBy, Order order);
+
/**
- * Add an order by
+ * Add an order by with direction specified.
*
* @param orderBy
- * The variable name to order by.
+ * The object to order by.
+ * @param order The direction to order.
* @return The builder for chaining.
*/
- public T addOrderBy(String orderBy);
+ public T addOrderBy(Object orderBy, Order order);
/**
* Add a group by
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
index c52a2e8..eb0fbbb 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream ;
import java.util.List ;
import java.util.Map ;
+import org.apache.jena.arq.querybuilder.Order;
import org.apache.jena.arq.querybuilder.rewriters.ExprRewriter ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
@@ -38,13 +39,6 @@ import org.apache.jena.sparql.lang.sparql_11.SPARQLParser11 ;
*
*/
public class SolutionModifierHandler implements Handler {
- /**
- * The order for the ORDER BY modifiers.
- */
- public enum Order {
- ASCENDING, DESCENDING
- }
-
// the query to modify
private final Query query;
@@ -74,25 +68,6 @@ public class SolutionModifierHandler implements Handler {
}
/**
- * Add an order by variable.
- * @param varName The variable name.
- */
- public void addOrderBy(String varName) {
- query.addOrderBy(varName, Query.ORDER_DEFAULT);
- }
-
- /**
- * Add an order by variable.
- * @param varName The variable name.
- * @param order The direction for the ordering.
- */
- public void addOrderBy(String varName, Order order) {
- query.addOrderBy(varName,
- order == Order.ASCENDING ? Query.ORDER_ASCENDING
- : Query.ORDER_DESCENDING);
- }
-
- /**
* Add an order by clause
* @param condition The SortCondition to add to the order by.
*/
@@ -114,20 +89,20 @@ public class SolutionModifierHandler implements Handler {
}
/**
- * Add a node to the order by clause.
- * @param node
+ * Add a var to the order by clause.
+ * @param var
*/
- public void addOrderBy(Node node) {
- query.addOrderBy(node, Query.ORDER_DEFAULT);
+ public void addOrderBy(Var var) {
+ query.addOrderBy(var, Query.ORDER_DEFAULT);
}
/**
- * Add a node to add to the order by clause.
- * @param node The node to add
+ * Add a var to the order by clause.
+ * @param var The var to add
* @param order The direction of the ordering.
*/
- public void addOrderBy(Node node, Order order) {
- query.addOrderBy(node, order == Order.ASCENDING ? Query.ORDER_ASCENDING
+ public void addOrderBy(Var var, Order order) {
+ query.addOrderBy(var, order == Order.ASCENDING ? Query.ORDER_ASCENDING
: Query.ORDER_DESCENDING);
}
@@ -151,8 +126,8 @@ public class SolutionModifierHandler implements Handler {
* Add a node to the group by clause.
* @param node The node to add.
*/
- public void addGroupBy(Node node) {
- query.addGroupBy(node);
+ public void addGroupBy(Var var) {
+ query.addGroupBy(var);
}
/**
@@ -178,14 +153,6 @@ public class SolutionModifierHandler implements Handler {
}
/**
- * Add a node to the having clause.
- * @param exprNode The node to add.
- */
- public void addHaving(Node exprNode) {
- query.addHavingCondition(new ExprVar(exprNode));
- }
-
- /**
* Add a variable to the having clause.
* @param var The variable to add.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
index 996e2bf..8e3244b 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
@@ -19,17 +19,19 @@ package org.apache.jena.arq.querybuilder.clauses;
import static org.junit.Assert.assertFalse;
import org.apache.jena.arq.querybuilder.AbstractQueryBuilder;
+import org.apache.jena.arq.querybuilder.Order;
import org.apache.jena.arq.querybuilder.clauses.SolutionModifierClause;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.expr.E_Random;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
import org.junit.After;
import org.xenei.junit.contract.Contract;
import org.xenei.junit.contract.ContractTest;
import org.xenei.junit.contract.IProducer;
@Contract(SolutionModifierClause.class)
-public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends
- AbstractClauseTest {
+public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends AbstractClauseTest {
// the producer we will user
private IProducer<T> producer;
@@ -50,86 +52,137 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends
}
@ContractTest
- public void testAddOrderBy() {
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ public void testAddOrderByString() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy("foo");
assertContainsRegex(ORDER_BY + var("foo"), builder.buildString());
builder = solutionModifier.addOrderBy("bar");
- assertContainsRegex(ORDER_BY + var("foo") + SPACE + var("bar"),
+ assertContainsRegex(ORDER_BY + var("foo") + SPACE + var("bar"), builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddOrderByStringAscending() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy("foo", Order.ASCENDING);
+ assertContainsRegex(ORDER_BY + "ASC" + OPEN_PAREN + var("foo") + CLOSE_PAREN, builder.buildString());
+
+ builder = solutionModifier.addOrderBy("bar");
+ assertContainsRegex(ORDER_BY + "ASC" + OPEN_PAREN + var("foo") + CLOSE_PAREN + SPACE + var("bar"),
+ builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddOrderByStringDescending() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy("foo", Order.DESCENDING);
+ assertContainsRegex(ORDER_BY + "DESC" + OPEN_PAREN + var("foo") + CLOSE_PAREN, builder.buildString());
+
+ builder = solutionModifier.addOrderBy("bar");
+ assertContainsRegex(ORDER_BY + "DESC" + OPEN_PAREN + var("foo") + CLOSE_PAREN + SPACE + var("bar"),
+ builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddOrderByExpr() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ Expr e = new E_Random();
+ AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy(e);
+ assertContainsRegex(ORDER_BY + "rand" + OPEN_PAREN + CLOSE_PAREN, builder.buildString());
+
+ builder = solutionModifier.addOrderBy("bar");
+ assertContainsRegex(ORDER_BY + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + var("bar"), builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddOrderByExprAscending() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ Expr e = new E_Random();
+ AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy(e, Order.ASCENDING);
+ assertContainsRegex(ORDER_BY + "ASC" + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + CLOSE_PAREN,
+ builder.buildString());
+
+ builder = solutionModifier.addOrderBy("bar");
+ assertContainsRegex(
+ ORDER_BY + "ASC" + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + CLOSE_PAREN + SPACE + var("bar"),
+ builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddOrderByExprDescending() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ Expr e = new E_Random();
+ AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy(e, Order.DESCENDING);
+ assertContainsRegex(ORDER_BY + "DESC" + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + CLOSE_PAREN,
+ builder.buildString());
+
+ builder = solutionModifier.addOrderBy("bar");
+ assertContainsRegex(
+ ORDER_BY + "DESC" + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + CLOSE_PAREN + SPACE + var("bar"),
builder.buildString());
}
@ContractTest
public void testAddGroupBy() {
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy("foo");
assertContainsRegex(GROUP_BY + var("foo"), builder.buildString());
builder = solutionModifier.addGroupBy("bar");
- assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"),
- builder.buildString());
+ assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"), builder.buildString());
}
@ContractTest
public void testAddHaving() throws ParseException {
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addHaving("?foo<10");
- assertContainsRegex(HAVING + OPEN_PAREN + var("foo") + OPT_SPACE + LT
- + OPT_SPACE + "10" + CLOSE_PAREN, builder.buildString());
+ assertContainsRegex(HAVING + OPEN_PAREN + var("foo") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN,
+ builder.buildString());
builder = solutionModifier.addHaving("?bar < 10");
- assertContainsRegex(HAVING + OPEN_PAREN + var("foo") + OPT_SPACE + LT
- + OPT_SPACE + "10" + CLOSE_PAREN + OPT_SPACE + OPEN_PAREN
- + var("bar") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN,
+ assertContainsRegex(
+ HAVING + OPEN_PAREN + var("foo") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN + OPT_SPACE
+ + OPEN_PAREN + var("bar") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN,
builder.buildString());
}
@ContractTest
public void testSetLimit() {
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.setLimit(500);
assertContainsRegex("LIMIT\\s+500", builder.buildString());
builder = solutionModifier.setLimit(200);
String s = builder.buildString();
- assertContainsRegex("LIMIT\\s+200", s);
- assertNotContainsRegex("LIMIT\\s+500", s);
+ assertContainsRegex(LIMIT + "200", s);
+ assertNotContainsRegex(LIMIT + "500", s);
builder = solutionModifier.setLimit(0);
- assertFalse("Should not contain LIMIT",
- builder.buildString().contains("LIMIT"));
+ assertFalse("Should not contain LIMIT", builder.buildString().contains("LIMIT"));
}
@ContractTest
public void testSetOffset() {
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.setOffset(500);
- assertContainsRegex("OFFSET\\s+500", builder.buildString());
+ assertContainsRegex(OFFSET + "500", builder.buildString());
builder = solutionModifier.setOffset(200);
String s = builder.buildString();
- assertContainsRegex("OFFSET\\s+200", s);
- assertNotContainsRegex("OFFSET\\s+500", s);
+ assertContainsRegex(OFFSET + "200", s);
+ assertNotContainsRegex(OFFSET + "500", s);
builder = solutionModifier.setOffset(0);
- assertFalse("Should not contain OFFSET", builder.buildString()
- .contains("OFFSET"));
+ assertFalse("Should not contain OFFSET", builder.buildString().contains("OFFSET"));
}
@ContractTest
public void testSetVarsGroupBy() {
Var v = Var.alloc("v");
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy("?v");
String[] s = byLine(builder);
@@ -143,8 +196,7 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends
@ContractTest
public void testSetVarsHaving() throws ParseException {
Var v = Var.alloc("v");
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addHaving("?v");
String[] s = byLine(builder);
@@ -158,8 +210,7 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends
@ContractTest
public void testSetVarsOrderBy() {
Var v = Var.alloc("v");
- SolutionModifierClause<?> solutionModifier = getProducer()
- .newInstance();
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addOrderBy("?v");
String[] s = byLine(builder);
http://git-wip-us.apache.org/repos/asf/jena/blob/581d2892/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
index 8c6fe41..1063ab2 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
@@ -47,7 +47,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
public void testAddAll() throws ParseException {
SolutionModifierHandler solutionModifier2 = new SolutionModifierHandler(
new Query());
- solutionModifier2.addOrderBy("orderBy");
+ solutionModifier2.addOrderBy( Var.alloc("orderBy"));
solutionModifier2.addGroupBy("groupBy");
solutionModifier2.addHaving("?having<10");
solutionModifier2.setLimit(500);
@@ -66,7 +66,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
@Test
public void testAll() throws ParseException {
- solutionModifier.addOrderBy("orderBy");
+ solutionModifier.addOrderBy(Var.alloc("orderBy"));
solutionModifier.addGroupBy("groupBy");
solutionModifier.addHaving("SUM(?lprice) > 10");
solutionModifier.setLimit(500);
@@ -83,13 +83,13 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
@Test
public void testAddOrderBy() {
- solutionModifier.addOrderBy("orderBy");
+ solutionModifier.addOrderBy(Var.alloc("orderBy"));
List<SortCondition> sc = query.getOrderBy();
assertEquals("Wrong number of conditions", 1, sc.size());
assertEquals("Wrong value", sc.get(0).expression.asVar(),
Var.alloc("orderBy"));
- solutionModifier.addOrderBy("orderBy2");
+ solutionModifier.addOrderBy(Var.alloc("orderBy2"));
sc = query.getOrderBy();
assertEquals("Wrong number of conditions", 2, sc.size());
assertEquals("Wrong value", sc.get(0).expression.asVar(),
[3/5] jena git commit: Added more addHaving() methods inline with
addGroupBy() and addOrderBy()
Posted by cl...@apache.org.
Added more addHaving() methods inline with addGroupBy() and addOrderBy()
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cfa7c67b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cfa7c67b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cfa7c67b
Branch: refs/heads/master
Commit: cfa7c67be1e34bab6dfb9256c003aa75569c86b6
Parents: 2ec5019
Author: Claude Warren <cl...@apache.org>
Authored: Tue Mar 8 20:46:29 2016 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Mar 8 20:46:29 2016 +0000
----------------------------------------------------------------------
.../jena/arq/querybuilder/AskBuilder.java | 54 +++++++------
.../jena/arq/querybuilder/ConstructBuilder.java | 57 ++++++++------
.../org/apache/jena/arq/querybuilder/Order.java | 17 ++++
.../jena/arq/querybuilder/SelectBuilder.java | 83 ++++++++++++--------
.../clauses/SolutionModifierClause.java | 65 ++++++++++-----
.../clauses/SolutionModifierTest.java | 40 +++++++---
.../handlers/SolutionModifierHandlerTest.java | 27 ++++++-
7 files changed, 230 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
----------------------------------------------------------------------
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 69cb570..30d4edd 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
@@ -26,21 +26,21 @@ import org.apache.jena.arq.querybuilder.handlers.DatasetHandler;
import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
-import org.apache.jena.graph.FrontsTriple ;
+import org.apache.jena.graph.FrontsTriple;
import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple ;
+import org.apache.jena.graph.Triple;
import org.apache.jena.query.SortCondition;
+import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
/**
* Build an ASK query.
*
*/
-public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
- DatasetClause<AskBuilder>, WhereClause<AskBuilder>,
- SolutionModifierClause<AskBuilder> {
-
+public class AskBuilder extends AbstractQueryBuilder<AskBuilder>
+ implements DatasetClause<AskBuilder>, WhereClause<AskBuilder>, SolutionModifierClause<AskBuilder> {
+
private final HandlerBlock handlerBlock;
/**
@@ -49,15 +49,14 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
public AskBuilder() {
super();
query.setQueryAskType();
- handlerBlock = new HandlerBlock( query );
+ handlerBlock = new HandlerBlock(query);
}
-
+
@Override
- public HandlerBlock getHandlerBlock()
- {
+ public HandlerBlock getHandlerBlock() {
return handlerBlock;
}
-
+
@Override
public DatasetHandler getDatasetHandler() {
return handlerBlock.getDatasetHandler();
@@ -71,7 +70,7 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
@Override
public AskBuilder clone() {
AskBuilder qb = new AskBuilder();
- qb.handlerBlock.addAll( handlerBlock );
+ qb.handlerBlock.addAll(handlerBlock);
return qb;
}
@@ -122,10 +121,9 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
getWhereHandler().addOptional(t);
return this;
}
-
+
@Override
- public AskBuilder addOptional(SelectBuilder t)
- {
+ public AskBuilder addOptional(SelectBuilder t) {
getWhereHandler().addOptional(t.getWhereHandler());
return this;
}
@@ -166,19 +164,19 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
getWhereHandler().addGraph(makeNode(graph), subQuery.getWhereHandler());
return this;
}
-
+
@Override
public AskBuilder addBind(Expr expression, Object var) {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
@Override
public AskBuilder addBind(String expression, Object var) throws ParseException {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
-
+
@Override
public AskBuilder addOrderBy(Expr orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
@@ -223,13 +221,13 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
@Override
public AskBuilder addGroupBy(Object var, Expr expr) {
- getSolutionModifierHandler().addGroupBy(makeVar( var ), expr);
+ getSolutionModifierHandler().addGroupBy(makeVar(var), expr);
return this;
}
@Override
public AskBuilder addGroupBy(Object var, String expr) {
- getSolutionModifierHandler().addGroupBy(makeVar( var ), makeExpr(expr));
+ getSolutionModifierHandler().addGroupBy(makeVar(var), makeExpr(expr));
return this;
}
@@ -240,6 +238,18 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
}
@Override
+ public AskBuilder addHaving(Expr expression) throws ParseException {
+ getSolutionModifierHandler().addHaving(expression);
+ return this;
+ }
+
+ @Override
+ public AskBuilder addHaving(Var var) throws ParseException {
+ getSolutionModifierHandler().addHaving(var);
+ return this;
+ }
+
+ @Override
public AskBuilder setLimit(int limit) {
getSolutionModifierHandler().setLimit(limit);
return this;
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
----------------------------------------------------------------------
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 3809633..0e7263b 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
@@ -28,26 +28,23 @@ import org.apache.jena.arq.querybuilder.handlers.DatasetHandler;
import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
-import org.apache.jena.graph.FrontsNode;
-import org.apache.jena.graph.FrontsTriple ;
+import org.apache.jena.graph.FrontsTriple;
import org.apache.jena.graph.Node;
-import org.apache.jena.graph.Triple ;
+import org.apache.jena.graph.Triple;
import org.apache.jena.query.SortCondition;
+import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
/**
* Build an Construct query.
*
*/
-public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
- implements DatasetClause<ConstructBuilder>,
- WhereClause<ConstructBuilder>,
- SolutionModifierClause<ConstructBuilder>,
- ConstructClause<ConstructBuilder> {
+public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> implements DatasetClause<ConstructBuilder>,
+ WhereClause<ConstructBuilder>, SolutionModifierClause<ConstructBuilder>, ConstructClause<ConstructBuilder> {
private final HandlerBlock handlerBlock;
-
+
/**
* Constructor
*/
@@ -78,15 +75,14 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
}
@Override
- public HandlerBlock getHandlerBlock()
- {
+ public HandlerBlock getHandlerBlock() {
return handlerBlock;
}
-
+
@Override
public ConstructBuilder clone() {
ConstructBuilder qb = new ConstructBuilder();
- qb.handlerBlock.addAll( handlerBlock );
+ qb.handlerBlock.addAll(handlerBlock);
return qb;
}
@@ -113,7 +109,7 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
getDatasetHandler().from(graphName);
return this;
}
-
+
@Override
public ConstructBuilder addOrderBy(Expr orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
@@ -165,8 +161,8 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
@Override
public ConstructBuilder addGroupBy(Object var, String expr) {
getSolutionModifierHandler().addGroupBy(makeVar(var), makeExpr(expr));
- return this; }
-
+ return this;
+ }
@Override
public ConstructBuilder addHaving(String having) throws ParseException {
@@ -175,6 +171,18 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
}
@Override
+ public ConstructBuilder addHaving(Expr expression) throws ParseException {
+ getSolutionModifierHandler().addHaving(expression);
+ return this;
+ }
+
+ @Override
+ public ConstructBuilder addHaving(Var var) throws ParseException {
+ getSolutionModifierHandler().addHaving(var);
+ return this;
+ }
+
+ @Override
public ConstructBuilder setLimit(int limit) {
getSolutionModifierHandler().setLimit(limit);
return this;
@@ -209,10 +217,9 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
getWhereHandler().addOptional(t);
return this;
}
-
+
@Override
- public ConstructBuilder addOptional(SelectBuilder t)
- {
+ public ConstructBuilder addOptional(SelectBuilder t) {
getWhereHandler().addOptional(t.getWhereHandler());
return this;
}
@@ -256,16 +263,16 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
@Override
public ConstructBuilder addBind(Expr expression, Object var) {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
@Override
public ConstructBuilder addBind(String expression, Object var) throws ParseException {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
-
+
@Override
public ConstructBuilder addConstruct(Triple t) {
getConstructHandler().addConstruct(t);
@@ -281,11 +288,9 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
public ConstructBuilder addConstruct(Object s, Object p, Object o) {
return addConstruct(new Triple(makeNode(s), makeNode(p), makeNode(o)));
}
-
+
@Override
public Node list(Object... objs) {
return getWhereHandler().list(objs);
}
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
index c72d4de..596cb4d 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/Order.java
@@ -1,4 +1,21 @@
package org.apache.jena.arq.querybuilder;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/**
* The order for the ORDER BY modifiers.
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
----------------------------------------------------------------------
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 1f1936e..1794fe8 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
@@ -29,32 +29,31 @@ import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
import org.apache.jena.arq.querybuilder.handlers.SelectHandler;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
-import org.apache.jena.graph.FrontsNode ;
-import org.apache.jena.graph.FrontsTriple ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
+import org.apache.jena.graph.FrontsNode;
+import org.apache.jena.graph.FrontsTriple;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
import org.apache.jena.query.SortCondition;
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
/**
* Build a select query.
*
*/
-public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
- implements DatasetClause<SelectBuilder>, WhereClause<SelectBuilder>,
- SolutionModifierClause<SelectBuilder>, SelectClause<SelectBuilder> {
+public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder> implements DatasetClause<SelectBuilder>,
+ WhereClause<SelectBuilder>, SolutionModifierClause<SelectBuilder>, SelectClause<SelectBuilder> {
private final HandlerBlock handlerBlock;
-
+
/**
* Constructor.
*/
public SelectBuilder() {
super();
query.setQuerySelectType();
- handlerBlock = new HandlerBlock( query );
+ handlerBlock = new HandlerBlock(query);
}
@Override
@@ -63,11 +62,10 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
@Override
- public HandlerBlock getHandlerBlock()
- {
+ public HandlerBlock getHandlerBlock() {
return handlerBlock;
}
-
+
@Override
public WhereHandler getWhereHandler() {
return handlerBlock.getWhereHandler();
@@ -100,12 +98,15 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
/**
* Add an expression string as a filter.
- * @param expression The expression string to add.
- * @throws ParseException If the expression can not be parsed.
+ *
+ * @param expression
+ * The expression string to add.
+ * @throws ParseException
+ * If the expression can not be parsed.
*/
@Override
public SelectBuilder addVar(String expression, Object var) throws ParseException {
- getSelectHandler().addVar( expression, makeVar(var) );
+ getSelectHandler().addVar(expression, makeVar(var));
return this;
}
@@ -114,7 +115,7 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
getSelectHandler().addVar(expr, makeVar(var));
return this;
}
-
+
@Override
public List<Var> getVars() {
return getSelectHandler().getVars();
@@ -152,10 +153,10 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
@Override
public SelectBuilder addOrderBy(Object orderBy) {
- getSolutionModifierHandler().addOrderBy( makeVar(orderBy));
+ getSolutionModifierHandler().addOrderBy(makeVar(orderBy));
return this;
}
-
+
@Override
public SelectBuilder addOrderBy(SortCondition orderBy) {
getSolutionModifierHandler().addOrderBy(orderBy);
@@ -173,7 +174,7 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
getSolutionModifierHandler().addOrderBy(makeVar(orderBy), order);
return this;
}
-
+
@Override
public SelectBuilder addGroupBy(Object groupBy) {
getSolutionModifierHandler().addGroupBy(makeVar(groupBy));
@@ -210,6 +211,18 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
@Override
+ public SelectBuilder addHaving(Expr expression) throws ParseException {
+ getSolutionModifierHandler().addHaving(expression);
+ return this;
+ }
+
+ @Override
+ public SelectBuilder addHaving(Var var) throws ParseException {
+ getSolutionModifierHandler().addHaving(var);
+ return this;
+ }
+
+ @Override
public SelectBuilder setLimit(int limit) {
getSolutionModifierHandler().setLimit(limit);
return this;
@@ -222,11 +235,12 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
/**
- * Convert a node to a string.
- * If the node is a literal return the literal value.
- * If the node is a URI return the URI enclosed with < and >
- * If the node is a variable return the name preceeded by '?'
- * @param node The node to convert.
+ * Convert a node to a string. If the node is a literal return the literal
+ * value. If the node is a URI return the URI enclosed with < and > If
+ * the node is a variable return the name preceeded by '?'
+ *
+ * @param node
+ * The node to convert.
* @return A string representation of the node.
*/
private static String toString(Node node) {
@@ -246,15 +260,17 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
/**
- * Convert the object to a string.
- * If the object is a node or fronts a node then
+ * Convert the object to a string. If the object is a node or fronts a node
+ * then
* <ul>
* <li>If the node is a literal return the literal value.</li>
* <li>If the node is a URI return the URI enclosed with < and ></li>
* <li>If the node is a variable return the name preceeded by '?'</li>
* </ul>
* otherwise return the toString() method of the object.
- * @param o the Object to convert.
+ *
+ * @param o
+ * the Object to convert.
* @return The string representation of the object.
*/
public static String makeString(Object o) {
@@ -304,12 +320,11 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
}
@Override
- public SelectBuilder addOptional(SelectBuilder t)
- {
+ public SelectBuilder addOptional(SelectBuilder t) {
getWhereHandler().addOptional(t.getWhereHandler());
return this;
}
-
+
@Override
public SelectBuilder addFilter(String s) throws ParseException {
getWhereHandler().addFilter(s);
@@ -337,13 +352,13 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
@Override
public SelectBuilder addBind(Expr expression, Object var) {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
@Override
public SelectBuilder addBind(String expression, Object var) throws ParseException {
- getWhereHandler().addBind( expression, makeVar(var) );
+ getWhereHandler().addBind(expression, makeVar(var));
return this;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
index 820c1d6..2467422 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
@@ -20,11 +20,10 @@ package org.apache.jena.arq.querybuilder.clauses;
import org.apache.jena.arq.querybuilder.AbstractQueryBuilder;
import org.apache.jena.arq.querybuilder.Order;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
-import org.apache.jena.graph.FrontsNode;
import org.apache.jena.query.SortCondition;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
/**
* Interface that defines the SolutionClause as per
@@ -34,7 +33,7 @@ import org.apache.jena.sparql.lang.sparql_11.ParseException ;
* The Builder type that the clause is part of.
*/
public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
-
+
/**
* Add an ascending order by.
*
@@ -43,7 +42,7 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addOrderBy(Expr orderBy);
-
+
/**
* Add an ascending order by.
*
@@ -52,7 +51,7 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addOrderBy(Object orderBy);
-
+
/**
* Add an ascending order by.
*
@@ -61,23 +60,25 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addOrderBy(SortCondition orderBy);
-
+
/**
* Add an order by with direction specified.
*
* @param orderBy
* The expression to order by.
- * @param order The direction to order.
+ * @param order
+ * The direction to order.
* @return The builder for chaining.
*/
public T addOrderBy(Expr orderBy, Order order);
-
+
/**
* Add an order by with direction specified.
*
* @param orderBy
* The object to order by.
- * @param order The direction to order.
+ * @param order
+ * The direction to order.
* @return The builder for chaining.
*/
public T addOrderBy(Object orderBy, Order order);
@@ -90,26 +91,33 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addGroupBy(Object groupBy);
-
+
/**
- * Add an expression to the group by clause.
- * The expression may be created from a string using the makeExpr() method.
- * @param groupBy The expression to add.
+ * Add an expression to the group by clause. The expression may be created
+ * from a string using the makeExpr() method.
+ *
+ * @param groupBy
+ * The expression to add.
*/
public T addGroupBy(Expr groupBy);
/**
* Add var and expression to the group by clause.
- * @param var The variable to add.
- * @param expr The expression to add.
+ *
+ * @param var
+ * The variable to add.
+ * @param expr
+ * The expression to add.
*/
public T addGroupBy(Object var, Expr expr);
-
/**
* Add var and expression to the group by clause.
- * @param var The variable to add.
- * @param expr The expression to add.
+ *
+ * @param var
+ * The variable to add.
+ * @param expr
+ * The expression to add.
*/
public T addGroupBy(Object var, String expr);
@@ -121,7 +129,25 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addHaving(String expression) throws ParseException;
-
+
+ /**
+ * Add a having expression.
+ *
+ * @param expression
+ * Expression to evaluate for the having.
+ * @return The builder for chaining.
+ */
+ public T addHaving(Expr expression) throws ParseException;
+
+ /**
+ * Add a having expression.
+ *
+ * @param var
+ * the variable to have.
+ * @return The builder for chaining.
+ */
+ public T addHaving(Var var) throws ParseException;
+
/**
* Set the limit.
*
@@ -146,6 +172,7 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
/**
* Get the Solution modifier for this clause.
+ *
* @return The SolutionModifierHandler the clause is using.
*/
public SolutionModifierHandler getSolutionModifierHandler();
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
index aa28f86..c6312d7 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
@@ -131,16 +131,16 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
builder = solutionModifier.addGroupBy("bar");
assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"), builder.buildString());
}
-
+
@ContractTest
public void testAddGroupByExpr() {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
- AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy( new E_Random());
- assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN, builder.buildString());
+ AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy(new E_Random());
+ assertContainsRegex(GROUP_BY + "rand" + OPEN_PAREN + CLOSE_PAREN, builder.buildString());
builder = solutionModifier.addGroupBy("bar");
- assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN + SPACE + var("bar"), builder.buildString());
+ assertContainsRegex(GROUP_BY + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + var("bar"), builder.buildString());
}
-
+
@ContractTest
public void testAddGroupByVar() {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
@@ -150,19 +150,21 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
builder = solutionModifier.addGroupBy("bar");
assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"), builder.buildString());
}
-
+
@ContractTest
public void testAddGroupByVarAndExpr() {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy(Var.alloc("foo"), new E_Random());
- assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("foo")+CLOSE_PAREN, builder.buildString());
+ assertContainsRegex(GROUP_BY + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + "AS" + SPACE
+ + var("foo") + CLOSE_PAREN, builder.buildString());
builder = solutionModifier.addGroupBy("bar");
- assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("foo")+CLOSE_PAREN+ SPACE + var("bar"), builder.buildString());
+ assertContainsRegex(GROUP_BY + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + "AS" + SPACE
+ + var("foo") + CLOSE_PAREN + SPACE + var("bar"), builder.buildString());
}
@ContractTest
- public void testAddHaving() throws ParseException {
+ public void testAddHavingString() throws ParseException {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addHaving("?foo<10");
assertContainsRegex(HAVING + OPEN_PAREN + var("foo") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN,
@@ -176,6 +178,26 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
}
@ContractTest
+ public void testAddHavingVar() throws ParseException {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addHaving(Var.alloc("foo"));
+ assertContainsRegex(HAVING + var("foo"), builder.buildString());
+
+ builder = solutionModifier.addHaving("?having2");
+ assertContainsRegex(HAVING + var("foo") + SPACE + var("having2"), builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddHavingExpr() throws ParseException {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addHaving(new E_Random());
+ assertContainsRegex(HAVING + "rand" + OPEN_PAREN + CLOSE_PAREN, builder.buildString());
+
+ solutionModifier.addHaving("?having2");
+ assertContainsRegex(HAVING + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + var("having2"), builder.buildString());
+ }
+
+ @ContractTest
public void testSetLimit() {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.setLimit(500);
http://git-wip-us.apache.org/repos/asf/jena/blob/cfa7c67b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
index 1609d45..5d04748 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
@@ -131,15 +131,36 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
s = byLine(query.toString());
assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("groupBy")+CLOSE_PAREN+SPACE+var("groupBy2"), s);
}
+
@Test
- public void testAddHaving() throws ParseException {
+ public void testAddHavingString() throws ParseException {
solutionModifier.addHaving("?having<10");
assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
- + LT + OPT_SPACE + 10 + CLOSE_PAREN, query.toString());
+ + LT + 10 + CLOSE_PAREN, query.toString());
solutionModifier.addHaving("?having2");
assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
- + LT + OPT_SPACE + 10 + CLOSE_PAREN + OPT_SPACE
+ + LT + 10 + CLOSE_PAREN + OPT_SPACE
+ + var("having2"), query.toString());
+ }
+
+ @Test
+ public void testAddHavingVar() throws ParseException {
+ solutionModifier.addHaving(Var.alloc("foo"));
+ assertContainsRegex(HAVING + var("foo") , query.toString());
+
+ solutionModifier.addHaving("?having2");
+ assertContainsRegex(HAVING + var("foo") + SPACE
+ + var("having2"), query.toString());
+ }
+
+ @Test
+ public void testAddHavingExpr() throws ParseException {
+ solutionModifier.addHaving( new E_Random());
+ assertContainsRegex(HAVING + "rand"+OPEN_PAREN+CLOSE_PAREN , query.toString());
+
+ solutionModifier.addHaving("?having2");
+ assertContainsRegex(HAVING + "rand"+OPEN_PAREN+CLOSE_PAREN + SPACE
+ var("having2"), query.toString());
}
[2/5] jena git commit: Added additional GroupBy methods similar to
new OrderBy methods.
Posted by cl...@apache.org.
Added additional GroupBy methods similar to new OrderBy methods.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2ec50198
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2ec50198
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2ec50198
Branch: refs/heads/master
Commit: 2ec5019836780e789819494e5985929ad64f07d4
Parents: 581d289
Author: Claude Warren <cl...@apache.org>
Authored: Tue Mar 8 20:28:39 2016 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Mar 8 20:28:39 2016 +0000
----------------------------------------------------------------------
.../jena/arq/querybuilder/AskBuilder.java | 20 ++++++++-
.../jena/arq/querybuilder/ConstructBuilder.java | 21 ++++++++-
.../jena/arq/querybuilder/SelectBuilder.java | 20 ++++++++-
.../clauses/SolutionModifierClause.java | 31 +++++++++++--
.../handlers/SolutionModifierHandler.java | 8 ----
.../jena/arq/AbstractRegexpBasedTest.java | 6 +--
.../clauses/SolutionModifierTest.java | 31 ++++++++++++-
.../handlers/SolutionModifierHandlerTest.java | 46 +++++++++++++++-----
8 files changed, 152 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
----------------------------------------------------------------------
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 23965a8..69cb570 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
@@ -210,12 +210,30 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder> implements
}
@Override
- public AskBuilder addGroupBy(String groupBy) {
+ public AskBuilder addGroupBy(Object groupBy) {
+ getSolutionModifierHandler().addGroupBy(makeVar(groupBy));
+ return this;
+ }
+
+ @Override
+ public AskBuilder addGroupBy(Expr groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
}
@Override
+ public AskBuilder addGroupBy(Object var, Expr expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar( var ), expr);
+ return this;
+ }
+
+ @Override
+ public AskBuilder addGroupBy(Object var, String expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar( var ), makeExpr(expr));
+ return this;
+ }
+
+ @Override
public AskBuilder addHaving(String having) throws ParseException {
getSolutionModifierHandler().addHaving(having);
return this;
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
----------------------------------------------------------------------
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 9db1dae..3809633 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
@@ -145,12 +145,30 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
}
@Override
- public ConstructBuilder addGroupBy(String groupBy) {
+ public ConstructBuilder addGroupBy(Object groupBy) {
+ getSolutionModifierHandler().addGroupBy(makeVar(groupBy));
+ return this;
+ }
+
+ @Override
+ public ConstructBuilder addGroupBy(Expr groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
}
@Override
+ public ConstructBuilder addGroupBy(Object var, Expr expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar(var), expr);
+ return this;
+ }
+
+ @Override
+ public ConstructBuilder addGroupBy(Object var, String expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar(var), makeExpr(expr));
+ return this; }
+
+
+ @Override
public ConstructBuilder addHaving(String having) throws ParseException {
getSolutionModifierHandler().addHaving(having);
return this;
@@ -269,4 +287,5 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder>
return getWhereHandler().list(objs);
}
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
----------------------------------------------------------------------
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 5979e07..1f1936e 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
@@ -173,14 +173,32 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder>
getSolutionModifierHandler().addOrderBy(makeVar(orderBy), order);
return this;
}
+
+ @Override
+ public SelectBuilder addGroupBy(Object groupBy) {
+ getSolutionModifierHandler().addGroupBy(makeVar(groupBy));
+ return this;
+ }
@Override
- public SelectBuilder addGroupBy(String groupBy) {
+ public SelectBuilder addGroupBy(Expr groupBy) {
getSolutionModifierHandler().addGroupBy(groupBy);
return this;
}
@Override
+ public SelectBuilder addGroupBy(Object var, Expr expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar(var), expr);
+ return this;
+ }
+
+ @Override
+ public SelectBuilder addGroupBy(Object var, String expr) {
+ getSolutionModifierHandler().addGroupBy(makeVar(var), makeExpr(expr));
+ return this;
+ }
+
+ @Override
public SolutionModifierHandler getSolutionModifierHandler() {
return handlerBlock.getModifierHandler();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
index af0b602..820c1d6 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
@@ -22,6 +22,7 @@ import org.apache.jena.arq.querybuilder.Order;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
import org.apache.jena.graph.FrontsNode;
import org.apache.jena.query.SortCondition;
+import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
@@ -82,13 +83,35 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
public T addOrderBy(Object orderBy, Order order);
/**
- * Add a group by
+ * Add a variable to the group by clause.
*
* @param groupBy
- * The variable name to group by.
+ * The object to group by.
* @return The builder for chaining.
*/
- public T addGroupBy(String groupBy);
+ public T addGroupBy(Object groupBy);
+
+ /**
+ * Add an expression to the group by clause.
+ * The expression may be created from a string using the makeExpr() method.
+ * @param groupBy The expression to add.
+ */
+ public T addGroupBy(Expr groupBy);
+
+ /**
+ * Add var and expression to the group by clause.
+ * @param var The variable to add.
+ * @param expr The expression to add.
+ */
+ public T addGroupBy(Object var, Expr expr);
+
+
+ /**
+ * Add var and expression to the group by clause.
+ * @param var The variable to add.
+ * @param expr The expression to add.
+ */
+ public T addGroupBy(Object var, String expr);
/**
* Add a having expression.
@@ -98,7 +121,7 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* @return The builder for chaining.
*/
public T addHaving(String expression) throws ParseException;
-
+
/**
* Set the limit.
*
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
index eb0fbbb..c170ae0 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandler.java
@@ -107,14 +107,6 @@ public class SolutionModifierHandler implements Handler {
}
/**
- * Add a variable to the group by clause.
- * @param varName The variable name to add.
- */
- public void addGroupBy(String varName) {
- query.addGroupBy(varName);
- }
-
- /**
* Add an expression to the group by clause.
* @param expr The expression to add.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
index 6be2010..57b1f77 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
@@ -33,9 +33,9 @@ public abstract class AbstractRegexpBasedTest {
protected static final String OPEN_PAREN = "\\(" + OPT_SPACE;
protected static final String CLOSE_PAREN = OPT_SPACE + "\\)";
protected static final String QUOTE = "\\\"";
- protected static final String LT = "\\<";
- protected static final String GT = "\\>";
- protected static final String EQ = "=";
+ protected static final String LT = "\\<"+OPT_SPACE;
+ protected static final String GT = "\\>"+OPT_SPACE;
+ protected static final String EQ = "="+OPT_SPACE;
protected static final String DOT = OPT_SPACE+"\\.";
protected static final String ORDER_BY = "ORDER" + SPACE + "BY" + SPACE;
protected static final String GROUP_BY = "GROUP" + SPACE + "BY" + SPACE;
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
index 8e3244b..aa28f86 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
@@ -123,7 +123,7 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
}
@ContractTest
- public void testAddGroupBy() {
+ public void testAddGroupByString() {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy("foo");
assertContainsRegex(GROUP_BY + var("foo"), builder.buildString());
@@ -131,6 +131,35 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
builder = solutionModifier.addGroupBy("bar");
assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"), builder.buildString());
}
+
+ @ContractTest
+ public void testAddGroupByExpr() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy( new E_Random());
+ assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN, builder.buildString());
+ builder = solutionModifier.addGroupBy("bar");
+ assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN + SPACE + var("bar"), builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddGroupByVar() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy(Var.alloc("foo"));
+ assertContainsRegex(GROUP_BY + var("foo"), builder.buildString());
+
+ builder = solutionModifier.addGroupBy("bar");
+ assertContainsRegex(GROUP_BY + var("foo") + SPACE + var("bar"), builder.buildString());
+ }
+
+ @ContractTest
+ public void testAddGroupByVarAndExpr() {
+ SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
+ AbstractQueryBuilder<?> builder = solutionModifier.addGroupBy(Var.alloc("foo"), new E_Random());
+ assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("foo")+CLOSE_PAREN, builder.buildString());
+
+ builder = solutionModifier.addGroupBy("bar");
+ assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("foo")+CLOSE_PAREN+ SPACE + var("bar"), builder.buildString());
+ }
@ContractTest
public void testAddHaving() throws ParseException {
http://git-wip-us.apache.org/repos/asf/jena/blob/2ec50198/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
index 1063ab2..1609d45 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
@@ -28,6 +28,7 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
import org.apache.jena.query.SortCondition ;
import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.sparql.expr.E_Random;
import org.apache.jena.sparql.lang.sparql_11.ParseException ;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +49,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
SolutionModifierHandler solutionModifier2 = new SolutionModifierHandler(
new Query());
solutionModifier2.addOrderBy( Var.alloc("orderBy"));
- solutionModifier2.addGroupBy("groupBy");
+ solutionModifier2.addGroupBy( Var.alloc("groupBy"));
solutionModifier2.addHaving("?having<10");
solutionModifier2.setLimit(500);
solutionModifier2.setOffset(200);
@@ -67,17 +68,17 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
@Test
public void testAll() throws ParseException {
solutionModifier.addOrderBy(Var.alloc("orderBy"));
- solutionModifier.addGroupBy("groupBy");
+ solutionModifier.addGroupBy(Var.alloc("groupBy"));
solutionModifier.addHaving("SUM(?lprice) > 10");
solutionModifier.setLimit(500);
solutionModifier.setOffset(200);
String[] s = byLine(query.toString());
- assertContainsRegex("GROUP BY\\s+\\?groupBy", s);
- assertContainsRegex("HAVING\\s+\\( SUM\\(\\?lprice\\) > 10 \\)", s);
- assertContainsRegex("ORDER BY\\s+\\?orderBy", s);
- assertContainsRegex("LIMIT\\s+500", s);
- assertContainsRegex("OFFSET\\s+200", s);
+ assertContainsRegex(GROUP_BY+var("groupBy"), s);
+ assertContainsRegex(HAVING + OPEN_PAREN+ "SUM" + OPEN_PAREN + var("lprice") + CLOSE_PAREN+ OPT_SPACE+GT+"10"+CLOSE_PAREN, s);
+ assertContainsRegex(ORDER_BY + var("orderBy"), s);
+ assertContainsRegex(LIMIT+"500", s);
+ assertContainsRegex(OFFSET+"200", s);
}
@@ -99,17 +100,38 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
}
@Test
- public void testAddGroupBy() {
- solutionModifier.addGroupBy("groupBy");
+ public void testAddGroupByVar() {
+ solutionModifier.addGroupBy( Var.alloc("groupBy"));
String[] s = byLine(query.toString());
- assertContainsRegex("GROUP BY\\s+\\?groupBy", s);
+ assertContainsRegex(GROUP_BY+var("groupBy"), s);
- solutionModifier.addGroupBy("groupBy2");
+ solutionModifier.addGroupBy( Var.alloc("groupBy2") );
s = byLine(query.toString());
- assertContainsRegex("GROUP BY\\s+\\?groupBy\\s+\\?groupBy2", s);
+ assertContainsRegex(GROUP_BY+var("groupBy")+SPACE+var("groupBy2"), s);
}
@Test
+ public void testAddGroupByExpr() {
+ solutionModifier.addGroupBy( new E_Random());
+ String[] s = byLine(query.toString());
+ assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN, s);
+
+ solutionModifier.addGroupBy( Var.alloc("groupBy2") );
+ s = byLine(query.toString());
+ assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+var("groupBy2"), s);
+ }
+
+ @Test
+ public void testAddGroupByVarAndExpr() {
+ solutionModifier.addGroupBy( Var.alloc( "groupBy"), new E_Random());
+ String[] s = byLine(query.toString());
+ assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("groupBy")+CLOSE_PAREN, s);
+
+ solutionModifier.addGroupBy( Var.alloc("groupBy2") );
+ s = byLine(query.toString());
+ assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("groupBy")+CLOSE_PAREN+SPACE+var("groupBy2"), s);
+ }
+ @Test
public void testAddHaving() throws ParseException {
solutionModifier.addHaving("?having<10");
assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
[4/5] jena git commit: Fixed param to addHaving() to accept Object
like other methods.
Posted by cl...@apache.org.
Fixed param to addHaving() to accept Object like other methods.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4ba1850
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4ba1850
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4ba1850
Branch: refs/heads/master
Commit: f4ba1850b60a9f72155ff13455c7a5032eb427ed
Parents: cfa7c67
Author: Claude Warren <cl...@apache.org>
Authored: Tue Mar 8 20:54:57 2016 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Mar 8 20:54:57 2016 +0000
----------------------------------------------------------------------
.../jena/arq/querybuilder/AskBuilder.java | 4 +-
.../jena/arq/querybuilder/ConstructBuilder.java | 4 +-
.../jena/arq/querybuilder/SelectBuilder.java | 4 +-
.../clauses/SolutionModifierClause.java | 2 +-
.../clauses/SolutionModifierTest.java | 2 +-
.../handlers/SolutionModifierHandlerTest.java | 87 +++++++++-----------
6 files changed, 49 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AskBuilder.java
----------------------------------------------------------------------
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 30d4edd..feda3da 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
@@ -244,8 +244,8 @@ public class AskBuilder extends AbstractQueryBuilder<AskBuilder>
}
@Override
- public AskBuilder addHaving(Var var) throws ParseException {
- getSolutionModifierHandler().addHaving(var);
+ public AskBuilder addHaving(Object var) throws ParseException {
+ getSolutionModifierHandler().addHaving(makeVar(var));
return this;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/ConstructBuilder.java
----------------------------------------------------------------------
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 0e7263b..e1147e3 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
@@ -177,8 +177,8 @@ public class ConstructBuilder extends AbstractQueryBuilder<ConstructBuilder> imp
}
@Override
- public ConstructBuilder addHaving(Var var) throws ParseException {
- getSolutionModifierHandler().addHaving(var);
+ public ConstructBuilder addHaving(Object var) throws ParseException {
+ getSolutionModifierHandler().addHaving(makeVar(var));
return this;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/SelectBuilder.java
----------------------------------------------------------------------
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 1794fe8..69023f7 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
@@ -217,8 +217,8 @@ public class SelectBuilder extends AbstractQueryBuilder<SelectBuilder> implement
}
@Override
- public SelectBuilder addHaving(Var var) throws ParseException {
- getSolutionModifierHandler().addHaving(var);
+ public SelectBuilder addHaving(Object var) throws ParseException {
+ getSolutionModifierHandler().addHaving(makeVar(var));
return this;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
index 2467422..de445c1 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierClause.java
@@ -146,7 +146,7 @@ public interface SolutionModifierClause<T extends AbstractQueryBuilder<T>> {
* the variable to have.
* @return The builder for chaining.
*/
- public T addHaving(Var var) throws ParseException;
+ public T addHaving(Object var) throws ParseException;
/**
* Set the limit.
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
index c6312d7..d144395 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/SolutionModifierTest.java
@@ -178,7 +178,7 @@ public class SolutionModifierTest<T extends SolutionModifierClause<?>> extends A
}
@ContractTest
- public void testAddHavingVar() throws ParseException {
+ public void testAddHavingObject() throws ParseException {
SolutionModifierClause<?> solutionModifier = getProducer().newInstance();
AbstractQueryBuilder<?> builder = solutionModifier.addHaving(Var.alloc("foo"));
assertContainsRegex(HAVING + var("foo"), builder.buildString());
http://git-wip-us.apache.org/repos/asf/jena/blob/f4ba1850/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
index 5d04748..62bad25 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
@@ -24,12 +24,12 @@ import java.util.List;
import java.util.Map;
import org.apache.jena.arq.querybuilder.handlers.SolutionModifierHandler;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.query.Query ;
-import org.apache.jena.query.SortCondition ;
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.SortCondition;
+import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.E_Random;
-import org.apache.jena.sparql.lang.sparql_11.ParseException ;
+import org.apache.jena.sparql.lang.sparql_11.ParseException;
import org.junit.Before;
import org.junit.Test;
@@ -46,10 +46,9 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
@Test
public void testAddAll() throws ParseException {
- SolutionModifierHandler solutionModifier2 = new SolutionModifierHandler(
- new Query());
- solutionModifier2.addOrderBy( Var.alloc("orderBy"));
- solutionModifier2.addGroupBy( Var.alloc("groupBy"));
+ SolutionModifierHandler solutionModifier2 = new SolutionModifierHandler(new Query());
+ solutionModifier2.addOrderBy(Var.alloc("orderBy"));
+ solutionModifier2.addGroupBy(Var.alloc("groupBy"));
solutionModifier2.addHaving("?having<10");
solutionModifier2.setLimit(500);
solutionModifier2.setOffset(200);
@@ -58,8 +57,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
String[] s = byLine(query.toString());
assertContainsRegex(GROUP_BY + var("groupBy"), s);
- assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
- + LT + OPT_SPACE + "10" + CLOSE_PAREN, s);
+ assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE + LT + OPT_SPACE + "10" + CLOSE_PAREN, s);
assertContainsRegex(ORDER_BY + var("orderBy"), s);
assertContainsRegex(LIMIT + "500", s);
assertContainsRegex(OFFSET + "200", s);
@@ -74,11 +72,12 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
solutionModifier.setOffset(200);
String[] s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+var("groupBy"), s);
- assertContainsRegex(HAVING + OPEN_PAREN+ "SUM" + OPEN_PAREN + var("lprice") + CLOSE_PAREN+ OPT_SPACE+GT+"10"+CLOSE_PAREN, s);
+ assertContainsRegex(GROUP_BY + var("groupBy"), s);
+ assertContainsRegex(HAVING + OPEN_PAREN + "SUM" + OPEN_PAREN + var("lprice") + CLOSE_PAREN + OPT_SPACE + GT
+ + "10" + CLOSE_PAREN, s);
assertContainsRegex(ORDER_BY + var("orderBy"), s);
- assertContainsRegex(LIMIT+"500", s);
- assertContainsRegex(OFFSET+"200", s);
+ assertContainsRegex(LIMIT + "500", s);
+ assertContainsRegex(OFFSET + "200", s);
}
@@ -87,81 +86,77 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest {
solutionModifier.addOrderBy(Var.alloc("orderBy"));
List<SortCondition> sc = query.getOrderBy();
assertEquals("Wrong number of conditions", 1, sc.size());
- assertEquals("Wrong value", sc.get(0).expression.asVar(),
- Var.alloc("orderBy"));
+ assertEquals("Wrong value", sc.get(0).expression.asVar(), Var.alloc("orderBy"));
solutionModifier.addOrderBy(Var.alloc("orderBy2"));
sc = query.getOrderBy();
assertEquals("Wrong number of conditions", 2, sc.size());
- assertEquals("Wrong value", sc.get(0).expression.asVar(),
- Var.alloc("orderBy"));
- assertEquals("Wrong value", sc.get(1).expression.asVar(),
- Var.alloc("orderBy2"));
+ assertEquals("Wrong value", sc.get(0).expression.asVar(), Var.alloc("orderBy"));
+ assertEquals("Wrong value", sc.get(1).expression.asVar(), Var.alloc("orderBy2"));
}
@Test
public void testAddGroupByVar() {
- solutionModifier.addGroupBy( Var.alloc("groupBy"));
+ solutionModifier.addGroupBy(Var.alloc("groupBy"));
String[] s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+var("groupBy"), s);
+ assertContainsRegex(GROUP_BY + var("groupBy"), s);
- solutionModifier.addGroupBy( Var.alloc("groupBy2") );
+ solutionModifier.addGroupBy(Var.alloc("groupBy2"));
s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+var("groupBy")+SPACE+var("groupBy2"), s);
+ assertContainsRegex(GROUP_BY + var("groupBy") + SPACE + var("groupBy2"), s);
}
@Test
public void testAddGroupByExpr() {
- solutionModifier.addGroupBy( new E_Random());
+ solutionModifier.addGroupBy(new E_Random());
String[] s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN, s);
+ assertContainsRegex(GROUP_BY + "rand" + OPEN_PAREN + CLOSE_PAREN, s);
- solutionModifier.addGroupBy( Var.alloc("groupBy2") );
+ solutionModifier.addGroupBy(Var.alloc("groupBy2"));
s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+var("groupBy2"), s);
+ assertContainsRegex(GROUP_BY + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + var("groupBy2"), s);
}
-
+
@Test
public void testAddGroupByVarAndExpr() {
- solutionModifier.addGroupBy( Var.alloc( "groupBy"), new E_Random());
+ solutionModifier.addGroupBy(Var.alloc("groupBy"), new E_Random());
String[] s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("groupBy")+CLOSE_PAREN, s);
+ assertContainsRegex(GROUP_BY + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + "AS" + SPACE
+ + var("groupBy") + CLOSE_PAREN, s);
- solutionModifier.addGroupBy( Var.alloc("groupBy2") );
+ solutionModifier.addGroupBy(Var.alloc("groupBy2"));
s = byLine(query.toString());
- assertContainsRegex(GROUP_BY+OPEN_PAREN+"rand"+OPEN_PAREN+CLOSE_PAREN+SPACE+"AS"+SPACE+var("groupBy")+CLOSE_PAREN+SPACE+var("groupBy2"), s);
+ assertContainsRegex(GROUP_BY + OPEN_PAREN + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + "AS" + SPACE
+ + var("groupBy") + CLOSE_PAREN + SPACE + var("groupBy2"), s);
}
@Test
public void testAddHavingString() throws ParseException {
solutionModifier.addHaving("?having<10");
- assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
- + LT + 10 + CLOSE_PAREN, query.toString());
+ assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE + LT + 10 + CLOSE_PAREN, query.toString());
solutionModifier.addHaving("?having2");
- assertContainsRegex(HAVING + OPEN_PAREN + var("having") + OPT_SPACE
- + LT + 10 + CLOSE_PAREN + OPT_SPACE
- + var("having2"), query.toString());
+ assertContainsRegex(
+ HAVING + OPEN_PAREN + var("having") + OPT_SPACE + LT + 10 + CLOSE_PAREN + OPT_SPACE + var("having2"),
+ query.toString());
}
@Test
public void testAddHavingVar() throws ParseException {
solutionModifier.addHaving(Var.alloc("foo"));
- assertContainsRegex(HAVING + var("foo") , query.toString());
+ assertContainsRegex(HAVING + var("foo"), query.toString());
solutionModifier.addHaving("?having2");
- assertContainsRegex(HAVING + var("foo") + SPACE
- + var("having2"), query.toString());
+ assertContainsRegex(HAVING + var("foo") + SPACE + var("having2"), query.toString());
}
@Test
public void testAddHavingExpr() throws ParseException {
- solutionModifier.addHaving( new E_Random());
- assertContainsRegex(HAVING + "rand"+OPEN_PAREN+CLOSE_PAREN , query.toString());
+ solutionModifier.addHaving(new E_Random());
+ assertContainsRegex(HAVING + "rand" + OPEN_PAREN + CLOSE_PAREN, query.toString());
solutionModifier.addHaving("?having2");
- assertContainsRegex(HAVING + "rand"+OPEN_PAREN+CLOSE_PAREN + SPACE
- + var("having2"), query.toString());
+ assertContainsRegex(HAVING + "rand" + OPEN_PAREN + CLOSE_PAREN + SPACE + var("having2"), query.toString());
}
@Test
[5/5] jena git commit: cleaned up includes.
Posted by cl...@apache.org.
cleaned up includes.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/84f3b673
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/84f3b673
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/84f3b673
Branch: refs/heads/master
Commit: 84f3b6734ac476a7232e787150e47b4f845c8b4f
Parents: f4ba185
Author: Claude Warren <cl...@apache.org>
Authored: Tue Mar 8 20:57:15 2016 +0000
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Mar 8 20:57:15 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java | 2 --
.../java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java | 2 --
2 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/84f3b673/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
index 89108a9..8b2a0df 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
@@ -21,13 +21,11 @@ package org.apache.jena.arq.querybuilder;
import static org.junit.Assert.*;
import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
-import org.apache.jena.arq.querybuilder.handlers.PrologHandler;
import org.apache.jena.graph.FrontsNode ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.query.Query;
import org.apache.jena.reasoner.rulesys.Node_RuleVariable ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.expr.ExprVar ;
http://git-wip-us.apache.org/repos/asf/jena/blob/84f3b673/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
----------------------------------------------------------------------
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 3eb209f..c20283b 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
@@ -23,10 +23,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.jena.arq.AbstractRegexpBasedTest;
-import org.apache.jena.query.Query;
import org.apache.jena.query.QueryExecution;
import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.QuerySolution;
import org.apache.jena.query.ResultSet;
import org.apache.jena.rdf.model.Model;