changes and fixes for ArangoDB 2.6

Author: a-brandt

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

@@ -31,7 +31,6 @@
 import com.arangodb.entity.BatchResponseEntity;
 import com.arangodb.entity.BooleanResultEntity;
 import com.arangodb.entity.CollectionEntity;
-import com.arangodb.entity.CollectionKeyOption;
 import com.arangodb.entity.CollectionOptions;
 import com.arangodb.entity.CollectionsEntity;
 import com.arangodb.entity.CursorEntity;
@@ -2115,7 +2114,8 @@ public CursorEntity<?> validateQuery(String query) throws ArangoException {
 	 * @param calcCount
 	 *            if set to true the result count is returned
 	 * @param batchSize
-	 *            the batch size of the result cursor
+	 *            the batch size of the result cursor (The batch size has to be
+	 *            greater than 0)
 	 * @param fullCount
 	 *            if set to true, then all results before the final LIMIT will
 	 *            be counted
@@ -2150,7 +2150,8 @@ public <T> CursorEntity<T> executeQuery(
 	 * @param calcCount
 	 *            if set to true the result count is returned
 	 * @param batchSize
-	 *            the batch size of the result cursor
+	 *            the batch size of the result cursor (The batch size has to be
+	 *            greater than 0)
 	 * @param <T>
 	 * @return <T> CursorEntity<T>
 	 * @throws ArangoException
@@ -2209,7 +2210,8 @@ public DefaultEntity finishQuery(long cursorId) throws ArangoException {
 	 * @param calcCount
 	 *            if set to true the result count is returned
 	 * @param batchSize
-	 *            the batch size of the result cursor
+	 *            the batch size of the result cursor (The batch size has to be
+	 *            greater than 0)
 	 * @param fullCount
 	 *            if set to true, then all results before the final LIMIT will
 	 *            be counted
@@ -2245,7 +2247,8 @@ public <T> CursorResultSet<T> executeQueryWithResultSet(
 	 * @param calcCount
 	 *            if set to true the result count is returned
 	 * @param batchSize
-	 *            the batch size of the result cursor
+	 *            the batch size of the result cursor (The batch size has to be
+	 *            greater than 0)
 	 * @return CursorResultSet<T>
 	 * @throws ArangoException
 	 * @Deprecated As of release 2.5.4, replaced by
@@ -2276,7 +2279,8 @@ public <T> CursorResultSet<T> executeQueryWithResultSet(
 	 * @param calcCount
 	 *            if set to true the result count is returned
 	 * @param batchSize
-	 *            the batch size of the result cursor
+	 *            the batch size of the result cursor (The batch size has to be
+	 *            greater than 0)
 	 * @param fullCount
 	 *            if set to true, then all results before the final LIMIT will
 	 *            be counted

src/main/java/com/arangodb/util/AqlQueryOptions.java

@@ -42,7 +42,8 @@ public AqlQueryOptions setCount(Boolean count) {
 	/**
 	 * maximum number of result documents to be transferred from the server to
 	 * the client in one roundtrip (optional). If this attribute is not set, a
-	 * server-controlled default value will be used.
+	 * server-controlled default value will be used. The batch size has to be
+	 * greater than 0.
 	 * 
 	 * @return maximum number of result documents
 	 */
@@ -53,7 +54,8 @@ public Integer getBatchSize() {
 	/**
 	 * maximum number of result documents to be transferred from the server to
 	 * the client in one roundtrip (optional). If this attribute is not set, a
-	 * server-controlled default value will be used.
+	 * server-controlled default value will be used. The batch size has to be
+	 * greater than 0.
 	 * 
 	 * @param batchSize
 	 *            maximum number of result documents

src/test/java/com/arangodb/ArangoDriverCursorTest.java

@@ -234,7 +234,7 @@ public void test_executeQueryUniqueResult() throws ArangoException {
 		// 全件とれる範囲
 		{
 			CursorEntity<TestComplexEntity01> result = driver.<TestComplexEntity01> executeQuery(query, bindVars,
-				TestComplexEntity01.class, true, 0);
+				TestComplexEntity01.class, true, 2);
 			assertThat(result.size(), is(2));
 			assertThat(result.getCount(), is(2));
 			String msg = "";
@@ -251,7 +251,7 @@ public void test_executeQueryUniqueResult() throws ArangoException {
 		query = "FOR t IN unit_test_query_test FILTER t.age == @age LIMIT 2 RETURN t";
 		{
 			CursorEntity<TestComplexEntity01> result = driver.<TestComplexEntity01> executeQuery(query, bindVars,
-				TestComplexEntity01.class, true, 0);
+				TestComplexEntity01.class, true, 2);
 			assertThat(result.size(), is(1));
 			assertThat(result.getCount(), is(1));
 			TestComplexEntity01 entity = result.getUniqueResult();

src/test/java/com/arangodb/ArangoDriverDocumentCursorEntityTest.java

@@ -188,7 +188,7 @@ public void test_executeQueryUniqueResult() throws ArangoException {
 
 		// 全件とれる範囲
 		{
-			CursorEntity<?> result = driver.executeCursorEntityQuery(query, bindVars, true, 0, false,
+			CursorEntity<?> result = driver.executeCursorEntityQuery(query, bindVars, true, 2, false,
 				DocumentEntity.class, TestComplexEntity01.class);
 			assertThat(result.size(), is(2));
 			assertThat(result.getCount(), is(2));
@@ -206,7 +206,7 @@ public void test_executeQueryUniqueResult() throws ArangoException {
 		query = "FOR t IN unit_test_query_test FILTER t.age == @age LIMIT 2 RETURN t";
 		{
 			CursorEntity<DocumentEntity<TestComplexEntity01>> result = driver.executeCursorEntityQuery(query, bindVars,
-				true, 0, false, DocumentEntity.class, TestComplexEntity01.class);
+				true, 2, false, DocumentEntity.class, TestComplexEntity01.class);
 			assertThat(result.size(), is(1));
 			assertThat(result.getCount(), is(1));
 			DocumentEntity<TestComplexEntity01> uniqueResult = result.getUniqueResult();

src/test/java/com/arangodb/ArangoDriverDocumentTest.java

@@ -21,12 +21,13 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.List;
 
 import org.junit.After;
 import org.junit.Before;
@@ -267,15 +268,22 @@ public void test_getDocuments() throws ArangoException {
 		assertThat(doc2, is(notNullValue()));
 		assertThat(doc3, is(notNullValue()));
 
-		//
-		Set<String> tree = new TreeSet<String>(Arrays.asList("/_api/document/" + doc1.getDocumentHandle(),
-			"/_api/document/" + doc2.getDocumentHandle(), "/_api/document/" + doc3.getDocumentHandle()));
-
 		// get documents
-		Set<String> docIds = new TreeSet<String>(driver.getDocuments(collectionName));
-		assertThat(docIds.size(), is(3));
+		List<String> documents = driver.getDocuments(collectionName);
+		assertEquals(3, documents.size());
+
+		String prefix;
+		if (documents.get(0).startsWith("/_db/")) {
+			// since ArangoDB 2.6
+			prefix = "/_db/" + DATABASE_NAME + "/_api/document/";
+		} else {
+			prefix = "/_api/document/";
+		}
+
+		List<String> list = Arrays.asList(prefix + doc1.getDocumentHandle(), prefix + doc2.getDocumentHandle(), prefix
+				+ doc3.getDocumentHandle());
 
-		assertThat(docIds, is(tree));
+		assertTrue(documents.containsAll(list));
 	}
 
 	@Test
@@ -292,15 +300,22 @@ public void test_getDocuments_handle() throws ArangoException {
 		assertThat(doc2, is(notNullValue()));
 		assertThat(doc3, is(notNullValue()));
 
-		//
-		Set<String> tree = new TreeSet<String>(Arrays.asList(doc1.getDocumentHandle(), doc2.getDocumentHandle(),
-			doc3.getDocumentHandle()));
-
 		// get documents
-		Set<String> docIds = new TreeSet<String>(driver.getDocuments(collectionName, true));
-		assertThat(docIds.size(), is(3));
-		assertThat(docIds, is(tree));
+		List<String> documents = driver.getDocuments(collectionName, true);
+		assertEquals(3, documents.size());
+
+		String prefix;
+		if (documents.get(0).startsWith("/_db/")) {
+			// since ArangoDB 2.6
+			prefix = "/_db/" + DATABASE_NAME + "/_api/document/";
+		} else {
+			prefix = "";
+		}
+
+		List<String> list = Arrays.asList(prefix + doc1.getDocumentHandle(), prefix + doc2.getDocumentHandle(), prefix
+				+ doc3.getDocumentHandle());
 
+		assertTrue(documents.containsAll(list));
 	}
 
 	@Test

src/test/java/com/arangodb/ArangoDriverEdgeTest.java

@@ -72,7 +72,7 @@ public void test_create_normal() throws ArangoException {
     DocumentEntity<TestComplexEntity01> toDoc = driver.createDocument(collectionName2, value, true, true);
 
     EdgeEntity<TestComplexEntity01> doc = driver.createEdge(
-        databaseName, 
+        DATABASE_NAME, 
         collectionName, 
         value, 
         fromDoc.getDocumentHandle(), 

src/test/java/com/arangodb/BaseTest.java

@@ -34,7 +34,7 @@
 public abstract class BaseTest {
 
 	protected static ArangoConfigure configure;
-	protected static final String databaseName = "unitTestDatabase";
+	protected static final String DATABASE_NAME = "unitTestDatabase";
 
 	// Suite.classを使った場合、Parametersがテストクラスの数だけ最初に一気に連続で呼ばれる。
 	// そのため、単純にクラス変数にconfigureを保持すると、AfterClassの時に別のテストケースのものを終了してしまう。
@@ -59,11 +59,11 @@ public static Collection<Object[]> getParameterizedDrivers() {
 		configure.setConnectRetryCount(2);
 		configure.init();
 		ArangoDriver driver = new ArangoDriver(configure);
-		ArangoDriver driverMDB = new ArangoDriver(configure, databaseName);
+		ArangoDriver driverMDB = new ArangoDriver(configure, DATABASE_NAME);
 
 		// create mydb
 		try {
-			driver.createDatabase(databaseName);
+			driver.createDatabase(DATABASE_NAME);
 		} catch (ArangoException e) {
 		}
 
@@ -85,7 +85,7 @@ public BaseTest(ArangoConfigure configure, ArangoDriver driver) {
 		BaseTest.configure = configure;
 
 		try {
-			driver.createDatabase(databaseName);
+			driver.createDatabase(DATABASE_NAME);
 		} catch (ArangoException e) {
 		}