Author: [email protected]
Date: Fri Sep 16 11:55:42 2011
New Revision: 1384

Log:
[AMDATUCASSANDRA-82] Replaced proprietary Column and SuperColumn with the 
Hector implementations. This should make it easier to implement getSuperRows.

Added:
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/HectorUtil.java
Removed:
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Column.java
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/SuperColumn.java
Modified:
   
trunk/amdatu-cassandra/cassandra-gadgetstore/src/test/java/org/amdatu/cassandra/test/unit/CassandraGadgetStoreTest.java
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/ColumnFamily.java
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Keyspace.java
   
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Row.java

Modified: 
trunk/amdatu-cassandra/cassandra-gadgetstore/src/test/java/org/amdatu/cassandra/test/unit/CassandraGadgetStoreTest.java
==============================================================================
--- 
trunk/amdatu-cassandra/cassandra-gadgetstore/src/test/java/org/amdatu/cassandra/test/unit/CassandraGadgetStoreTest.java
     (original)
+++ 
trunk/amdatu-cassandra/cassandra-gadgetstore/src/test/java/org/amdatu/cassandra/test/unit/CassandraGadgetStoreTest.java
     Fri Sep 16 11:55:42 2011
@@ -31,7 +31,7 @@
     public void test() {
         // Create the mock objects
         LogServiceMock logService = new LogServiceMock();
-        CassandraPersistenceManagerMock pm = new 
CassandraPersistenceManagerMock("Default");
+        CassandraPersistenceManagerMock<String, Object> pm = new 
CassandraPersistenceManagerMock<String, Object>("Default");
         ColumnFamilyDefinition[] colDefs = new 
GadgetColumnFamilyProvider().getColumnFamilies();
         pm.addColumnFamily(colDefs);
 

Modified: 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
==============================================================================
--- 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
   (original)
+++ 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/CassandraPersistenceManagerMock.java
   Fri Sep 16 11:55:42 2011
@@ -39,9 +39,9 @@
  * 
  * @author ivol
  */
-public class CassandraPersistenceManagerMock implements 
CassandraPersistenceManager {
+public class CassandraPersistenceManagerMock<SN, N, V> implements 
CassandraPersistenceManager {
     // The keyspace bound to this PM
-    private Keyspace m_keyspace;
+    private Keyspace<SN, N, V> m_keyspace;
 
     /**
      * Constructs a new PM for the specified keyspace.
@@ -50,7 +50,7 @@
      *        the name of the keyspace to create this PM for
      */
     public CassandraPersistenceManagerMock(String keyspace) {
-        m_keyspace = new Keyspace(keyspace);
+        m_keyspace = new Keyspace<SN, N, V>(keyspace);
     }
 
     /**
@@ -88,10 +88,10 @@
         if (columnFamilyName == null || rowKey == null) {
             throw new IllegalArgumentException("ColumnFamily or row key may 
not be null");
         }
-        ColumnFamily cf = m_keyspace.getColumnFamily(columnFamilyName);
+        ColumnFamily<SN, N, V> cf = 
m_keyspace.getColumnFamily(columnFamilyName);
         if (cf != null) {
-            List<Row> rows = cf.getRows();
-            for (Row row : rows) {
+            List<Row<SN, N, V>> rows = cf.getRows();
+            for (Row<SN, N, V> row : rows) {
                 if (row.getKey().equals(rowKey)) {
                     return true;
                 }
@@ -102,14 +102,14 @@
 
     public boolean exists(String columnFamilyName, String rowKey, String 
superColumnName, String columnName) {
         if (exists(columnFamilyName, rowKey)) {
-            ColumnFamily columnFamily = 
m_keyspace.getColumnFamily(columnFamilyName);
-            List<Column> columns = null;
+            ColumnFamily<SN, N, V> columnFamily = 
m_keyspace.getColumnFamily(columnFamilyName);
+            List<HColumn<N, V>> columns = null;
             if (columnFamily.getType() == ColumnType.SUPER) {
                 if (superColumnName == null) {
                     throw new IllegalArgumentException("SuperColumn may not be 
null");
-                }   
-                List<SuperColumn> superColumns = 
columnFamily.getSuperColumns(rowKey);
-                for (SuperColumn superColumn : superColumns) {
+                }
+                List<HSuperColumn<SN, N, V>> superColumns = 
columnFamily.getSuperColumns(rowKey);
+                for (HSuperColumn<SN, N, V> superColumn : superColumns) {
                     if (superColumn.getName().equals(superColumnName)) {
                         columns = superColumn.getColumns();
                     }
@@ -130,9 +130,9 @@
         if (!exists(columnFamilyName)) {
             throw new HInvalidRequestException("ColumnFamily '" + 
columnFamilyName + "' does not exist");
         }
-        List<Row> rows = 
m_keyspace.getColumnFamily(columnFamilyName).getRows();
+        List<Row<SN, N, V>> rows = 
m_keyspace.getColumnFamily(columnFamilyName).getRows();
         List<String> rowKeys = new ArrayList<String>();
-        for (Row row : rows) {
+        for (Row<SN, N, V> row : rows) {
             rowKeys.add(row.getKey());
         }
         return rowKeys;
@@ -146,42 +146,42 @@
         throw new IllegalArgumentException("This method is not yet implemented 
by this mock object");
     }
 
+    @SuppressWarnings("unchecked")
     public void setValue(String columnFamily, String rowKey, String 
superColumn, String column, Object value) {
         if (!exists(columnFamily)) {
             throw new HInvalidRequestException("ColumnFamily '" + columnFamily 
+ "' does not exist");
         }
-        ColumnFamily cf = m_keyspace.getColumnFamily(columnFamily);
+        ColumnFamily<SN, N, V> cf = m_keyspace.getColumnFamily(columnFamily);
         if (cf != null) {
-            Row row = cf.getRow(rowKey);
+            Row<SN, N, V> row = cf.getRow(rowKey);
             if (row == null) {
-                row = new Row(cf, rowKey);
+                row = new Row<SN, N, V>(cf, rowKey);
                 cf.addRow(row);
             }
             if (superColumn != null) {
                 // Super Column case
-                SuperColumn superCol = row.getSuperColumn(superColumn);
-                if (superCol == null) {
-                    superCol = new SuperColumn(superColumn);
-                    row.addSuperColumn(superCol);
-                }
-                Column col = superCol.getColumn(column);
-                if (col == null) {
-                    col = new Column(column, value, 
System.currentTimeMillis());
-                    superCol.addColumn(col);
+                HSuperColumn<SN, N, V> hSuperColumn = 
row.getSuperColumn(superColumn);
+                if (hSuperColumn == null) {
+                    hSuperColumn = HectorUtil.createHSuperColumn(superColumn, 
column, value);
+                    row.addSuperColumn(hSuperColumn);
+                }
+                HColumn<N, V> hColumn = HectorUtil.getHColumn(hSuperColumn, 
column);
+                if (hColumn == null) {
+                    HectorUtil.addHColumn(hSuperColumn, column, value);
                 }
                 else {
-                    col.setValue(value);
+                    hColumn.setValue((V) value);
                 }
             }
             else {
                 // Column case
-                Column col = row.getColumn(column);
+                HColumn<N, V> col = row.getColumn(column);
                 if (col == null) {
-                    col = new Column(column, value, 
System.currentTimeMillis());
+                    col = new HColumnImpl<N, V>((N) column, (V) value, 
System.currentTimeMillis());
                     row.addColumn(col);
                 }
                 else {
-                    col.setValue(value);
+                    col.setValue((V) value);
                 }
             }
         }
@@ -194,14 +194,14 @@
             throw new HInvalidRequestException("ColumnFamily '" + columnFamily 
+ "' does not exist");
         }
         ColumnFamily cf = m_keyspace.getColumnFamily(columnFamily);
-        List<Column> columns = null;
+        List<HColumn<N, V>> columns = null;
         if (superColumnName != null) {
-            List<SuperColumn> superColumns = cf.getSuperColumns(rowKey);
+            List<HSuperColumn> superColumns = cf.getSuperColumns(rowKey);
             if (superColumns == null) {
                 // Return null if the row doesn't exist
                 return null;
             }
-            for (SuperColumn superColumn : superColumns) {
+            for (HSuperColumn<SN, N, V> superColumn : superColumns) {
                 if (superColumn.getName().equals(superColumnName)) {
                     columns = superColumn.getColumns();
                 }
@@ -215,7 +215,7 @@
             // Return null if the row doesn't exist
             return null;
         }
-        for (Column column : columns) {
+        for (HColumn<?, ?> column : columns) {
             if (column.getName().equals(columnName)) {
                 return (T) column.getValue();
             }
@@ -236,128 +236,8 @@
 
     @Override
     public <T> SuperRow<String, String, String, T> getSuperRow(String 
columnFamily, String rowKey, Class<T> clazz) {
-     /*   ColumnFamily cf = m_keyspace.getColumnFamily(columnFamily);
-        if (cf == null) {
-            throw new  IllegalArgumentException("No ColumnFamily exists named 
'" + columnFamily + "'");
-        }
-        final Row row = cf.getRow(rowKey);
-        if (row == null) {
-            return null;
-        }
-        
-        SuperRow sr = new SuperRow() {
-            public Object getKey() {
-                return row.getKey();
-            }
-
-            public SuperSlice getSuperSlice() {
-                return new SuperSlice() {
-                    public List getSuperColumns() {
-                        return null;
-                    }
-                    public HSuperColumn getColumnByName(Object columnName) {
-                        // TODO Auto-generated method stub
-                        return null;
-                    }
-                }
-            }
-            
-        };*/
-        
         throw new IllegalArgumentException("This method is not (yet) 
implemented by this mock object");
     }
-    /*
-    private SuperRow toSuperRow(final Row row) {
-        SuperRow superRow = new SuperRow() {
-            public Object getKey() {
-                return row.getKey();
-            }
-
-            public SuperSlice getSuperSlice() {
-                return new SuperSlice() {
-                    public List getSuperColumns() {
-                        return row.getSuperColumns();
-                    }
-                    public HSuperColumn getColumnByName(Object columnName) {
-                        return row.getSuperColumn(columnName.toString());
-                    }
-                }
-            }
-            
-        };
-        return superRow;
-    }
-    
-    private HSuperColumn toHSuperColumn(final SuperColumn superColumn) {
-        HSuperColumn hSuperColumn = new HSuperColumn() {
-
-            public HSuperColumn setName(Object name) {
-                throw new IllegalArgumentException("Cannot invoke SuperColumn 
setters on this Mock object");
-            }
-
-            public HSuperColumn setSubcolumns(List subcolumns) {
-                throw new IllegalArgumentException("Cannot invoke SuperColumn 
setters on this Mock object");
-            }
-
-            public HSuperColumn setClock(long clock) {
-                throw new IllegalArgumentException("Cannot invoke SuperColumn 
setters on this Mock object");
-            }
-
-            public long getClock() {
-                return 0;
-            }
-
-            public int getSize() {
-                return superColumn.getColumns().size();
-            }
-
-            public Object getName() {
-                return superColumn.getName();
-            }
-
-            public List getColumns() {
-                return superColumn.getColumns();
-            }
-
-            @Override
-            public HColumn get(int i) {
-                return toHColumn(superColumn.getColumns().get(i));
-            }
-
-            @Override
-            public Serializer getNameSerializer() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public byte[] getNameBytes() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public ByteBuffer getNameByteBuffer() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public Serializer getSuperNameSerializer() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public Serializer getValueSerializer() {
-                // TODO Auto-generated method stub
-                return null;
-            }
-            
-        }
-    }
-    
-   */
 
     @Override
     public <T> SuperRow<String, String, String, T> getSuperRow(String 
columnFamily, String rowKey,
@@ -381,12 +261,12 @@
         if (!exists(columnFamily)) {
             throw new IllegalArgumentException("Specified ColumnFamily '" + 
columnFamily + "' does not exist");
         }
-        List<Column> columns = 
m_keyspace.getColumnFamily(columnFamily).getColumns(rowKey);
+        List<HColumn<N, V>> columns = 
m_keyspace.getColumnFamily(columnFamily).getColumns(rowKey);
         if (columns != null) {
             List<HColumn<String, T>> hColumns = new ArrayList<HColumn<String, 
T>>();
-            for (Column column : columns) {
+            for (HColumn<?, ?> column : columns) {
                 HColumn<String, T> hColumn =
-                    new HColumnImpl<String, T>(column.getName(), (T) 
column.getValue(), column.getTimestamp());
+                    new HColumnImpl<String, T>((String) column.getName(), (T) 
column.getValue(), column.getClock());
                 hColumns.add(hColumn);
             }
             return hColumns;
@@ -408,4 +288,6 @@
     public void deleteColumn(String columnFamily, String rowKey, String 
superColumn, String column) {
         throw new IllegalArgumentException("This method is not yet implemented 
by this mock object");
     }
+    
+  
 }

Modified: 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/ColumnFamily.java
==============================================================================
--- 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/ColumnFamily.java
      (original)
+++ 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/ColumnFamily.java
      Fri Sep 16 11:55:42 2011
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.HSuperColumn;
 import me.prettyprint.hector.api.exceptions.HInvalidRequestException;
 
 import org.amdatu.cassandra.listener.ColumnFamilyDefinition;
@@ -30,13 +32,13 @@
  * 
  * @author ivol
  */
-public class ColumnFamily {
+public class ColumnFamily<SN, N, V> {
     // Name of the column family
     private String m_name;
     private ColumnFamilyDefinition.ColumnType m_type;
 
     // Rows contained by the column family
-    private List<Row> m_rows = new ArrayList<Row>();
+    private List<Row<SN, N, V>> m_rows = new ArrayList<Row<SN, N, V>>();
 
     public ColumnFamily(String name, ColumnFamilyDefinition.ColumnType type) {
         m_name = name;
@@ -51,16 +53,16 @@
         return m_type;
     }
 
-    public void addRow(Row row) {
+    public void addRow(Row<SN, N, V> row) {
         m_rows.add(row);
     }
 
-    public List<Row> getRows() {
+    public List<Row<SN, N, V>> getRows() {
         return m_rows;
     }
 
     public void removeRow(String rowKey) {
-        for (Row row : m_rows) {
+        for (Row<SN, N, V> row : m_rows) {
             if (row.getKey().equals(rowKey)) {
                 m_rows.remove(row);
                 break;
@@ -68,8 +70,8 @@
         }
     }
 
-    public Row getRow(String rowKey) {
-        for (Row row : m_rows) {
+    public Row<SN, N, V> getRow(String rowKey) {
+        for (Row<SN, N, V> row : m_rows) {
             if (row.getKey().equals(rowKey)) {
                 return row;
             }
@@ -77,9 +79,9 @@
         return null;
     }
 
-    public List<SuperColumn> getSuperColumns(String rowKey) {
+    public List<HSuperColumn<SN, N, V>> getSuperColumns(String rowKey) {
         if (m_type == ColumnType.SUPER) {
-            for (Row row : m_rows) {
+            for (Row<SN, N, V> row : m_rows) {
                 if (row.getKey().equals(rowKey)) {
                     return row.getSuperColumns();
                 }
@@ -92,9 +94,9 @@
         }
     }
 
-    public List<Column> getColumns(String rowKey) {
+    public List<HColumn<N, V>> getColumns(String rowKey) {
         if (m_type == ColumnType.STANDARD) {
-            for (Row row : m_rows) {
+            for (Row<SN, N, V> row : m_rows) {
                 if (row.getKey().equals(rowKey)) {
                     return row.getColumns();
                 }

Added: 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/HectorUtil.java
==============================================================================
--- (empty file)
+++ 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/HectorUtil.java
        Fri Sep 16 11:55:42 2011
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2011 The Amdatu Foundation
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.amdatu.cassandra.test.unit.framework.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.prettyprint.cassandra.model.HColumnImpl;
+import me.prettyprint.cassandra.model.HSuperColumnImpl;
+import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.Serializer;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.HSuperColumn;
+
+public class HectorUtil {
+    @SuppressWarnings("unchecked")
+    public static <SN, N, V> HSuperColumn<SN, N, V> createHSuperColumn(String 
superColumn, String column, Object value) {
+        // First initialize the serializers
+        Serializer<SN> snSer = (Serializer<SN>) StringSerializer.get();
+        Serializer<N> nSer = (Serializer<N>) StringSerializer.get();
+        Serializer<V> vSer = (Serializer<V>) 
SerializerTypeInferer.getSerializer(value);
+        
+        // Create the hColumns
+        HColumn<N, V> hColumn = new HColumnImpl<N, V>((N) column, (V) value, 
System.currentTimeMillis());
+        List<HColumn<N, V>> hColumns = new ArrayList<HColumn<N, V>>();
+        hColumns.add(hColumn);
+        
+        // Now create the hSuperColumn and return it
+        long clock = System.currentTimeMillis();
+        return new HSuperColumnImpl<SN, N, V>((SN) superColumn, hColumns, 
clock, snSer, nSer, vSer);
+    }
+    
+    @SuppressWarnings("unchecked")
+    public static <SN, N, V> void addHColumn(HSuperColumn<SN, N, V> 
hSuperColumn, String column, Object value) {
+        List<HColumn<N, V>> hColumns = hSuperColumn.getColumns();
+        HColumn<N, V> hColumn = new HColumnImpl<N, V>((N) column, (V) value, 
System.currentTimeMillis());
+        hColumns.add(hColumn);
+        hSuperColumn.setSubcolumns(hColumns);
+    }
+    
+    public static <SN, N, V>  HColumn<N, V> getHColumn(HSuperColumn<SN, N, V> 
hSuperColumn, String column) {
+        for (HColumn<N, V> hColumn : hSuperColumn.getColumns()) {
+            if (hColumn.getName().equals(column)) {
+                return hColumn;
+            }
+        }
+        return null;
+    }
+}

Modified: 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Keyspace.java
==============================================================================
--- 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Keyspace.java
  (original)
+++ 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Keyspace.java
  Fri Sep 16 11:55:42 2011
@@ -26,9 +26,9 @@
  * 
  * @author ivol
  */
-public class Keyspace {
+public class Keyspace<SN, N, V> {
     private String m_name;
-    private List<ColumnFamily> m_columnFamilies = new 
ArrayList<ColumnFamily>();
+    private List<ColumnFamily<SN, N, V>> m_columnFamilies = new 
ArrayList<ColumnFamily<SN, N, V>>();
     
     public Keyspace(String name) {
         m_name = name;
@@ -40,7 +40,7 @@
     
     public void addColumnFamily(String name, ColumnFamilyDefinition.ColumnType 
type) {
         if (!exists(name)) {
-            m_columnFamilies.add(new ColumnFamily(name, type));
+            m_columnFamilies.add(new ColumnFamily<SN, N, V>(name, type));
         }
     }
     
@@ -48,8 +48,8 @@
         return getColumnFamily(cf) != null;
     }
     
-    public ColumnFamily getColumnFamily(String cf) {
-        for (ColumnFamily columnFamily : m_columnFamilies) {
+    public ColumnFamily<SN, N, V> getColumnFamily(String cf) {
+        for (ColumnFamily<SN, N, V> columnFamily : m_columnFamilies) {
             if (columnFamily.getName().equals(cf)) {
                 return columnFamily;
             }

Modified: 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Row.java
==============================================================================
--- 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Row.java
       (original)
+++ 
trunk/amdatu-cassandra/test-unit/src/main/java/org/amdatu/cassandra/test/unit/framework/mock/Row.java
       Fri Sep 16 11:55:42 2011
@@ -3,17 +3,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.HSuperColumn;
 import me.prettyprint.hector.api.exceptions.HInvalidRequestException;
 
 import org.amdatu.cassandra.listener.ColumnFamilyDefinition.ColumnType;
 
-public class Row {
-    private ColumnFamily m_columnFamily;
+public class Row <SN, N, V> {
+    private ColumnFamily<SN, N, V> m_columnFamily;
     private String m_key;
-    private List<Column> m_columns = new ArrayList<Column>();
-    private List<SuperColumn> m_superColumns = new ArrayList<SuperColumn>();
+    private List<HColumn<N, V>> m_columns = new ArrayList<HColumn<N, V>>();
+    private List<HSuperColumn<SN, N, V>> m_superColumns = new 
ArrayList<HSuperColumn<SN, N, V>>();
 
-    public Row(ColumnFamily columnFamily, String key) {
+    public Row(ColumnFamily<SN, N, V> columnFamily, String key) {
         m_columnFamily = columnFamily;
         m_key = key;
     }
@@ -22,7 +24,7 @@
         return m_key;
     }
 
-    public void addSuperColumn(SuperColumn superColumn) {
+    public void addSuperColumn(HSuperColumn<SN, N, V> superColumn) {
         if (m_columnFamily.getType() == ColumnType.SUPER) {
             m_superColumns.add(superColumn);
         }
@@ -32,7 +34,7 @@
         }
     }
 
-    public List<SuperColumn> getSuperColumns() {
+    public List<HSuperColumn<SN, N, V>> getSuperColumns() {
         if (m_columnFamily.getType() == ColumnType.SUPER) {
             return m_superColumns;
         }
@@ -42,9 +44,9 @@
         }
     }
 
-    public SuperColumn getSuperColumn(String name) {
+    public HSuperColumn<SN, N, V> getSuperColumn(String name) {
         if (m_columnFamily.getType() == ColumnType.SUPER) {
-            for (SuperColumn column : m_superColumns) {
+            for (HSuperColumn<SN, N, V> column : m_superColumns) {
                 if (column.getName().equals(name)) {
                     return column;
                 }
@@ -57,7 +59,7 @@
         }
     }
 
-    public void addColumn(Column column) {
+    public void addColumn(HColumn<N, V> column) {
         if (m_columnFamily.getType() == ColumnType.STANDARD) {
             m_columns.add(column);
         }
@@ -67,7 +69,7 @@
         }
     }
 
-    public List<Column> getColumns() {
+    public List<HColumn<N, V>> getColumns() {
         if (m_columnFamily.getType() == ColumnType.STANDARD) {
             return m_columns;
         }
@@ -77,9 +79,9 @@
         }
     }
 
-    public Column getColumn(String name) {
+    public HColumn<N, V> getColumn(String name) {
         if (m_columnFamily.getType() == ColumnType.STANDARD) {
-            for (Column column : m_columns) {
+            for (HColumn<N, V> column : m_columns) {
                 if (column.getName().equals(name)) {
                     return column;
                 }
@@ -91,5 +93,4 @@
                 "Cannot retrieve columns from a row in a ColumnFamily of type 
super, retrieve super columns instead");
         }
     }
-
 }
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to