You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/23 19:11:29 UTC
jena git commit: Fix for cleaning earlier of ElementDataset
Repository: jena
Updated Branches:
refs/heads/master 134734535 -> 2d07790f2
Fix for cleaning earlier of ElementDataset
Remove some warnings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2d07790f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2d07790f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2d07790f
Branch: refs/heads/master
Commit: 2d07790f21730355544854b32b15b2e2ed5be3a2
Parents: 1347345
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 23 18:10:55 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 23 18:10:55 2015 +0100
----------------------------------------------------------------------
.../querybuilder/handlers/DatasetHandler.java | 8 +++----
.../querybuilder/handlers/SelectHandler.java | 9 ++++----
.../handlers/SolutionModifierHandler.java | 9 ++++----
.../arq/querybuilder/handlers/WhereHandler.java | 22 ++++++++++----------
.../querybuilder/rewriters/ElementRewriter.java | 4 ++--
.../querybuilder/clauses/WhereClauseTest.java | 2 +-
.../handlers/SelectHandlerTest.java | 9 ++++----
.../querybuilder/handlers/WhereHandlerTest.java | 2 +-
8 files changed, 30 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
index 90869f3..8f6e47a 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandler.java
@@ -17,11 +17,9 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.Collection ;
+import java.util.List ;
+import java.util.Map ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/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 518a699..c5c0c28 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
@@ -17,16 +17,15 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
+import java.util.List ;
+import java.util.Map ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.core.VarExprList ;
-import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.util.ExprUtils;
+import org.apache.jena.sparql.expr.Expr ;
+import org.apache.jena.sparql.util.ExprUtils ;
/**
* A Select clause handler.
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/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 261a33c..183304b 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
@@ -17,12 +17,11 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
+import java.io.ByteArrayInputStream ;
+import java.util.List ;
+import java.util.Map ;
-import org.apache.jena.arq.querybuilder.rewriters.ExprRewriter;
+import org.apache.jena.arq.querybuilder.rewriters.ExprRewriter ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.Query ;
import org.apache.jena.query.SortCondition ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
index c6dab1a..6135ca6 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
@@ -17,16 +17,16 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.Iterator ;
+import java.util.List ;
+import java.util.Map ;
-import org.apache.jena.arq.querybuilder.SelectBuilder;
-import org.apache.jena.arq.querybuilder.clauses.ConstructClause;
-import org.apache.jena.arq.querybuilder.clauses.DatasetClause;
-import org.apache.jena.arq.querybuilder.clauses.SolutionModifierClause;
-import org.apache.jena.arq.querybuilder.clauses.WhereClause;
-import org.apache.jena.arq.querybuilder.rewriters.ElementRewriter;
+import org.apache.jena.arq.querybuilder.SelectBuilder ;
+import org.apache.jena.arq.querybuilder.clauses.ConstructClause ;
+import org.apache.jena.arq.querybuilder.clauses.DatasetClause ;
+import org.apache.jena.arq.querybuilder.clauses.SolutionModifierClause ;
+import org.apache.jena.arq.querybuilder.clauses.WhereClause ;
+import org.apache.jena.arq.querybuilder.rewriters.ElementRewriter ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.Query ;
@@ -34,7 +34,7 @@ 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.syntax.* ;
-import org.apache.jena.sparql.util.ExprUtils;
+import org.apache.jena.sparql.util.ExprUtils ;
/**
* The where handler
@@ -293,7 +293,7 @@ public class WhereHandler implements Handler {
/**
* Add a binding to the where clause.
- * @param expr The expression to bind.
+ * @param expression The expression to bind.
* @param var The variable to bind it to.
* @throws ParseException
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
index 4ff17c3..91acce2 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
@@ -146,8 +146,8 @@ public class ElementRewriter extends AbstractRewriter<Element> implements
@Override
public void visit(ElementDataset el) {
Element pattern = null;
- if (el.getPatternElement() != null) {
- el.getPatternElement().visit(this);
+ if (el.getElement() != null) {
+ el.getElement().visit(this);
pattern = getResult();
}
push(new ElementDataset(el.getDataset(), pattern));
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
index f6587a9..3963779 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/WhereClauseTest.java
@@ -274,7 +274,7 @@ public class WhereClauseTest<T extends WhereClause<?>> extends
}
@ContractTest
- public void testBindExprVar() throws ParseException {
+ public void testBindExprVar() {
Var v = Var.alloc("foo");
WhereClause<?> whereClause = getProducer().newInstance();
AbstractQueryBuilder<?> builder = whereClause
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/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 52c07da..09cb9c8 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
@@ -24,7 +24,6 @@ import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.core.VarExprList ;
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.Before;
import org.junit.Test;
@@ -57,20 +56,20 @@ public class SelectHandlerTest extends AbstractHandlerTest {
}
@Test
- public void testAddStringVar() throws ParseException {
+ public void testAddStringVar() {
Var v = Var.alloc("foo");
handler.addVar("rand()", v);
- VarExprList expr = query.getProject();;
+ 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 E_Random", e instanceof E_Random);
}
- public void testAddExprVar() throws ParseException {
+ public void testAddExprVar() {
Var v = Var.alloc("foo");
handler.addVar(new E_Random(), v);
- VarExprList expr = query.getProject();;
+ VarExprList expr = query.getProject();
assertEquals(1, expr.size());
Expr e = expr.getExpr( Var.alloc( "foo" ));
assertNotNull( "expression should not be null", e );
http://git-wip-us.apache.org/repos/asf/jena/blob/2d07790f/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
index 2101374..f678fd8 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
@@ -316,7 +316,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
}
@Test
- public void testBindExprVar() throws ParseException {
+ public void testBindExprVar() {
Var v = Var.alloc("foo");
handler.addBind(new E_Random(), v);