added mergeObjects parameters for insert-update document

Author: rashtao

ChangeLog.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [6.7.0_PREVIEW_3.7.1-alpha.1] - 2020-05-??
 
+- added support of `mergeObjects` for insert document with `overwriteMode: update` (ArangoDB v3.7)
 - added support of `DisjointSmartGraphs` (ArangoDB v3.7)
 - added support of `ArangoSearchProperties` value `storedValues` (ArangoDB v3.7)
 - added support of `ArangoSearchProperties` value `primarySortCompression` (ArangoDB v3.7)

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

@@ -88,8 +88,11 @@ protected <T> Request insertDocumentRequest(final T value, final DocumentCreateO
         request.putQueryParam(SILENT, params.getSilent());
         request.putQueryParam(OVERWRITE, params.getOverwrite());
         request.putQueryParam(OVERWRITE_MODE, params.getOverwriteMode() != null ? params.getOverwriteMode().getValue() : null);
+        request.putQueryParam(MERGE_OBJECTS, params.getMergeObjects());
         request.putHeaderParam(TRANSACTION_ID, params.getStreamTransactionId());
+
         request.setBody(util(Serializer.CUSTOM).serialize(value));
+
         return request;
     }
 
@@ -125,7 +128,9 @@ protected <T> Request insertDocumentsRequest(final Collection<T> values, final D
         request.putQueryParam(SILENT, params.getSilent());
         request.putQueryParam(OVERWRITE, params.getOverwrite());
         request.putQueryParam(OVERWRITE_MODE, params.getOverwriteMode() != null ? params.getOverwriteMode().getValue() : null);
+        request.putQueryParam(MERGE_OBJECTS, params.getMergeObjects());
         request.putHeaderParam(TRANSACTION_ID, params.getStreamTransactionId());
+
         request.setBody(util(Serializer.CUSTOM)
                 .serialize(values, new ArangoSerializer.Options().serializeNullValues(false).stringAsJson(true)));
         return request;

src/main/java/com/arangodb/model/DocumentCreateOptions.java

@@ -35,6 +35,8 @@ public class DocumentCreateOptions {
     private OverwriteMode overwriteMode;
     private Boolean silent;
     private String streamTransactionId;
+    private Boolean mergeObjects;
+
 
     public DocumentCreateOptions() {
         super();
@@ -141,4 +143,20 @@ public DocumentCreateOptions streamTransactionId(final String streamTransactionI
         return this;
     }
 
+    public Boolean getMergeObjects() {
+        return mergeObjects;
+    }
+
+    /**
+     * @param mergeObjects Controls whether objects (not arrays) will be merged if present in both the existing and the patch
+     *                     document. If set to false, the value in the patch document will overwrite the existing document's
+     *                     value. If set to true, objects will be merged. The default is true.
+     * @return options
+     * @apiNote only considered if {@link this#overwriteMode} is set to {@link OverwriteMode#update}
+     */
+    public DocumentCreateOptions mergeObjects(Boolean mergeObjects) {
+        this.mergeObjects = mergeObjects;
+        return this;
+    }
+
 }

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

@@ -224,13 +224,35 @@ public void insertDocumentOverwriteModeUpdate() {
         final DocumentCreateEntity<BaseDocument> meta = collection.insertDocument(doc);
 
         doc.addAttribute("bar", "b");
-        final DocumentCreateEntity<BaseDocument> upsert = collection
+        final DocumentCreateEntity<BaseDocument> updated = collection
                 .insertDocument(doc, new DocumentCreateOptions().overwriteMode(OverwriteMode.update).returnNew(true));
 
-        assertThat(upsert, is(notNullValue()));
-        assertThat(upsert.getRev(), is(not(meta.getRev())));
-        assertThat(upsert.getNew().getAttribute("foo").toString(), is("a"));
-        assertThat(upsert.getNew().getAttribute("bar").toString(), is("b"));
+        assertThat(updated, is(notNullValue()));
+        assertThat(updated.getRev(), is(not(meta.getRev())));
+        assertThat(updated.getNew().getAttribute("foo").toString(), is("a"));
+        assertThat(updated.getNew().getAttribute("bar").toString(), is("b"));
+    }
+
+    @Test
+    public void insertDocumentOverwriteModeUpdateMergeObjectsFalse() {
+        assumeTrue(isAtLeastVersion(3, 7));
+
+        final BaseDocument doc = new BaseDocument();
+        Map<String, String> fieldA = Collections.singletonMap("a", "a");
+        doc.addAttribute("foo", fieldA);
+        final DocumentCreateEntity<BaseDocument> meta = collection.insertDocument(doc);
+
+        Map<String, String> fieldB = Collections.singletonMap("b", "b");
+        doc.addAttribute("foo", fieldB);
+        final DocumentCreateEntity<BaseDocument> updated = collection
+                .insertDocument(doc, new DocumentCreateOptions()
+                        .overwriteMode(OverwriteMode.update)
+                        .mergeObjects(false)
+                        .returnNew(true));
+
+        assertThat(updated, is(notNullValue()));
+        assertThat(updated.getRev(), is(not(meta.getRev())));
+        assertThat(updated.getNew().getAttribute("foo"), is(fieldB));
     }
 
     @Test