Skip to content

Commit adb979a

Browse files
otaviojavaotaviojava
committed
updates api
1 parent 89bd70a commit adb979a

File tree

10 files changed

+29
-28
lines changed

10 files changed

+29
-28
lines changed

‎couchbase-driver/src/main/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) {
129129
}
130130

131131
@Override
132-
public <K> void remove(K key) {
132+
public <K> void delete(K key) {
133133
requireNonNull(key, "key is required");
134134
try {
135135
bucket.remove(key.toString());
@@ -139,9 +139,9 @@ public <K> void remove(K key) {
139139
}
140140

141141
@Override
142-
public <K> void remove(Iterable<K> keys) {
142+
public <K> void delete(Iterable<K> keys) {
143143
requireNonNull(keys, "keys is required");
144-
keys.forEach(this::remove);
144+
keys.forEach(this::delete);
145145
}
146146

147147
@Override

‎couchbase-driver/src/test/java/org/eclipse/jnosql/diana/couchbase/keyvalue/CouchbaseBucketManagerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public static void afterClass() {
6565
CouchbaseKeyValueConfiguration configuration = CouchbaseKeyValueTcConfiguration.getTcConfiguration();
6666
BucketManagerFactory keyValueEntityManagerFactory = configuration.get();
6767
BucketManager keyValueEntityManager = keyValueEntityManagerFactory.getBucketManager(CouchbaseUtil.BUCKET_NAME);
68-
keyValueEntityManager.remove(KEY_OTAVIO);
69-
keyValueEntityManager.remove(KEY_SORO);
68+
keyValueEntityManager.delete(KEY_OTAVIO);
69+
keyValueEntityManager.delete(KEY_SORO);
7070
}
7171

7272

@@ -165,7 +165,7 @@ public void shouldRemoveKey() {
165165

166166
keyValueEntityManager.put(entityOtavio);
167167
assertTrue(keyValueEntityManager.get(KEY_OTAVIO).isPresent());
168-
keyValueEntityManager.remove(KEY_OTAVIO);
168+
keyValueEntityManager.delete(KEY_OTAVIO);
169169
assertFalse(keyValueEntityManager.get(KEY_OTAVIO).isPresent());
170170
}
171171

@@ -176,7 +176,7 @@ public void shouldRemoveMultiKey() {
176176
List<String> keys = asList(KEY_OTAVIO, KEY_SORO);
177177
Iterable<Value> values = keyValueEntityManager.get(keys);
178178
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
179-
keyValueEntityManager.remove(keys);
179+
keyValueEntityManager.delete(keys);
180180
Iterable<Value> users = values;
181181
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
182182
}

‎dynamodb-driver/src/main/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBBucketManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
106106
}
107107

108108
@Override
109-
public <K> void remove(K key) throws NullPointerException {
109+
public <K> void delete(K key) throws NullPointerException {
110110
client.deleteItem(DeleteItemRequest.builder().tableName(tableName).key(DynamoDBUtils.createAttributeValues(key)).build());
111111
}
112112

113113
@Override
114-
public <K> void remove(Iterable<K> keys) throws NullPointerException {
115-
keys.forEach(this::remove);
114+
public <K> void delete(Iterable<K> keys) throws NullPointerException {
115+
keys.forEach(this::delete);
116116
}
117117

118118
@Override

‎dynamodb-driver/src/test/java/org/eclipse/jnosql/diana/dynamodb/keyvalue/DynamoDBKeyValueEntityManagerTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void shouldMultiGet() {
9898
public void shouldRemoveKey() {
9999
keyValueEntityManager.put(keyValueOtavio);
100100
assertTrue(keyValueEntityManager.get("otavio").isPresent());
101-
keyValueEntityManager.remove("otavio");
101+
keyValueEntityManager.delete("otavio");
102102
assertFalse(keyValueEntityManager.get("otavio").isPresent());
103103
}
104104

@@ -107,8 +107,9 @@ public void shouldRemoveMultiKey() {
107107
keyValueEntityManager.put(asList(keyValueSoro, keyValueOtavio));
108108
List<String> keys = asList("otavio", "soro");
109109
Iterable<Value> values = keyValueEntityManager.get(keys);
110-
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
111-
keyValueEntityManager.remove(keys);
110+
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class))
111+
.collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
112+
keyValueEntityManager.delete(keys);
112113
Iterable<Value> users = values;
113114
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
114115
}

‎hazelcast-driver/src/main/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/DefaultHazelcastBucketManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
8585
}
8686

8787
@Override
88-
public <K> void remove(K key) {
88+
public <K> void delete(K key) {
8989
map.remove(key);
9090
}
9191

9292
@Override
93-
public <K> void remove(Iterable<K> keys) {
94-
StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
93+
public <K> void delete(Iterable<K> keys) {
94+
StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
9595
}
9696

9797
@Override

‎hazelcast-driver/src/test/java/org/eclipse/jnosql/diana/hazelcast/keyvalue/HazelcastBucketManagerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void shouldRemoveKey() {
101101

102102
keyValueEntityManager.put(keyValueOtavio);
103103
assertTrue(keyValueEntityManager.get("otavio").isPresent());
104-
keyValueEntityManager.remove("otavio");
104+
keyValueEntityManager.delete("otavio");
105105
assertFalse(keyValueEntityManager.get("otavio").isPresent());
106106
}
107107

@@ -112,7 +112,7 @@ public void shouldRemoveMultiKey() {
112112
List<String> keys = asList("otavio", "soro");
113113
Iterable<Value> values = keyValueEntityManager.get(keys);
114114
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
115-
keyValueEntityManager.remove(keys);
115+
keyValueEntityManager.delete(keys);
116116
Iterable<Value> users = values;
117117
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
118118
}

‎infinispan-driver/src/main/java/org/eclipse/jnosql/diana/infinispan/keyvalue/InfinispanBucketManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
8080
}
8181

8282
@Override
83-
public <K> void remove(K key) {
83+
public <K> void delete(K key) {
8484
cache.remove(key);
8585
}
8686

8787
@Override
88-
public <K> void remove(Iterable<K> keys) {
89-
StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
88+
public <K> void delete(Iterable<K> keys) {
89+
StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
9090
}
9191

9292
@Override

‎memcached-driver/src/test/java/org/eclipse/jnosql/diana/memcached/keyvalue/MemcachedBucketManagerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void shouldRemoveKey() {
113113

114114
keyValueEntityManager.put(entityOtavio);
115115
assertTrue(keyValueEntityManager.get("otavio").isPresent());
116-
keyValueEntityManager.remove("otavio");
116+
keyValueEntityManager.delete("otavio");
117117
assertFalse(keyValueEntityManager.get("otavio").isPresent());
118118
}
119119

@@ -124,7 +124,7 @@ public void shouldRemoveMultiKey() {
124124
List<String> keys = asList("otavio", "soro");
125125
Iterable<Value> values = keyValueEntityManager.get(keys);
126126
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(otavio, soro));
127-
keyValueEntityManager.remove(keys);
127+
keyValueEntityManager.delete(keys);
128128
Iterable<Value> users = values;
129129
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
130130
}

‎riak-driver/src/main/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public <K> Iterable<Value> get(Iterable<K> keys) throws NullPointerException {
140140

141141

142142
@Override
143-
public <K> void remove(K key) throws NullPointerException {
143+
public <K> void delete(K key) throws NullPointerException {
144144

145145
DeleteValue deleteValue = createDeleteValue(nameSpace, key);
146146

@@ -152,8 +152,8 @@ public <K> void remove(K key) throws NullPointerException {
152152
}
153153

154154
@Override
155-
public <K> void remove(Iterable<K> keys) throws NullPointerException {
156-
StreamSupport.stream(keys.spliterator(), false).forEach(this::remove);
155+
public <K> void delete(Iterable<K> keys) throws NullPointerException {
156+
StreamSupport.stream(keys.spliterator(), false).forEach(this::delete);
157157
}
158158

159159
@Override

‎riak-driver/src/test/java/org/eclipse/jnosql/diana/riak/keyvalue/RiakBucketManagerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void shouldRemoveKey() {
100100

101101
keyValueEntityManager.put(keyValueOtavio);
102102
assertTrue(keyValueEntityManager.get("otavio").isPresent());
103-
keyValueEntityManager.remove("otavio");
103+
keyValueEntityManager.delete("otavio");
104104
assertFalse(keyValueEntityManager.get("otavio").isPresent());
105105
}
106106

@@ -111,7 +111,7 @@ public void shouldRemoveMultiKey() {
111111
List<String> keys = asList("otavio", "soro");
112112
Iterable<Value> values = keyValueEntityManager.get(keys);
113113
assertThat(StreamSupport.stream(values.spliterator(), false).map(value -> value.get(User.class)).collect(Collectors.toList()), containsInAnyOrder(userOtavio, userSoro));
114-
keyValueEntityManager.remove(keys);
114+
keyValueEntityManager.delete(keys);
115115
Iterable<Value> users = values;
116116
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
117117
}

0 commit comments

Comments
 (0)