Merge pull request #12 from cloudant/extend-db

Made DatabaseCache extend Database

Author: ricellis

cloudant-client-cache/src/main/java/com/cloudant/client/cache/DatabaseCache.java

@@ -14,46 +14,29 @@
 
 package com.cloudant.client.cache;
 
-import com.cloudant.client.api.Changes;
 import com.cloudant.client.api.Database;
-import com.cloudant.client.api.DesignDocumentManager;
-import com.cloudant.client.api.Search;
-import com.cloudant.client.api.model.DbInfo;
-import com.cloudant.client.api.model.FindByIndexOptions;
-import com.cloudant.client.api.model.Index;
-import com.cloudant.client.api.model.IndexField;
 import com.cloudant.client.api.model.Params;
-import com.cloudant.client.api.model.Permissions;
 import com.cloudant.client.api.model.Response;
-import com.cloudant.client.api.model.Shard;
-import com.cloudant.client.api.views.AllDocsRequestBuilder;
-import com.cloudant.client.api.views.ViewRequestBuilder;
 
-import java.io.InputStream;
-import java.net.URI;
-import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A {@link Database} implementation with a cache.
  *
  * @author Arun Iyengar
  */
-public class DatabaseCache implements Database {
+public class DatabaseCache extends Database {
 
-    protected final Database db;
     protected final Cache<String, Object> cache;
-
-
+    
     /**
      * Constructor which is designed to work with a variety of different caches.
      *
-     * @param database      data structure with information about the database connection
-     * @param cacheInstance cache instance which has already been created and initialized
+     * @param database      non-null data structure with information about the database connection
+     * @param cacheInstance non-null cache instance which has already been created and initialized
      */
     public DatabaseCache(Database database, Cache<String, Object> cacheInstance) {
-        this.db = database;
+        super(database);
         this.cache = cacheInstance;
     }
 
@@ -113,7 +96,7 @@ public <T> T find(Class<T> classType, String id) {
         if (value != null) {
             return value;
         } else {
-            value = db.find(classType, id);
+            value = super.find(classType, id);
             cachePut(id, value);
             return value;
         }
@@ -131,7 +114,7 @@ public <T> T find(Class<T> classType, String id, Params params) {
         if (value != null) {
             return value;
         } else {
-            value = db.find(classType, id, params);
+            value = super.find(classType, id, params);
             cachePut(id, value);
             return value;
         }
@@ -157,7 +140,7 @@ public <T> T findAny(Class<T> classType, String uri) {
         if (value != null) {
             return value;
         } else {
-            value = db.findAny(classType, uri);
+            value = super.findAny(classType, uri);
             cachePut(uri, value);
             return value;
         }
@@ -174,7 +157,7 @@ public boolean contains(String id) {
         if (cache.get(id) != null) {
             return true;
         } else {
-            return db.contains(id);
+            return super.contains(id);
         }
     }
 
@@ -185,7 +168,7 @@ public boolean contains(String id) {
      * </P>
      */
     public Response save(Object object) {
-        Response response = db.save(object);
+        Response response = super.save(object);
         cachePut(response.getId(), object);
         return response;
     }
@@ -197,7 +180,7 @@ public Response save(Object object) {
      * </P>
      */
     public Response save(Object object, int writeQuorum) {
-        Response response = db.save(object, writeQuorum);
+        Response response = super.save(object, writeQuorum);
         cachePut(response.getId(), object);
         return response;
     }
@@ -209,7 +192,7 @@ public Response save(Object object, int writeQuorum) {
      * </P>
      */
     public Response post(Object object) {
-        Response response = db.post(object);
+        Response response = super.post(object);
         cachePut(response.getId(), object);
         return response;
     }
@@ -221,7 +204,7 @@ public Response post(Object object) {
      * </P>
      */
     public Response post(Object object, int writeQuorum) {
-        Response response = db.post(object, writeQuorum);
+        Response response = super.post(object, writeQuorum);
         cachePut(response.getId(), object);
         return response;
     }
@@ -233,7 +216,7 @@ public Response post(Object object, int writeQuorum) {
      * </P>
      */
     public Response update(Object object) {
-        Response response = db.update(object);
+        Response response = super.update(object);
         cachePut(response.getId(), object);
         return response;
     }
@@ -245,7 +228,7 @@ public Response update(Object object) {
      * </P>
      */
     public Response update(Object object, int writeQuorum) {
-        Response response = db.update(object, writeQuorum);
+        Response response = super.update(object, writeQuorum);
         cachePut(response.getId(), object);
         return response;
     }
@@ -257,7 +240,7 @@ public Response update(Object object, int writeQuorum) {
      * </P>
      */
     public Response remove(Object object) {
-        Response response = db.remove(object);
+        Response response = super.remove(object);
         cache.delete(response.getId());
         return response;
     }
@@ -271,7 +254,7 @@ public Response remove(Object object) {
      */
     @Override
     public List<Response> bulk(List<?> list) {
-        List<Response> responses = db.bulk(list);
+        List<Response> responses = super.bulk(list);
         int index = 0;
         for (Object o : list) {
             Response response = responses.get(index);
@@ -283,225 +266,4 @@ public List<Response> bulk(List<?> list) {
         }
         return responses;
     }
-
-    /* Remainder of Database implementation follows, delegating calls to the Database instance
-    specified on construction */
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPermissions(String s, EnumSet<Permissions> enumSet) {
-        db.setPermissions(s, enumSet);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Map<String, EnumSet<Permissions>> getPermissions() {
-        return db.getPermissions();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<Shard> getShards() {
-        return db.getShards();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Shard getShard(String s) {
-        return db.getShard(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void createIndex(String s, String s1, String s2, IndexField[] indexFields) {
-        db.createIndex(s, s1, s2, indexFields);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void createIndex(String s) {
-        db.createIndex(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public <T> List<T> findByIndex(String s, Class<T> aClass) {
-        return db.findByIndex(s, aClass);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public <T> List<T> findByIndex(String s, Class<T> aClass, FindByIndexOptions
-            findByIndexOptions) {
-        return db.findByIndex(s, aClass, findByIndexOptions);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<Index> listIndices() {
-        return db.listIndices();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void deleteIndex(String s, String s1) {
-        db.deleteIndex(s, s1);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Search search(String s) {
-        return db.search(s);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public DesignDocumentManager getDesignDocumentManager() {
-        return db.getDesignDocumentManager();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ViewRequestBuilder getViewRequestBuilder(String s, String s1) {
-        return db.getViewRequestBuilder(s, s1);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public AllDocsRequestBuilder getAllDocsRequestBuilder() {
-        return db.getAllDocsRequestBuilder();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Changes changes() {
-        return db.changes();
-    }
-
-    /**
-     * <P>
-     * Note that cache implementations currently do not store multiple revisions, so this method
-     * only operates remotely.
-     * </P>
-     * {@inheritDoc}
-     */
-    @Override
-    public <T> T find(Class<T> aClass, String s, String s1) {
-        return db.find(aClass, s, s1);
-    }
-
-    /**
-     * <P>
-     * Note that cache implementations only store objects, so InputStreams are returned from the
-     * remote database.
-     * </P>
-     * {@inheritDoc}
-     */
-    @Override
-    public InputStream find(String s) {
-        return db.find(s);
-    }
-
-    /**
-     * <P>
-     * Note that cache implementations only store objects, so InputStreams are returned from the
-     * remote database.
-     * </P>
-     * {@inheritDoc}
-     */
-    @Override
-    public InputStream find(String s, String s1) {
-        return db.find(s, s1);
-    }
-
-    /**
-     * <P>
-     * Note that cache implementations currently do not store multiple revisions, so this method
-     * only operates remotely.
-     * </P>
-     * {@inheritDoc}
-     */
-    @Override
-    public Response remove(String s, String s1) {
-        return db.remove(s, s1);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Response saveAttachment(InputStream inputStream, String s, String s1) {
-        return db.saveAttachment(inputStream, s, s1);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Response saveAttachment(InputStream inputStream, String s, String s1, String s2,
-                                   String s3) {
-        return db.saveAttachment(inputStream, s, s1, s2, s3);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String invokeUpdateHandler(String s, String s1, Params params) {
-        return db.invokeUpdateHandler(s, s1, params);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public URI getDBUri() {
-        return db.getDBUri();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public DbInfo info() {
-        return db.info();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void ensureFullCommit() {
-        db.ensureFullCommit();
-    }
 }