Merge pull request #33 from snwiem/feature/remove_api

adds remove method to JsonDBTemplate without the EntityClass parameter

Author: FarooqKhan

src/main/java/io/jsondb/JsonDBOperations.java

@@ -556,6 +556,16 @@ public interface JsonDBOperations {
    */
   <T> void save(Object objectToSave, String collectionName);
 
+  /**
+   * Remove the given object from the collection by id.
+   *
+   * @param objectToRemove  the object to remove from the collection
+   * @param <T> Type annotated with {@link io.jsondb.annotation.Document} annotation
+   *            and member of the baseScanPackage
+   * @return  the object that was actually removed or null
+   */
+  <T> T remove(Object objectToRemove);
+
   /**
    * Remove the given object from the collection by id.
    *

src/main/java/io/jsondb/JsonDBTemplate.java

@@ -1001,6 +1001,14 @@ public <T> void save(Object objectToSave, String collectionName) {
     }
   }
 
+  /* (non-Javadoc)
+   * @see org.jsondb.JsonDBOperations#remove(java.lang.Object)
+   */
+  @Override
+  public <T> T remove(Object objectToRemove) {
+    return remove(objectToRemove, Util.determineEntityCollectionName(objectToRemove));
+  }
+
   /* (non-Javadoc)
    * @see org.jsondb.JsonDBOperations#remove(java.lang.Object, java.lang.Class)
    */

src/test/java/io/jsondb/tests/RemoveTests.java

@@ -142,7 +142,7 @@ public void testRemoveBatch_FromNonExistingCollection() {
    * Test to remove a single object from a collection
    */
   @Test
-  public void testRemove_ValidObject() {
+  public void testRemove_ValidObjectWithClass() {
     List<Instance> instances = jsonDBTemplate.getCollection(Instance.class);
     int size = instances.size();
 
@@ -158,6 +158,26 @@ public void testRemove_ValidObject() {
     assertEquals("05", removedObject.getId());
   }
 
+  /**
+   * Test to remove a single object from a collection
+   */
+  @Test
+  public void testRemove_ValidObjectWithoutClass() {
+    List<Instance> instances = jsonDBTemplate.getCollection(Instance.class);
+    int size = instances.size();
+
+    Instance instance = new Instance();
+    instance.setId("05");
+
+    Instance removedObject = jsonDBTemplate.remove(instance);
+
+    instances = jsonDBTemplate.getCollection(Instance.class);
+    assertNotNull(instances);
+    assertEquals(size-1, instances.size());
+    assertNotNull(removedObject);
+    assertEquals("05", removedObject.getId());
+  }
+
   /**
    * Test to remove a batch of objects from collection
    */