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 2015/06/02 20:56:08 UTC
[1/2] jena git commit: JENA-938: Nonfunctional cleanup in
jena-querybuilder
Repository: jena
Updated Branches:
refs/heads/master 999972e0a -> 0d925f3cd
JENA-938: Nonfunctional cleanup in jena-querybuilder
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fe69dfb6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fe69dfb6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fe69dfb6
Branch: refs/heads/master
Commit: fe69dfb669b2edd063988d83fb3abb5cbaa4b644
Parents: e5035f4
Author: ajs6f <aj...@virginia.edu>
Authored: Tue May 19 14:47:17 2015 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Tue May 19 14:47:17 2015 -0400
----------------------------------------------------------------------
.../arq/querybuilder/handlers/WhereHandler.java | 28 +++++---------------
1 file changed, 7 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fe69dfb6/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 03c33c6..877192e 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
@@ -24,9 +24,6 @@ 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.graph.Node ;
import org.apache.jena.graph.Triple ;
@@ -221,8 +218,7 @@ public class WhereHandler implements Handler {
* @param subQuery The sub query to convert
* @return THe converted element.
*/
- @SuppressWarnings("cast")
- private ElementSubQuery makeSubQuery(SelectBuilder subQuery) {
+ private ElementSubQuery makeSubQuery(SelectBuilder subQuery) {
Query q = new Query();
PrologHandler ph = new PrologHandler(query);
ph.addAll(subQuery.getPrologHandler());
@@ -237,22 +233,12 @@ public class WhereHandler implements Handler {
ch.addAll(((ConstructClause<?>) subQuery).getConstructHandler());
}
- if (subQuery instanceof DatasetClause) {
- DatasetHandler dh = new DatasetHandler(q);
- dh.addAll(((DatasetClause<?>) subQuery).getDatasetHandler());
-
- }
- if (subQuery instanceof SolutionModifierClause) {
- SolutionModifierHandler smh = new SolutionModifierHandler(q);
- smh.addAll(((SolutionModifierClause<?>) subQuery)
- .getSolutionModifierHandler());
-
- }
- if (subQuery instanceof WhereClause) {
- WhereHandler wh = new WhereHandler(q);
- wh.addAll(((WhereClause<?>) subQuery).getWhereHandler());
-
- }
+ DatasetHandler dh = new DatasetHandler(q);
+ dh.addAll( subQuery.getDatasetHandler() );
+ SolutionModifierHandler smh = new SolutionModifierHandler(q);
+ smh.addAll( subQuery.getSolutionModifierHandler() );
+ WhereHandler wh = new WhereHandler(q);
+ wh.addAll( subQuery.getWhereHandler() );
return new ElementSubQuery(q);
}
[2/2] jena git commit: This closes #68
Posted by cl...@apache.org.
This closes #68
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0d925f3c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0d925f3c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0d925f3c
Branch: refs/heads/master
Commit: 0d925f3cd750eab2ced532eaab7a398b06eb673a
Parents: 999972e fe69dfb
Author: Claude Warren <cl...@apache.org>
Authored: Tue Jun 2 19:53:27 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Tue Jun 2 19:53:27 2015 +0100
----------------------------------------------------------------------
.../arq/querybuilder/handlers/WhereHandler.java | 34 ++++++--------------
1 file changed, 10 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0d925f3c/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
----------------------------------------------------------------------
diff --cc jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
index 6135ca6,877192e..826fd56
--- 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,14 +17,13 @@@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import java.io.ByteArrayInputStream;
-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.rewriters.ElementRewriter;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.Query ;