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/10/15 13:28:15 UTC
[1/2] jena git commit: Fix and test for JENA-1246
Repository: jena
Updated Branches:
refs/heads/master be13685c1 -> d26c634f6
Fix and test for JENA-1246
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3a9fee0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3a9fee0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3a9fee0
Branch: refs/heads/master
Commit: d3a9fee08980e0aed7ca9a2c802f01639ae784a0
Parents: be13685
Author: Claude Warren <cl...@apache.org>
Authored: Sat Oct 15 14:25:57 2016 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sat Oct 15 14:25:57 2016 +0100
----------------------------------------------------------------------
.../jena/arq/querybuilder/handlers/SelectHandler.java | 1 +
.../arq/querybuilder/handlers/SelectHandlerTest.java | 14 ++++++++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d3a9fee0/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
index 8875cd3..a42f305 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/SelectHandler.java
@@ -124,6 +124,7 @@ public class SelectHandler implements Handler {
try {
ARQParser parser = new ARQParser(new StringReader("SELECT " + s));
parser.setQuery(new Query());
+ parser.getQuery().setPrefixMapping( query.getPrefixMapping());
parser.SelectClause();
Query q = parser.getQuery();
VarExprList vel = q.getProject();
http://git-wip-us.apache.org/repos/asf/jena/blob/d3a9fee0/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
index 6e131de..fbd3c13 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
@@ -26,6 +26,7 @@ import org.apache.jena.sparql.expr.E_Random;
import org.apache.jena.sparql.expr.Expr;
import org.apache.jena.sparql.expr.ExprAggregator;
import org.apache.jena.sparql.expr.aggregate.AggCount;
+import org.apache.jena.sparql.expr.aggregate.AggSum;
import org.apache.jena.sparql.syntax.ElementGroup;
import org.junit.Before;
import org.junit.Test;
@@ -71,6 +72,19 @@ public class SelectHandlerTest extends AbstractHandlerTest {
}
@Test
+ public void testAddStringWithPrefixVar() {
+ query.setPrefix( "xsd","http://www.w3.org/2001/XMLSchema#" );
+ Var v = Var.alloc("foo");
+ handler.addVar("sum(xsd:integer(?V3))", v);
+ VarExprList expr = query.getProject();
+ assertEquals(1, expr.size());
+ Expr e = expr.getExpr( Var.alloc( "foo" ));
+ assertNotNull( "expression should not be null", e );
+ assertTrue( "Should be an ExprAggregator", e instanceof ExprAggregator);
+ assertTrue( "Should contain an AggSum", ((ExprAggregator)e).getAggregator() instanceof AggSum);
+ }
+
+ @Test
public void testAddAggregateStringVar() {
Var v = Var.alloc("foo");
handler.addVar("count(*)", v);
[2/2] jena git commit: Cleaned up javadoc
Posted by cl...@apache.org.
Cleaned up javadoc
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d26c634f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d26c634f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d26c634f
Branch: refs/heads/master
Commit: d26c634f62fa792deecc37c545c9c1bf14ff3050
Parents: d3a9fee
Author: Claude Warren <cl...@apache.org>
Authored: Sat Oct 15 14:26:31 2016 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sat Oct 15 14:26:31 2016 +0100
----------------------------------------------------------------------
.../querybuilder/handlers/SolutionModifierHandler.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d26c634f/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 f99c7e7..7544825 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
@@ -74,15 +74,21 @@ public class SolutionModifierHandler implements Handler {
public void addOrderBy(SortCondition condition) {
query.addOrderBy(condition);
}
-
+
/**
* Add an expression to the order by clause.
+ * Sorts in Default order.
* @param expr The expression to add.
*/
public void addOrderBy(Expr expr) {
query.addOrderBy(expr, Query.ORDER_DEFAULT);
}
+ /**
+ * Add an expression to the order by clause.
+ * @param expr The expression to add.
+ * @param order The direction of the ordering.
+ */
public void addOrderBy(Expr expr, Order order) {
query.addOrderBy(expr, order == Order.ASCENDING ? Query.ORDER_ASCENDING
: Query.ORDER_DESCENDING);
@@ -90,7 +96,8 @@ public class SolutionModifierHandler implements Handler {
/**
* Add a var to the order by clause.
- * @param var
+ * Sorts in default order
+ * @param var The var to use for sorting
*/
public void addOrderBy(Var var) {
query.addOrderBy(var, Query.ORDER_DEFAULT);
@@ -98,7 +105,7 @@ public class SolutionModifierHandler implements Handler {
/**
* Add a var to the order by clause.
- * @param var The var to add
+ * @param var The var to sort by.
* @param order The direction of the ordering.
*/
public void addOrderBy(Var var, Order order) {