updates api

eclipse · Sep 9, 2019 · adb979a · adb979a
1 parent 89bd70a
commit adb979a
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 28 deletions.
diff --git a/...ver/src/main/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManager.java b/...ver/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/...src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManagerTest.java b/...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/...river/src/main/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBBucketManager.java b/...river/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/...st/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBKeyValueEntityManagerTest.java b/...st/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/.../main/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/DefaultHazelcastBucketManager.java b/.../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/...src/test/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/HazelcastBucketManagerTest.java b/...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/...r/src/main/java/org/eclipse/jnosql/diana/infinispan/keyvalue/InfinispanBucketManager.java b/...r/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/...src/test/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManagerTest.java b/...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/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());
     }