From d4438447accef7f9e7cd08881f09fa59093b3acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Wed, 14 Sep 2011 15:08:43 +0300
Subject: [PATCH] some renamings in GroupBy

---
 .../src/main/java/com/mysema/query/support/Group.java  |  3 +++
 .../main/java/com/mysema/query/support/GroupBy.java    | 10 ++++------
 .../java/com/mysema/query/support/GroupByTest.java     | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Group.java b/querydsl-core/src/main/java/com/mysema/query/support/Group.java
index a001fbad6..e44844932 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/Group.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/Group.java
@@ -61,6 +61,9 @@ public interface Group {
     @Nullable
     <T> List<T> getList(Expression<T> expr);
     
+    /**
+     * @return
+     */
     int size();
     
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/GroupBy.java b/querydsl-core/src/main/java/com/mysema/query/support/GroupBy.java
index 4f1a467f4..957676b65 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/GroupBy.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/GroupBy.java
@@ -34,9 +34,7 @@ public class GroupBy implements ResultTransformer<Collection<Group>> {
     public GroupBy(Expression<?> groupBy, Expression<?>... args) {
         expressions = new Expression<?>[args.length + 1];
         expressions[0] = groupBy;
-        for (int i=0; i < args.length; i++) {
-            expressions[i+1] = args[i];
-        }
+        System.arraycopy(args, 0, expressions, 1, args.length);        
     }
 
     @Override
@@ -49,9 +47,9 @@ public class GroupBy implements ResultTransformer<Collection<Group>> {
                 Object[] row = iter.next();
                 Object groupBy = row[0];
                 // groups.values() should return Collection<GTuple> instead of Collection<? extends GTuple>
-                GTupleImpl group = (GTupleImpl) groups.get(groupBy);
+                GroupImpl group = (GroupImpl) groups.get(groupBy);
                 if (group == null) {
-                    group = new GTupleImpl();
+                    group = new GroupImpl();
                     groups.put(groupBy, group);
                 }
                 group.add(row);
@@ -72,7 +70,7 @@ public class GroupBy implements ResultTransformer<Collection<Group>> {
     }
     
     @SuppressWarnings("unchecked")
-    private class GTupleImpl implements Group {
+    private class GroupImpl implements Group {
         
         private final List<Object[]> values = new ArrayList<Object[]>();
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/support/GroupByTest.java b/querydsl-core/src/test/java/com/mysema/query/support/GroupByTest.java
index 5e2e48fac..8ab84b614 100644
--- a/querydsl-core/src/test/java/com/mysema/query/support/GroupByTest.java
+++ b/querydsl-core/src/test/java/com/mysema/query/support/GroupByTest.java
@@ -20,11 +20,11 @@ import com.mysema.query.types.path.StringPath;
 
 public class GroupByTest {
 
-    private final NumberExpression<Integer> postId = new NumberPath(Integer.class, null, "postId");
+    private final NumberExpression<Integer> postId = new NumberPath<Integer>(Integer.class, "postId");
 
-    private final StringExpression postName = new StringPath(null, "postName");
+    private final StringExpression postName = new StringPath("postName");
 
-    private final NumberExpression<Integer> commentId = new NumberPath(Integer.class, null, "commentId");
+    private final NumberExpression<Integer> commentId = new NumberPath<Integer>(Integer.class, "commentId");
 
     /**
      * <ol>
@@ -98,7 +98,7 @@ public class GroupByTest {
         return row;
     }
     
-    private static <T> CloseableIterator<T> iterator(Object[]... rows) {
-        return new IteratorAdapter(Arrays.asList(rows).iterator());
+    private static <T> CloseableIterator<T> iterator(T... rows) {
+        return new IteratorAdapter<T>(Arrays.asList(rows).iterator());
     }
 }