Add MultiDocumentEntity#documentsAndErrors

documentsAndErrors contains each successfully processes document and
each error in the same order they are processed.

Author: mpv1989

src/main/java/com/arangodb/entity/MultiDocumentEntity.java

@@ -30,11 +30,15 @@ public class MultiDocumentEntity<E> {
 
 	private Collection<E> documents;
 	private Collection<ErrorEntity> errors;
+	private Collection<Object> documentsAndErrors;
 
 	public MultiDocumentEntity() {
 		super();
 	}
 
+	/**
+	 * @return all successfully processed documents
+	 */
 	public Collection<E> getDocuments() {
 		return documents;
 	}
@@ -43,6 +47,9 @@ public void setDocuments(final Collection<E> documents) {
 		this.documents = documents;
 	}
 
+	/**
+	 * @return all errors
+	 */
 	public Collection<ErrorEntity> getErrors() {
 		return errors;
 	}
@@ -51,4 +58,15 @@ public void setErrors(final Collection<ErrorEntity> errors) {
 		this.errors = errors;
 	}
 
+	/**
+	 * @return all successfully processed documents and all errors in the same order they are processed
+	 */
+	public Collection<Object> getDocumentsAndErrors() {
+		return documentsAndErrors;
+	}
+
+	public void setDocumentsAndErrors(final Collection<Object> documentsAndErrors) {
+		this.documentsAndErrors = documentsAndErrors;
+	}
+
 }

src/main/java/com/arangodb/internal/InternalArangoCollection.java

@@ -144,22 +144,27 @@ public MultiDocumentEntity<DocumentCreateEntity<T>> deserialize(final Response r
 				final MultiDocumentEntity<DocumentCreateEntity<T>> multiDocument = new MultiDocumentEntity<DocumentCreateEntity<T>>();
 				final Collection<DocumentCreateEntity<T>> docs = new ArrayList<DocumentCreateEntity<T>>();
 				final Collection<ErrorEntity> errors = new ArrayList<ErrorEntity>();
+				final Collection<Object> documentsAndErrors = new ArrayList<Object>();
 				final VPackSlice body = response.getBody();
 				for (final Iterator<VPackSlice> iterator = body.arrayIterator(); iterator.hasNext();) {
 					final VPackSlice next = iterator.next();
 					if (next.get(ArangoDBConstants.ERROR).isTrue()) {
-						errors.add((ErrorEntity) util().deserialize(next, ErrorEntity.class));
+						final ErrorEntity error = (ErrorEntity) util().deserialize(next, ErrorEntity.class);
+						errors.add(error);
+						documentsAndErrors.add(error);
 					} else {
 						final DocumentCreateEntity<T> doc = util().deserialize(next, DocumentCreateEntity.class);
 						final VPackSlice newDoc = next.get(ArangoDBConstants.NEW);
 						if (newDoc.isObject()) {
 							doc.setNew((T) util().deserialize(newDoc, type));
 						}
 						docs.add(doc);
+						documentsAndErrors.add(doc);
 					}
 				}
 				multiDocument.setDocuments(docs);
 				multiDocument.setErrors(errors);
+				multiDocument.setDocumentsAndErrors(documentsAndErrors);
 				return multiDocument;
 			}
 		};
@@ -214,17 +219,23 @@ public MultiDocumentEntity<T> deserialize(final Response response) throws VPackE
 				final MultiDocumentEntity<T> multiDocument = new MultiDocumentEntity<T>();
 				final Collection<T> docs = new ArrayList<T>();
 				final Collection<ErrorEntity> errors = new ArrayList<ErrorEntity>();
+				final Collection<Object> documentsAndErrors = new ArrayList<Object>();
 				final VPackSlice body = response.getBody();
 				for (final Iterator<VPackSlice> iterator = body.arrayIterator(); iterator.hasNext();) {
 					final VPackSlice next = iterator.next();
 					if (next.get(ArangoDBConstants.ERROR).isTrue()) {
-						errors.add((ErrorEntity) util().deserialize(next, ErrorEntity.class));
+						final ErrorEntity error = (ErrorEntity) util().deserialize(next, ErrorEntity.class);
+						errors.add(error);
+						documentsAndErrors.add(error);
 					} else {
-						docs.add((T) util().deserialize(next, type));
+						final T doc = (T) util().deserialize(next, type);
+						docs.add(doc);
+						documentsAndErrors.add(doc);
 					}
 				}
 				multiDocument.setDocuments(docs);
 				multiDocument.setErrors(errors);
+				multiDocument.setDocumentsAndErrors(documentsAndErrors);
 				return multiDocument;
 			}
 		};
@@ -301,11 +312,14 @@ public MultiDocumentEntity<DocumentUpdateEntity<T>> deserialize(final Response r
 				final MultiDocumentEntity<DocumentUpdateEntity<T>> multiDocument = new MultiDocumentEntity<DocumentUpdateEntity<T>>();
 				final Collection<DocumentUpdateEntity<T>> docs = new ArrayList<DocumentUpdateEntity<T>>();
 				final Collection<ErrorEntity> errors = new ArrayList<ErrorEntity>();
+				final Collection<Object> documentsAndErrors = new ArrayList<Object>();
 				final VPackSlice body = response.getBody();
 				for (final Iterator<VPackSlice> iterator = body.arrayIterator(); iterator.hasNext();) {
 					final VPackSlice next = iterator.next();
 					if (next.get(ArangoDBConstants.ERROR).isTrue()) {
-						errors.add((ErrorEntity) util().deserialize(next, ErrorEntity.class));
+						final ErrorEntity error = (ErrorEntity) util().deserialize(next, ErrorEntity.class);
+						errors.add(error);
+						documentsAndErrors.add(error);
 					} else {
 						final DocumentUpdateEntity<T> doc = util().deserialize(next, DocumentUpdateEntity.class);
 						final VPackSlice newDoc = next.get(ArangoDBConstants.NEW);
@@ -317,10 +331,12 @@ public MultiDocumentEntity<DocumentUpdateEntity<T>> deserialize(final Response r
 							doc.setOld((T) util().deserialize(oldDoc, type));
 						}
 						docs.add(doc);
+						documentsAndErrors.add(doc);
 					}
 				}
 				multiDocument.setDocuments(docs);
 				multiDocument.setErrors(errors);
+				multiDocument.setDocumentsAndErrors(documentsAndErrors);
 				return multiDocument;
 			}
 		};
@@ -398,11 +414,14 @@ public MultiDocumentEntity<DocumentUpdateEntity<T>> deserialize(final Response r
 				final MultiDocumentEntity<DocumentUpdateEntity<T>> multiDocument = new MultiDocumentEntity<DocumentUpdateEntity<T>>();
 				final Collection<DocumentUpdateEntity<T>> docs = new ArrayList<DocumentUpdateEntity<T>>();
 				final Collection<ErrorEntity> errors = new ArrayList<ErrorEntity>();
+				final Collection<Object> documentsAndErrors = new ArrayList<Object>();
 				final VPackSlice body = response.getBody();
 				for (final Iterator<VPackSlice> iterator = body.arrayIterator(); iterator.hasNext();) {
 					final VPackSlice next = iterator.next();
 					if (next.get(ArangoDBConstants.ERROR).isTrue()) {
-						errors.add((ErrorEntity) util().deserialize(next, ErrorEntity.class));
+						final ErrorEntity error = (ErrorEntity) util().deserialize(next, ErrorEntity.class);
+						errors.add(error);
+						documentsAndErrors.add(error);
 					} else {
 						final DocumentUpdateEntity<T> doc = util().deserialize(next, DocumentUpdateEntity.class);
 						final VPackSlice newDoc = next.get(ArangoDBConstants.NEW);
@@ -414,10 +433,12 @@ public MultiDocumentEntity<DocumentUpdateEntity<T>> deserialize(final Response r
 							doc.setOld((T) util().deserialize(oldDoc, type));
 						}
 						docs.add(doc);
+						documentsAndErrors.add(doc);
 					}
 				}
 				multiDocument.setDocuments(docs);
 				multiDocument.setErrors(errors);
+				multiDocument.setDocumentsAndErrors(documentsAndErrors);
 				return multiDocument;
 			}
 		};
@@ -472,22 +493,27 @@ public MultiDocumentEntity<DocumentDeleteEntity<T>> deserialize(final Response r
 				final MultiDocumentEntity<DocumentDeleteEntity<T>> multiDocument = new MultiDocumentEntity<DocumentDeleteEntity<T>>();
 				final Collection<DocumentDeleteEntity<T>> docs = new ArrayList<DocumentDeleteEntity<T>>();
 				final Collection<ErrorEntity> errors = new ArrayList<ErrorEntity>();
+				final Collection<Object> documentsAndErrors = new ArrayList<Object>();
 				final VPackSlice body = response.getBody();
 				for (final Iterator<VPackSlice> iterator = body.arrayIterator(); iterator.hasNext();) {
 					final VPackSlice next = iterator.next();
 					if (next.get(ArangoDBConstants.ERROR).isTrue()) {
-						errors.add((ErrorEntity) util().deserialize(next, ErrorEntity.class));
+						final ErrorEntity error = (ErrorEntity) util().deserialize(next, ErrorEntity.class);
+						errors.add(error);
+						documentsAndErrors.add(error);
 					} else {
 						final DocumentDeleteEntity<T> doc = util().deserialize(next, DocumentDeleteEntity.class);
 						final VPackSlice oldDoc = next.get(ArangoDBConstants.OLD);
 						if (oldDoc.isObject()) {
 							doc.setOld((T) util().deserialize(oldDoc, type));
 						}
 						docs.add(doc);
+						documentsAndErrors.add(doc);
 					}
 				}
 				multiDocument.setDocuments(docs);
 				multiDocument.setErrors(errors);
+				multiDocument.setDocumentsAndErrors(documentsAndErrors);
 				return multiDocument;
 			}
 		};