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/30 00:43:11 UTC

jena git commit: Remove Query.setGroupBy

Repository: jena
Updated Branches:
  refs/heads/master c7d099d7d -> 31a8cce9e


Remove Query.setGroupBy

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31a8cce9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31a8cce9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31a8cce9

Branch: refs/heads/master
Commit: 31a8cce9e26e46526613c2ca550c900c3dcb4b34
Parents: c7d099d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 29 18:38:31 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 29 18:38:31 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/query/Query.java | 17 -----------------
 .../handlers/SolutionModifierHandler.java          |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/31a8cce9/jena-arq/src/main/java/org/apache/jena/query/Query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/Query.java b/jena-arq/src/main/java/org/apache/jena/query/Query.java
index 4bbf5d7..d156247 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/Query.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/Query.java
@@ -484,23 +484,6 @@ public class Query extends Prologue implements Cloneable, Printable
     
     public VarExprList getGroupBy()      { return groupVars ; }
     
-    /**
-     * Set the group by list.
-     * If groupVars is null the list is reset to an empty list.
-     * @param groupVars The variables to group the query by.
-     */
-    public void setGroupBy( VarExprList groupVars )
-    {
-    	if (groupVars == null)
-    	{
-    		this.groupVars = new VarExprList();
-    	}
-    	else
-    	{
-    		this.groupVars = groupVars;
-    	}
-    }
-    
     public List<Expr> getHavingExprs()    { return havingExprs ; }
     
     public void addGroupBy(String varName)

http://git-wip-us.apache.org/repos/asf/jena/blob/31a8cce9/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 183304b..c52a2e8 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
@@ -247,8 +247,8 @@ public class SolutionModifierHandler implements Handler {
 			}
 		}
 
-		query.setGroupBy( groupBy );
-
+		query.getGroupBy().clear();
+		query.getGroupBy().addAll(groupBy); 
 	}
 
 	@Override