Skip to content

Commit e5a860c

Browse files
rashtaorashtao
committed
typed ArangoCollection#updateDocuments
1 parent e3adc90 commit e5a860c

File tree

6 files changed

+26
-28
lines changed

6 files changed

+26
-28
lines changed

‎src/main/java/com/arangodb/ArangoCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ <T, U> DocumentUpdateEntity<U> updateDocument(String key, T value, DocumentUpdat
372372
* @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#update-documents">API
373373
* Documentation</a>
374374
*/
375-
<T> MultiDocumentEntity<DocumentUpdateEntity<T>> updateDocuments(Collection<T> values) throws ArangoDBException;
375+
MultiDocumentEntity<DocumentUpdateEntity<Void>> updateDocuments(Collection<?> values) throws ArangoDBException;
376376

377377
/**
378378
* Partially updates documents, the documents to update are specified by the _key attributes in the objects on

‎src/main/java/com/arangodb/async/ArangoCollectionAsync.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ <T, U> CompletableFuture<DocumentUpdateEntity<U>> updateDocument(
342342
* @see <a href="https://www.arangodb.com/docs/stable/http/document-working-with-documents.html#update-documents">API
343343
* Documentation</a>
344344
*/
345-
<T> CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<T>>> updateDocuments(final Collection<T> values);
345+
CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<Void>>> updateDocuments(final Collection<?> values);
346346

347347
/**
348348
* Partially updates documents, the documents to update are specified by the _key attributes in the objects on

‎src/main/java/com/arangodb/async/internal/ArangoCollectionAsyncImpl.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,27 +206,26 @@ public <T, U> CompletableFuture<DocumentUpdateEntity<U>> updateDocument(
206206
}
207207

208208
@Override
209-
public <T> CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<T>>> updateDocuments(
210-
final Collection<T> values) {
211-
return updateDocuments(values, new DocumentUpdateOptions());
209+
public CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<Void>>> updateDocuments(
210+
final Collection<?> values) {
211+
return updateDocuments(values, new DocumentUpdateOptions(), Void.class);
212212
}
213213

214214
@Override
215215
@SuppressWarnings("unchecked")
216216
public <T> CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<T>>> updateDocuments(
217217
final Collection<T> values,
218218
final DocumentUpdateOptions options) {
219-
return updateDocuments(values, options, values.isEmpty() ? null : (Class<T>) getCollectionContentClass(values));
219+
return updateDocuments(values, options, (Class<T>) getCollectionContentClass(values));
220220
}
221221

222222
@Override
223223
public <T, U> CompletableFuture<MultiDocumentEntity<DocumentUpdateEntity<U>>> updateDocuments(
224224
final Collection<T> values,
225225
final DocumentUpdateOptions options,
226226
final Class<U> returnType) {
227-
final DocumentUpdateOptions params = (options != null ? options : new DocumentUpdateOptions());
228-
return executor.execute(updateDocumentsRequest(values, params),
229-
updateDocumentsResponseDeserializer(returnType));
227+
return executor
228+
.execute(updateDocumentsRequest(values, options), updateDocumentsResponseDeserializer(returnType));
230229
}
231230

232231
@Override

‎src/main/java/com/arangodb/internal/ArangoCollectionImpl.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,24 +201,23 @@ public <T, U> DocumentUpdateEntity<U> updateDocument(
201201
}
202202

203203
@Override
204-
public <T> MultiDocumentEntity<DocumentUpdateEntity<T>> updateDocuments(final Collection<T> values)
204+
public MultiDocumentEntity<DocumentUpdateEntity<Void>> updateDocuments(final Collection<?> values)
205205
throws ArangoDBException {
206-
return updateDocuments(values, new DocumentUpdateOptions());
206+
return updateDocuments(values, new DocumentUpdateOptions(), Void.class);
207207
}
208208

209209
@Override
210210
@SuppressWarnings("unchecked")
211211
public <T> MultiDocumentEntity<DocumentUpdateEntity<T>> updateDocuments(
212212
final Collection<T> values, final DocumentUpdateOptions options) throws ArangoDBException {
213-
return updateDocuments(values, options, values.isEmpty() ? null : (Class<T>) getCollectionContentClass(values));
213+
return updateDocuments(values, options, (Class<T>) getCollectionContentClass(values));
214214
}
215215

216216
@Override
217217
public <T, U> MultiDocumentEntity<DocumentUpdateEntity<U>> updateDocuments(
218218
final Collection<T> values, final DocumentUpdateOptions options, final Class<U> returnType) throws ArangoDBException {
219-
final DocumentUpdateOptions params = (options != null ? options : new DocumentUpdateOptions());
220219
return executor
221-
.execute(updateDocumentsRequest(values, params), updateDocumentsResponseDeserializer(returnType));
220+
.execute(updateDocumentsRequest(values, options), updateDocumentsResponseDeserializer(returnType));
222221
}
223222

224223
@Override

‎src/test/java/com/arangodb/ArangoCollectionTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2469,7 +2469,7 @@ void updateDocuments(ArangoCollection collection) {
24692469
collection.insertDocuments(values);
24702470
values.forEach(it -> it.addAttribute("a", "test"));
24712471

2472-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(values, null);
2472+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(values);
24732473
assertThat(updateResult.getDocuments()).hasSize(2);
24742474
assertThat(updateResult.getErrors()).isEmpty();
24752475
}
@@ -2510,7 +2510,7 @@ void updateDocumentsOne(ArangoCollection collection) {
25102510
final BaseDocument first = values.iterator().next();
25112511
first.addAttribute("a", "test");
25122512
updatedValues.add(first);
2513-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(updatedValues, null);
2513+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
25142514
assertThat(updateResult.getDocuments()).hasSize(1);
25152515
assertThat(updateResult.getErrors()).isEmpty();
25162516
}
@@ -2519,7 +2519,7 @@ void updateDocumentsOne(ArangoCollection collection) {
25192519
@MethodSource("cols")
25202520
void updateDocumentsEmpty(ArangoCollection collection) {
25212521
final Collection<BaseDocument> values = new ArrayList<>();
2522-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(values, null);
2522+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(values);
25232523
assertThat(updateResult.getDocuments()).isEmpty();
25242524
assertThat(updateResult.getErrors()).isEmpty();
25252525
}
@@ -2538,7 +2538,7 @@ void updateDocumentsWithoutKey(ArangoCollection collection) {
25382538
updatedValues.add(i);
25392539
}
25402540
updatedValues.add(new BaseDocument());
2541-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(updatedValues, null);
2541+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
25422542
assertThat(updateResult.getDocuments()).hasSize(1);
25432543
assertThat(updateResult.getErrors()).hasSize(1);
25442544
}
@@ -2554,7 +2554,7 @@ void updateDocumentsJson(ArangoCollection collection) {
25542554
final Collection<RawJson> updatedValues = new ArrayList<>();
25552555
updatedValues.add(RawJson.of("{\"_key\":\"1\", \"foo\":\"bar\"}"));
25562556
updatedValues.add(RawJson.of("{\"_key\":\"2\", \"foo\":\"bar\"}"));
2557-
final MultiDocumentEntity<DocumentUpdateEntity<RawJson>> updateResult = collection.updateDocuments(updatedValues);
2557+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
25582558
assertThat(updateResult.getDocuments()).hasSize(2);
25592559
assertThat(updateResult.getErrors()).isEmpty();
25602560
}
@@ -2592,7 +2592,7 @@ void replaceDocumentsOne(ArangoCollection collection) {
25922592
final BaseDocument first = values.iterator().next();
25932593
first.addAttribute("a", "test");
25942594
updatedValues.add(first);
2595-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(updatedValues, null);
2595+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
25962596
assertThat(updateResult.getDocuments()).hasSize(1);
25972597
assertThat(updateResult.getErrors()).isEmpty();
25982598
}
@@ -2601,7 +2601,7 @@ void replaceDocumentsOne(ArangoCollection collection) {
26012601
@MethodSource("cols")
26022602
void replaceDocumentsEmpty(ArangoCollection collection) {
26032603
final Collection<BaseDocument> values = new ArrayList<>();
2604-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(values, null);
2604+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(values);
26052605
assertThat(updateResult.getDocuments()).isEmpty();
26062606
assertThat(updateResult.getErrors()).isEmpty();
26072607
}
@@ -2620,7 +2620,7 @@ void replaceDocumentsWithoutKey(ArangoCollection collection) {
26202620
updatedValues.add(i);
26212621
}
26222622
updatedValues.add(new BaseDocument());
2623-
final MultiDocumentEntity<DocumentUpdateEntity<BaseDocument>> updateResult = collection.updateDocuments(updatedValues, null);
2623+
final MultiDocumentEntity<?> updateResult = collection.updateDocuments(updatedValues);
26242624
assertThat(updateResult.getDocuments()).hasSize(1);
26252625
assertThat(updateResult.getErrors()).hasSize(1);
26262626
}

‎src/test/java/com/arangodb/async/ArangoCollectionTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@ void updateDocumentsOne() throws InterruptedException, ExecutionException {
21042104
final BaseDocument first = values.iterator().next();
21052105
first.addAttribute("a", "test");
21062106
updatedValues.add(first);
2107-
db.collection(COLLECTION_NAME).updateDocuments(updatedValues, null)
2107+
db.collection(COLLECTION_NAME).updateDocuments(updatedValues)
21082108
.whenComplete((updateResult, ex) -> {
21092109
assertThat(updateResult.getDocuments().size()).isEqualTo(1);
21102110
assertThat(updateResult.getErrors().size()).isEqualTo(0);
@@ -2115,7 +2115,7 @@ void updateDocumentsOne() throws InterruptedException, ExecutionException {
21152115
@Test
21162116
void updateDocumentsEmpty() throws InterruptedException, ExecutionException {
21172117
final Collection<BaseDocument> values = new ArrayList<>();
2118-
db.collection(COLLECTION_NAME).updateDocuments(values, null)
2118+
db.collection(COLLECTION_NAME).updateDocuments(values)
21192119
.whenComplete((updateResult, ex) -> {
21202120
assertThat(updateResult.getDocuments().size()).isEqualTo(0);
21212121
assertThat(updateResult.getErrors().size()).isEqualTo(0);
@@ -2136,7 +2136,7 @@ void updateDocumentsWithoutKey() throws InterruptedException, ExecutionException
21362136
updatedValues.add(i);
21372137
}
21382138
updatedValues.add(new BaseDocument());
2139-
db.collection(COLLECTION_NAME).updateDocuments(updatedValues, null)
2139+
db.collection(COLLECTION_NAME).updateDocuments(updatedValues)
21402140
.whenComplete((updateResult, ex) -> {
21412141
assertThat(updateResult.getDocuments().size()).isEqualTo(1);
21422142
assertThat(updateResult.getErrors().size()).isEqualTo(1);
@@ -2178,7 +2178,7 @@ void replaceDocumentsOne() throws InterruptedException, ExecutionException {
21782178
final BaseDocument first = values.iterator().next();
21792179
first.addAttribute("a", "test");
21802180
updatedValues.add(first);
2181-
db.collection(COLLECTION_NAME).updateDocuments(updatedValues, null)
2181+
db.collection(COLLECTION_NAME).updateDocuments(updatedValues)
21822182
.whenComplete((updateResult, ex) -> {
21832183
assertThat(updateResult.getDocuments().size()).isEqualTo(1);
21842184
assertThat(updateResult.getErrors().size()).isEqualTo(0);
@@ -2189,7 +2189,7 @@ void replaceDocumentsOne() throws InterruptedException, ExecutionException {
21892189
@Test
21902190
void replaceDocumentsEmpty() throws InterruptedException, ExecutionException {
21912191
final Collection<BaseDocument> values = new ArrayList<>();
2192-
db.collection(COLLECTION_NAME).updateDocuments(values, null)
2192+
db.collection(COLLECTION_NAME).updateDocuments(values)
21932193
.whenComplete((updateResult, ex) -> {
21942194
assertThat(updateResult.getDocuments().size()).isEqualTo(0);
21952195
assertThat(updateResult.getErrors().size()).isEqualTo(0);
@@ -2210,7 +2210,7 @@ void replaceDocumentsWithoutKey() throws InterruptedException, ExecutionExceptio
22102210
updatedValues.add(i);
22112211
}
22122212
updatedValues.add(new BaseDocument());
2213-
db.collection(COLLECTION_NAME).updateDocuments(updatedValues, null)
2213+
db.collection(COLLECTION_NAME).updateDocuments(updatedValues)
22142214
.whenComplete((updateResult, ex) -> {
22152215
assertThat(updateResult.getDocuments().size()).isEqualTo(1);
22162216
assertThat(updateResult.getErrors().size()).isEqualTo(1);

0 commit comments

Comments
 (0)