Organize imports and javadocs

core/src/main/java/me/prettyprint/cassandra/model/CounterRowsImpl.java

@@ -1,23 +1,20 @@
 package me.prettyprint.cassandra.model;
 
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import me.prettyprint.cassandra.utils.Assert;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.CounterRow;
 import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.CounterColumn;
 
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.cassandra.thrift.CounterColumn;
 
 /**
  * Returned by a MultigetSliceQuery (multiget_slice thrift call)
  *
- * @author Ran Tavory
  *
  * @param <N>
  */

core/src/main/java/me/prettyprint/cassandra/model/OrderedCounterSuperRowsImpl.java

@@ -1,20 +1,18 @@
 package me.prettyprint.cassandra.model;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.CounterSuperRow;
 import me.prettyprint.hector.api.beans.OrderedCounterSuperRows;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
-import me.prettyprint.hector.api.beans.SuperRow;
-import org.apache.cassandra.thrift.CounterSuperColumn;
-import org.apache.cassandra.thrift.SuperColumn;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
+import org.apache.cassandra.thrift.CounterSuperColumn;
 
 /**
  * Return type from get_range_slices for super columns
- * @author Ran Tavory
+ * 
  *
  */
 public final class OrderedCounterSuperRowsImpl<K,SN,N> extends CounterSuperRowsImpl<K,SN,N>

core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftMultigetSliceCounterQuery.java

@@ -1,27 +1,29 @@
 package me.prettyprint.cassandra.model.thrift;
 
-import me.prettyprint.cassandra.model.*;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import me.prettyprint.cassandra.model.AbstractSliceQuery;
+import me.prettyprint.cassandra.model.CounterRowsImpl;
+import me.prettyprint.cassandra.model.KeyspaceOperationCallback;
+import me.prettyprint.cassandra.model.QueryResultImpl;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.service.KeyspaceService;
 import me.prettyprint.cassandra.utils.Assert;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.Rows;
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
-import me.prettyprint.hector.api.query.MultigetSliceQuery;
 import me.prettyprint.hector.api.query.QueryResult;
-import org.apache.cassandra.thrift.Column;
+
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.CounterColumn;
 
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 /**
  * A query wrapper for the thrift call multiget_slice
  */

core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftMultigetSuperSliceCounterQuery.java

@@ -1,27 +1,32 @@
 package me.prettyprint.cassandra.model.thrift;
 
-import me.prettyprint.cassandra.model.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import me.prettyprint.cassandra.model.AbstractSliceQuery;
+import me.prettyprint.cassandra.model.CounterSuperRowsImpl;
+import me.prettyprint.cassandra.model.KeyspaceOperationCallback;
+import me.prettyprint.cassandra.model.QueryResultImpl;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.service.KeyspaceService;
 import me.prettyprint.cassandra.utils.Assert;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.CounterSuperRows;
-import me.prettyprint.hector.api.beans.SuperRows;
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.query.MultigetSuperSliceCounterQuery;
-import me.prettyprint.hector.api.query.MultigetSuperSliceQuery;
 import me.prettyprint.hector.api.query.QueryResult;
+
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.CounterSuperColumn;
-import org.apache.cassandra.thrift.SuperColumn;
-
-import java.util.*;
 
 /**
  * A query wrapper for the thrift call multiget_slice for a slice of supercolumns
  *
- * @author ran
  */
 public final class ThriftMultigetSuperSliceCounterQuery<K, SN, N> extends
     AbstractSliceQuery<K, SN, Long, CounterSuperRows<K, SN, N>> implements MultigetSuperSliceCounterQuery<K, SN, N> {

core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftRangeSlicesCounterQuery.java

@@ -1,6 +1,14 @@
 package me.prettyprint.cassandra.model.thrift;
 
-import me.prettyprint.cassandra.model.*;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import me.prettyprint.cassandra.model.AbstractSliceQuery;
+import me.prettyprint.cassandra.model.HKeyRange;
+import me.prettyprint.cassandra.model.KeyspaceOperationCallback;
+import me.prettyprint.cassandra.model.OrderedCounterRowsImpl;
+import me.prettyprint.cassandra.model.QueryResultImpl;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.service.KeyspaceService;
 import me.prettyprint.cassandra.utils.Assert;
@@ -10,13 +18,10 @@
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.query.QueryResult;
 import me.prettyprint.hector.api.query.RangeSlicesCounterQuery;
+
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.CounterColumn;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * A query for the thrift call get_range_slices.
  *

core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftRangeSuperSlicesCounterQuery.java

@@ -1,29 +1,31 @@
 package me.prettyprint.cassandra.model.thrift;
 
-import me.prettyprint.cassandra.model.*;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import me.prettyprint.cassandra.model.AbstractSliceQuery;
+import me.prettyprint.cassandra.model.HKeyRange;
+import me.prettyprint.cassandra.model.KeyspaceOperationCallback;
+import me.prettyprint.cassandra.model.OrderedCounterSuperRowsImpl;
+import me.prettyprint.cassandra.model.QueryResultImpl;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.service.KeyspaceService;
 import me.prettyprint.cassandra.utils.Assert;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.OrderedCounterSuperRows;
-import me.prettyprint.hector.api.beans.OrderedSuperRows;
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.query.QueryResult;
 import me.prettyprint.hector.api.query.RangeSuperSlicesCounterQuery;
-import me.prettyprint.hector.api.query.RangeSuperSlicesQuery;
+
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.CounterSuperColumn;
-import org.apache.cassandra.thrift.SuperColumn;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * A query for the thrift call get_range_slices of supercolumns
  *
- * @author Ran Tavory
+ * 
  *
  * @param <N>
  */

core/src/main/java/me/prettyprint/cassandra/model/thrift/ThriftSuperSliceCounterQuery.java

@@ -1,30 +1,31 @@
 package me.prettyprint.cassandra.model.thrift;
 
-import me.prettyprint.cassandra.model.*;
+
+import java.util.List;
+
+import me.prettyprint.cassandra.model.AbstractSliceQuery;
+import me.prettyprint.cassandra.model.CounterSuperSliceImpl;
+import me.prettyprint.cassandra.model.KeyspaceOperationCallback;
+import me.prettyprint.cassandra.model.QueryResultImpl;
 import me.prettyprint.cassandra.serializers.LongSerializer;
 import me.prettyprint.cassandra.service.KeyspaceService;
 import me.prettyprint.cassandra.utils.Assert;
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.Serializer;
 import me.prettyprint.hector.api.beans.CounterSuperSlice;
-import me.prettyprint.hector.api.beans.SuperSlice;
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.query.QueryResult;
 import me.prettyprint.hector.api.query.SuperSliceCounterQuery;
-import me.prettyprint.hector.api.query.SuperSliceQuery;
+
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.CounterSuperColumn;
-import org.apache.cassandra.thrift.SuperColumn;
-
-import java.util.List;
 
 
 /**
  * A query for the thrift call get_slice.
  * <p>
- * Get a slice of super columns from a super column family.
+ * Get a slice of super counter columns from a super column family.
  *
- * @author Ran Tavory
  *
  * @param <N>
  */

core/src/main/java/me/prettyprint/cassandra/service/KeyspaceService.java

@@ -8,7 +8,16 @@
 import me.prettyprint.hector.api.exceptions.HNotFoundException;
 import me.prettyprint.hector.api.exceptions.HectorException;
 
-import org.apache.cassandra.thrift.*;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnParent;
+import org.apache.cassandra.thrift.ColumnPath;
+import org.apache.cassandra.thrift.CounterColumn;
+import org.apache.cassandra.thrift.CounterSuperColumn;
+import org.apache.cassandra.thrift.IndexClause;
+import org.apache.cassandra.thrift.KeyRange;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.SlicePredicate;
+import org.apache.cassandra.thrift.SuperColumn;
 
 /**
  * The keyspace is a high level handle to all read/write operations to cassandra.

core/src/main/java/me/prettyprint/cassandra/service/KeyspaceServiceImpl.java

@@ -16,7 +16,22 @@
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.exceptions.HectorTransportException;
 
-import org.apache.cassandra.thrift.*;
+import org.apache.cassandra.thrift.Cassandra;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.ColumnParent;
+import org.apache.cassandra.thrift.ColumnPath;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.cassandra.thrift.CounterColumn;
+import org.apache.cassandra.thrift.CounterSuperColumn;
+import org.apache.cassandra.thrift.IndexClause;
+import org.apache.cassandra.thrift.KeyRange;
+import org.apache.cassandra.thrift.KeySlice;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.NotFoundException;
+import org.apache.cassandra.thrift.SlicePredicate;
+import org.apache.cassandra.thrift.SliceRange;
+import org.apache.cassandra.thrift.SuperColumn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -631,12 +646,8 @@ public Map<ByteBuffer, List<SuperColumn>> execute(Cassandra.Client cassandra)
           Map<ByteBuffer, List<ColumnOrSuperColumn>> cfmap = cassandra.multiget_slice(
               keys, columnParent, predicate, getThriftCl(OperationType.READ));
           // if user not given super column name, the multiget_slice will return
-          // List
-          // filled with
-          // super column, if user given a column name, the return List will
-          // filled
-          // with column,
-          // this is a bad interface design.
+          // List filled with super column, if user given a column name, the return List will
+          // filled with column, this is a bad interface design.
           if (!columnParent.isSetSuper_column()) {
             Map<ByteBuffer, List<SuperColumn>> result = new HashMap<ByteBuffer, List<SuperColumn>>();
             for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> entry : cfmap.entrySet()) {
@@ -677,12 +688,8 @@ public Map<ByteBuffer, List<CounterSuperColumn>> execute(Cassandra.Client cassan
           Map<ByteBuffer, List<ColumnOrSuperColumn>> cfmap = cassandra.multiget_slice(
               keys, columnParent, predicate, getThriftCl(OperationType.READ));
           // if user not given super column name, the multiget_slice will return
-          // List
-          // filled with
-          // super column, if user given a column name, the return List will
-          // filled
-          // with column,
-          // this is a bad interface design.
+          // List filled with super column, if user given a column name, the return List will
+          // filled with column, this is a bad interface design.
           if (!columnParent.isSetSuper_column()) {
             Map<ByteBuffer, List<CounterSuperColumn>> result = new HashMap<ByteBuffer, List<CounterSuperColumn>>();
             for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> entry : cfmap.entrySet()) {

core/src/main/java/me/prettyprint/cassandra/service/VirtualKeyspaceServiceImpl.java

@@ -13,7 +13,16 @@
 import me.prettyprint.hector.api.exceptions.HectorException;
 import me.prettyprint.hector.api.exceptions.HectorTransportException;
 
-import org.apache.cassandra.thrift.*;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnParent;
+import org.apache.cassandra.thrift.ColumnPath;
+import org.apache.cassandra.thrift.CounterColumn;
+import org.apache.cassandra.thrift.CounterSuperColumn;
+import org.apache.cassandra.thrift.IndexClause;
+import org.apache.cassandra.thrift.KeyRange;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.SlicePredicate;
+import org.apache.cassandra.thrift.SuperColumn;
 
 public class VirtualKeyspaceServiceImpl extends KeyspaceServiceImpl {
 

core/src/main/java/me/prettyprint/hector/api/beans/CounterRow.java

@@ -6,7 +6,7 @@
  *
  * A Row may be used to hold the returned value from queries such as get_range_slices.
  *
- * @author Ran Tavory
+ * 
  *
  * @param <N> Column name type
  *

core/src/main/java/me/prettyprint/hector/api/beans/CounterRows.java

@@ -4,7 +4,6 @@
 /**
  * Returned by a MultigetSliceQuery (multiget_slice thrift call)
  *
- * @author Ran Tavory
  *
  * @param <N> type of the column names
  */

core/src/main/java/me/prettyprint/hector/api/beans/OrderedCounterRows.java

@@ -4,7 +4,7 @@
 
 /**
  * Return type from get_range_slices for simple columns
- * @author Ran Tavory
+ * 
  *
  * @param <N> column name type
  */