Merge pull request #147 from eclipse/remove_key

otaviojava · web-flow · commit 7977fd2cb105 · 2019-09-09T20:42:38.000-03:00
Updates key-value api
diff --git a/arangodb-driver/src/main/java/org/eclipse/jnosql/diana/arangodb/keyvalue/ArangoDBBucketManager.java b/arangodb-driver/src/main/java/org/eclipse/jnosql/diana/arangodb/keyvalue/ArangoDBBucketManager.java
@@ -108,12 +108,12 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(K key) throws NullPointerException {
+    public <K> void delete(K key) throws NullPointerException {
         arangoDB.db(bucketName).collection(namespace).deleteDocument(key.toString());
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) throws NullPointerException {
+    public <K> void delete(Iterable<K> keys) throws NullPointerException {
         Objects.requireNonNull(keys, "Keys is required");
 
         arangoDB.db(bucketName).collection(namespace)
diff --git a/arangodb-driver/src/test/java/org/eclipse/jnosql/diana/arangodb/keyvalue/ArangoDBKeyValueEntityManagerTest.java b/arangodb-driver/src/test/java/org/eclipse/jnosql/diana/arangodb/keyvalue/ArangoDBKeyValueEntityManagerTest.java
@@ -98,7 +98,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -109,7 +109,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/couchbase-driver/src/main/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManager.java b/couchbase-driver/src/main/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManager.java
@@ -129,7 +129,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) {
     }
 
     @Override
-    public <K> void remove(K key) {
+    public <K> void delete(K key) {
         requireNonNull(key, "key is required");
         try {
             bucket.remove(key.toString());
@@ -139,9 +139,9 @@ public <K> void remove(K key) {
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) {
+    public <K> void delete(Iterable<K> keys) {
         requireNonNull(keys, "keys is required");
-        keys.forEach(this::remove);
+        keys.forEach(this::delete);
     }
 
     @Override
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/CouchbaseDocumentCollectionManagerTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/CouchbaseDocumentCollectionManagerTest.java
@@ -69,7 +69,7 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("person:id");
+        keyValueEntityManager.delete("person:id");
     }
 
     @Test
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/DocumentQueryTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/DocumentQueryTest.java
@@ -57,10 +57,10 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("person:id");
-        keyValueEntityManager.remove("person:id2");
-        keyValueEntityManager.remove("person:id3");
-        keyValueEntityManager.remove("person:id4");
+        keyValueEntityManager.delete("person:id");
+        keyValueEntityManager.delete("person:id2");
+        keyValueEntityManager.delete("person:id3");
+        keyValueEntityManager.delete("person:id4");
     }
 
     @BeforeAll
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/SearchQueryTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/document/SearchQueryTest.java
@@ -53,10 +53,10 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("city:salvador");
-        keyValueEntityManager.remove("city:sao_paulo");
-        keyValueEntityManager.remove("city:rio_janeiro");
-        keyValueEntityManager.remove("city:manaus");
+        keyValueEntityManager.delete("city:salvador");
+        keyValueEntityManager.delete("city:sao_paulo");
+        keyValueEntityManager.delete("city:rio_janeiro");
+        keyValueEntityManager.delete("city:manaus");
     }
 
     @BeforeAll
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManagerTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManagerTest.java
@@ -65,8 +65,8 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove(KEY_OTAVIO);
-        keyValueEntityManager.remove(KEY_SORO);
+        keyValueEntityManager.delete(KEY_OTAVIO);
+        keyValueEntityManager.delete(KEY_SORO);
     }
 
 
@@ -165,7 +165,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(entityOtavio);
         assertTrue(keyValueEntityManager.get(KEY_OTAVIO).isPresent());
-        keyValueEntityManager.remove(KEY_OTAVIO);
+        keyValueEntityManager.delete(KEY_OTAVIO);
         assertFalse(keyValueEntityManager.get(KEY_OTAVIO).isPresent());
     }
 
@@ -176,7 +176,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList(KEY_OTAVIO, KEY_SORO);
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseListTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseListTest.java
@@ -64,7 +64,7 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("jnosql:list");
+        keyValueEntityManager.delete("jnosql:list");
     }
 
     @AfterEach
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseMapTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseMapTest.java
@@ -50,7 +50,7 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("jnosql:map");
+        keyValueEntityManager.delete("jnosql:map");
     }
 
     @Test
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseQueueTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseQueueTest.java
@@ -57,7 +57,7 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("jnosql:queue");
+        keyValueEntityManager.delete("jnosql:queue");
     }
 
     @Test
diff --git a/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseSetTest.java b/couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseSetTest.java
@@ -54,7 +54,7 @@ public static void afterClass() {
         CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
         BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
         BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
-        keyValueEntityManager.remove("jnosql:set");
+        keyValueEntityManager.delete("jnosql:set");
     }
 
     @Test
diff --git a/dynamodb-driver/src/main/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBBucketManager.java b/dynamodb-driver/src/main/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBBucketManager.java
@@ -106,13 +106,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(K key) throws NullPointerException {
+    public <K> void delete(K key) throws NullPointerException {
         client.deleteItem(DeleteItemRequest.builder().tableName(tableName).key(DynamoDBUtils.createAttributeValues(key)).build());
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) throws NullPointerException {
-        keys.forEach(this::remove);
+    public <K> void delete(Iterable<K> keys) throws NullPointerException {
+        keys.forEach(this::delete);
     }
 
     @Override
diff --git a/dynamodb-driver/src/test/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBKeyValueEntityManagerTest.java b/dynamodb-driver/src/test/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBKeyValueEntityManagerTest.java
@@ -98,7 +98,7 @@ public void shouldMultiGet() {
     public void shouldRemoveKey() {
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -107,8 +107,9 @@ public void shouldRemoveMultiKey() {
         keyValueEntityManager.put(asList(keyValueSoro, keyValueOtavio));
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
-        assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class))
+                .collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/hazelcast-driver/src/main/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/DefaultHazelcastBucketManager.java b/hazelcast-driver/src/main/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/DefaultHazelcastBucketManager.java
@@ -85,13 +85,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(K key) {
+    public <K> void delete(K key) {
         map.remove(key);
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) {
-        StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
+    public <K> void delete(Iterable<K> keys) {
+        StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
     }
 
     @Override
diff --git a/hazelcast-driver/src/test/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/HazelcastBucketManagerTest.java b/hazelcast-driver/src/test/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/HazelcastBucketManagerTest.java
@@ -101,7 +101,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -112,7 +112,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/infinispan-driver/src/main/java/org/eclipse/jnosql/diana/infinispan/keyvalue/InfinispanBucketManager.java b/infinispan-driver/src/main/java/org/eclipse/jnosql/diana/infinispan/keyvalue/InfinispanBucketManager.java
@@ -80,13 +80,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(K key) {
+    public <K> void delete(K key) {
         cache.remove(key);
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) {
-        StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
+    public <K> void delete(Iterable<K> keys) {
+        StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
     }
 
     @Override
diff --git a/infinispan-driver/src/test/java/org/eclipse/jnosql/diana/infinispan/keyvalue/KeyValueEntityManagerTest.java b/infinispan-driver/src/test/java/org/eclipse/jnosql/diana/infinispan/keyvalue/KeyValueEntityManagerTest.java
@@ -101,7 +101,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -112,7 +112,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/memcached-driver/src/main/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManager.java b/memcached-driver/src/main/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManager.java
@@ -92,15 +92,15 @@ public <K> Iterable<Value> get(Iterable<K> keys) {
     }
 
     @Override
-    public <K> void remove(K key) {
+    public <K> void delete(K key) {
         requireNonNull(key, "key is required");
         client.delete(getKey(key));
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) {
+    public <K> void delete(Iterable<K> keys) {
         requireNonNull(keys, "keys is required");
-        stream(keys.spliterator(), false).forEach(this::remove);
+        stream(keys.spliterator(), false).forEach(this::delete);
     }
 
     @Override
diff --git a/memcached-driver/src/test/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManagerTest.java b/memcached-driver/src/test/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManagerTest.java
@@ -113,7 +113,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(entityOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -124,7 +124,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(otavio, soro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
diff --git a/redis-driver/src/main/java/org/eclipse/jnosql/diana/redis/keyvalue/RedisBucketManager.java b/redis-driver/src/main/java/org/eclipse/jnosql/diana/redis/keyvalue/RedisBucketManager.java
@@ -97,13 +97,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(K key) {
+    public <K> void delete(K key) {
         jedis.del(RedisUtils.createKeyWithNameSpace(key.toString(), nameSpace));
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) {
-        StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
+    public <K> void delete(Iterable<K> keys) {
+        StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
     }
 
     @Override
diff --git a/redis-driver/src/test/java/org/eclipse/jnosql/diana/redis/keyvalue/RedisBucketManagerTest.java b/redis-driver/src/test/java/org/eclipse/jnosql/diana/redis/keyvalue/RedisBucketManagerTest.java
@@ -97,7 +97,7 @@ public void shouldMultiGet() {
     public void shouldRemoveKey() {
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -107,12 +107,12 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), Matchers.containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }
 
     @AfterEach
     public void remove() {
-        keyValueEntityManager.remove(Arrays.asList("otavio", "soro"));
+        keyValueEntityManager.delete(Arrays.asList("otavio", "soro"));
     }
 }
diff --git a/riak-driver/src/main/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManager.java b/riak-driver/src/main/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManager.java
@@ -140,7 +140,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
 
 
     @Override
-    public <K> void remove(K key) throws NullPointerException {
+    public <K> void delete(K key) throws NullPointerException {
 
         DeleteValue deleteValue = createDeleteValue(nameSpace, key);
 
@@ -152,8 +152,8 @@ public <K> void remove(K key) throws NullPointerException {
     }
 
     @Override
-    public <K> void remove(Iterable<K> keys) throws NullPointerException {
-        StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
+    public <K> void delete(Iterable<K> keys) throws NullPointerException {
+        StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
     }
 
     @Override
diff --git a/riak-driver/src/test/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManagerTest.java b/riak-driver/src/test/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManagerTest.java
@@ -100,7 +100,7 @@ public void shouldRemoveKey() {
 
         keyValueEntityManager.put(keyValueOtavio);
         assertTrue(keyValueEntityManager.get("otavio").isPresent());
-        keyValueEntityManager.remove("otavio");
+        keyValueEntityManager.delete("otavio");
         assertFalse(keyValueEntityManager.get("otavio").isPresent());
     }
 
@@ -111,7 +111,7 @@ public void shouldRemoveMultiKey() {
         List<String> keys = asList("otavio", "soro");
         Iterable<Value> values = keyValueEntityManager.get(keys);
         assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
-        keyValueEntityManager.remove(keys);
+        keyValueEntityManager.delete(keys);
         Iterable<Value> users = values;
         assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
     }

Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,12 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Override`
`111`		`- public <K> void remove(K key) throws NullPointerException {`
	`111`	`+ public <K> void delete(K key) throws NullPointerException {`
`112`	`112`	`arangoDB.db(bucketName).collection(namespace).deleteDocument(key.toString());`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Override`
`116`		`- public <K> void remove(Iterable<K> keys) throws NullPointerException {`
	`116`	`+ public <K> void delete(Iterable<K> keys) throws NullPointerException {`
`117`	`117`	`Objects.requireNonNull(keys, "Keys is required");`
`118`	`118`
`119`	`119`	`arangoDB.db(bucketName).collection(namespace)`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`@Override`
`132`		`- public <K> void remove(K key) {`
	`132`	`+ public <K> void delete(K key) {`
`133`	`133`	`requireNonNull(key, "key is required");`
`134`	`134`	`try {`
`135`	`135`	`bucket.remove(key.toString());`
`@@ -139,9 +139,9 @@ public <K> void remove(K key) {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`@Override`
`142`		`- public <K> void remove(Iterable<K> keys) {`
	`142`	`+ public <K> void delete(Iterable<K> keys) {`
`143`	`143`	`requireNonNull(keys, "keys is required");`
`144`		`- keys.forEach(this::remove);`
	`144`	`+ keys.forEach(this::delete);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public static void afterClass() {`
`69`	`69`	`CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();`
`70`	`70`	`BucketManagerFactory keyValueEntityManagerFactory = configuration.get();`
`71`	`71`	`BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);`
`72`		`- keyValueEntityManager.remove("person:id");`
	`72`	`+ keyValueEntityManager.delete("person:id");`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static void afterClass() {`
`64`	`64`	`CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();`
`65`	`65`	`BucketManagerFactory keyValueEntityManagerFactory = configuration.get();`
`66`	`66`	`BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);`
`67`		`- keyValueEntityManager.remove("jnosql:list");`
	`67`	`+ keyValueEntityManager.delete("jnosql:list");`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@AfterEach`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static void afterClass() {`
`50`	`50`	`CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();`
`51`	`51`	`BucketManagerFactory keyValueEntityManagerFactory = configuration.get();`
`52`	`52`	`BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);`
`53`		`- keyValueEntityManager.remove("jnosql:map");`
	`53`	`+ keyValueEntityManager.delete("jnosql:map");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static void afterClass() {`
`57`	`57`	`CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();`
`58`	`58`	`BucketManagerFactory keyValueEntityManagerFactory = configuration.get();`
`59`	`59`	`BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);`
`60`		`- keyValueEntityManager.remove("jnosql:queue");`
	`60`	`+ keyValueEntityManager.delete("jnosql:queue");`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Test`