Refactored TrainingResource to use the Provider interface.

Playlists are now generated from a default playlist and regularly
merged with the default playlist to get updates.

Also adding the Question tests that got left out of a previous commit.

1 files changed, 3 insertions, 9 deletions

diff --git a/src/com/p4square/grow/backend/db/CassandraProviderImpl.java b/src/com/p4square/grow/backend/db/CassandraProviderImpl.java
index fb6e34e..c1f6e6d 100644
--- a/src/com/p4square/grow/backend/db/CassandraProviderImpl.java
+++ b/src/com/p4square/grow/backend/db/CassandraProviderImpl.java
@@ -6,10 +6,6 @@ package com.p4square.grow.backend.db;
 
 import java.io.IOException;
 
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-
 import com.p4square.grow.provider.JsonEncodedProvider;
 
 /**
@@ -19,24 +15,22 @@ import com.p4square.grow.provider.JsonEncodedProvider;
  */
 public class CassandraProviderImpl<V> extends JsonEncodedProvider<CassandraKey, V> {
     private final CassandraDatabase mDb;
-    private final String mColumnFamily;
 
-    public CassandraProviderImpl(CassandraDatabase db, String columnFamily, Class<V> clazz) {
+    public CassandraProviderImpl(CassandraDatabase db, Class<V> clazz) {
         super(clazz);
 
         mDb = db;
-        mColumnFamily = columnFamily;
     }
 
     @Override
     public V get(CassandraKey key) throws IOException {
-        String blob = mDb.getKey(mColumnFamily, key.getId(), key.getColumn());
+        String blob = mDb.getKey(key.getColumnFamily(), key.getId(), key.getColumn());
         return decode(blob);
     }
 
     @Override
     public void put(CassandraKey key, V obj) throws IOException {
         String blob = encode(obj);
-        mDb.putKey(mColumnFamily, key.getId(), key.getColumn(), blob);
+        mDb.putKey(key.getColumnFamily(), key.getId(), key.getColumn(), blob);
     }
 }