overwriteMode conflict and ignore

Author: rashtao

ChangeLog.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+- support `overwriteMode` values `ignore` and `conflict` (ArangoDB v3.7)
+
 ## [6.6.3] - 2020-05-06
 
 - velocypack v2.3.1

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

@@ -25,7 +25,10 @@
  * @author Michele Rastelli
  */
 public enum OverwriteMode {
-    replace("replace"), update("update");
+    ignore("ignore"),
+    replace("replace"),
+    update("update"),
+    conflict("conflict");
 
     private final String value;
 

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

@@ -158,6 +158,43 @@ public void insertDocumentOverwriteReturnOld() {
         assertThat(collection.count().getCount(), is(initialCount + 1L));
     }
 
+    @Test
+    public void insertDocumentOverwriteModeIgnore() {
+        assumeTrue(isAtLeastVersion(3, 7));
+
+        String key = "key-" + UUID.randomUUID().toString();
+        final BaseDocument doc = new BaseDocument(key);
+        doc.addAttribute("foo", "a");
+        final DocumentCreateEntity<BaseDocument> meta = collection.insertDocument(doc);
+
+        final BaseDocument doc2 = new BaseDocument(key);
+        doc2.addAttribute("bar", "b");
+        final DocumentCreateEntity<BaseDocument> insertIgnore = collection
+                .insertDocument(doc2, new DocumentCreateOptions().overwriteMode(OverwriteMode.ignore));
+
+        assertThat(insertIgnore, is(notNullValue()));
+        assertThat(insertIgnore.getRev(), is(meta.getRev()));
+    }
+
+    @Test
+    public void insertDocumentOverwriteModeConflict() {
+        assumeTrue(isAtLeastVersion(3, 7));
+
+        String key = "key-" + UUID.randomUUID().toString();
+        final BaseDocument doc = new BaseDocument(key);
+        doc.addAttribute("foo", "a");
+        final DocumentCreateEntity<BaseDocument> meta = collection.insertDocument(doc);
+
+        final BaseDocument doc2 = new BaseDocument(key);
+        try {
+            collection.insertDocument(doc2, new DocumentCreateOptions().overwriteMode(OverwriteMode.conflict));
+            fail();
+        } catch (ArangoDBException e) {
+            assertThat(e.getResponseCode(), is(409));
+            assertThat(e.getErrorNum(), is(1210));
+        }
+    }
+
     @Test
     public void insertDocumentOverwriteModeReplace() {
         assumeTrue(isAtLeastVersion(3, 7));