fixed issue #7: clear call stack after executing batch request

Author: gschwab

src/main/java/com/arangodb/ArangoDriver.java

@@ -202,6 +202,7 @@ public void startBatchMode() throws ArangoException {
     if (this.httpManager.isBatchModeActive()) {
       throw new ArangoException("BatchMode is already active.");
     }
+    this.httpManager.emptyCallStack();
     this.httpManager.setBatchModeActive(true);
     this.createModuleDrivers(true);
 
@@ -414,15 +415,21 @@ public <T> T getBatchResponseByRequestId(String requestId) throws ArangoExceptio
       requestId);
     try {
       this.httpManager.setPreDefinedResponse(batchResponseEntity.getHttpResponseEntity());
-      return (T) batchResponseEntity
+
+      T result =  (T) batchResponseEntity
           .getInvocationObject()
           .getMethod()
           .invoke(
             batchResponseEntity.getInvocationObject().getArangoDriver(),
             batchResponseEntity.getInvocationObject().getArgs());
+      this.httpManager.setPreDefinedResponse(null);
+      return result;
     } catch (InvocationTargetException e) {
-      return (T) createEntity(batchResponseEntity.getHttpResponseEntity(), (Class) DefaultEntity.class);
+      T result = (T) createEntity(batchResponseEntity.getHttpResponseEntity(), (Class) DefaultEntity.class); 
+      this.httpManager.setPreDefinedResponse(null);
+      return result;
     } catch (Exception e) {
+      this.httpManager.setPreDefinedResponse(null);
       throw new ArangoException(e);
     }
   }
@@ -441,6 +448,8 @@ public void cancelBatchMode() throws ArangoException {
     }
     this.httpManager.setBatchModeActive(false);
     this.createModuleDrivers(false);
+    this.httpManager.emptyCallStack();
+    this.httpManager.setPreDefinedResponse(null);
   }
 
   /**

src/main/java/com/arangodb/http/BatchHttpManager.java

@@ -66,4 +66,8 @@ public boolean isBatchModeActive() {
     public void setBatchModeActive(boolean batchModeActive) {
       this.batchModeActive = batchModeActive;
     }
+    
+    public void emptyCallStack() {
+      this.callStack = new ArrayList<BatchPart>();
+    }
 }

src/main/java/com/arangodb/impl/InternalDocumentDriverImpl.java

@@ -123,7 +123,7 @@ public List<String> getDocuments(String database, String collectionName, boolean
         createEndpointUrl(baseUrl, database, "/_api/document"), 
         new MapBuilder("collection", collectionName).get()
         );
-    
+
     DocumentsEntity entity = createEntity(res, DocumentsEntity.class);
     List<String> documents = CollectionUtils.safety(entity.getDocuments());
 

src/test/java/com/arangodb/ArangoDriverBatchTest.java

@@ -18,6 +18,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import com.arangodb.ArangoConfigure;
@@ -37,6 +38,8 @@
  */
 public class ArangoDriverBatchTest extends BaseTest {
 
+  String colName = "unit_test_batchTest";
+
   public ArangoDriverBatchTest(ArangoConfigure configure, ArangoDriver driver) {
     super(configure, driver);
   }
@@ -45,16 +48,26 @@ public ArangoDriverBatchTest(ArangoConfigure configure, ArangoDriver driver) {
 
   @Before
   public void before() throws ArangoException {
-    for (String col: new String[]{"blub"}) {
-      try {
-        driver.deleteCollection(col);
-      } catch (ArangoException e) {
-      }
+    try {
+      driver.cancelBatchMode();
+    } catch (ArangoException e) {
+    }
+    try {
+      driver.deleteCollection(colName);
+    } catch (ArangoException e) {
     }
   }
 
   @After
   public void after() {
+    try {
+      driver.cancelBatchMode();
+    } catch (ArangoException e) {
+    }
+    try {
+      driver.deleteCollection(colName);
+    } catch (ArangoException e) {
+    }
   }
 
   @Test
@@ -86,14 +99,17 @@ public void test_StartCancelExecuteBatchMode() throws ArangoException {
     }
     assertThat(msg , is("BatchMode is not active."));
 
-
   }
 
-
-
   @Test
   public void test_execBatchMode() throws ArangoException {
 
+    try {
+      driver.truncateCollection("_aqlfunctions");
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
     driver.startBatchMode();
 
     BaseEntity res = driver.createAqlFunction(
@@ -116,13 +132,13 @@ public void test_execBatchMode() throws ArangoException {
 
     for (int i = 0; i < 10; i++) {
       TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
-      res = driver.createDocument("blub", value, true, false);
+      res = driver.createDocument(colName, value, true, false);
 
       assertThat(res.getStatusCode(), is(206));
       assertThat(res.getRequestId(), is("request" + (4 + i)));
     }
 
-    List<String> r = driver.getDocuments("blub");
+    List<String> r = driver.getDocuments(colName);
 
     DefaultEntity result = driver.executeBatch();
     DefaultEntity created = driver.getBatchResponseByRequestId("request1");
@@ -138,6 +154,43 @@ public void test_execBatchMode() throws ArangoException {
     List<String> documents =  driver.getBatchResponseByRequestId("request14");
     assertThat(documents.size(), is(10));
 
+    try {
+      driver.truncateCollection("_aqlfunctions");
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
+  }
+
+  @Test
+  public void test_execBatchMode_twice() throws ArangoException {
+
+    driver.startBatchMode();
+
+    BaseEntity res;
+
+    for (int i = 0; i < 10; i++) {
+      TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
+      res = driver.createDocument(colName, value, true, false);
+      assertThat(res.getRequestId(), is("request" + (i + 1)));
+    }
+
+    driver.executeBatch();
+
+    assertThat(driver.getDocuments(colName).size(), is(10));
+
+    driver.startBatchMode();
+
+    for (int i = 20; i < 30; i++) {
+      TestComplexEntity01 value = new TestComplexEntity01("user-" + i, "data:" + i, i);
+      res = driver.createDocument(colName, value, true, false);
+      assertThat(res.getRequestId(), is("request" + (i + 1 - 20)));
+    }
+
+    driver.executeBatch();
+
+    assertThat(driver.getDocuments(colName).size(), is(20));
+
   }
 
 }