updates for ArangoDB 3.0.0

Author: a-brandt

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

@@ -3087,48 +3087,6 @@ public <T> ScalarExampleEntity<T> executeSimpleAny(String collectionName, Class<
 		return simpleDriver.executeSimpleAny(getDefaultDatabase(), collectionName, clazz);
 	}
 
-	/**
-	 * This will find all documents within a given range. In order to execute a
-	 * range query, a skip-list index on the queried attribute must be present.
-	 *
-	 * @param collectionName
-	 *            The collection name.
-	 * @param attribute
-	 *            The attribute path to check.
-	 * @param left
-	 *            The lower bound
-	 * @param right
-	 *            The upper bound
-	 * @param closed
-	 *            If true, use interval including left and right, otherwise
-	 *            exclude right, but include left.
-	 * @param skip
-	 *            The number of documents to skip in the query.
-	 * @param limit
-	 *            The maximal amount of documents to return. The skip is applied
-	 *            before the limit restriction.
-	 * @param clazz
-	 *            the expected class, the result from the server request is
-	 *            deserialized to an instance of this class.
-	 * @return a CursorEntity object
-	 * @throws ArangoException
-	 * @deprecated As of release 2.5.4, replaced by
-	 *             {@link #executeSimpleRangeWithDocuments(String, String, Object, Object, Boolean, int, int, Class)}
-	 */
-	@Deprecated
-	public <T> CursorEntity<T> executeSimpleRange(
-		String collectionName,
-		String attribute,
-		Object left,
-		Object right,
-		Boolean closed,
-		int skip,
-		int limit,
-		Class<T> clazz) throws ArangoException {
-		return simpleDriver.executeSimpleRange(getDefaultDatabase(), collectionName, attribute, left, right, closed,
-			skip, limit, clazz);
-	}
-
 	/**
 	 * This will find all documents within a given range. In order to execute a
 	 * range query, a skip-list index on the queried attribute must be present.

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

@@ -749,15 +749,13 @@ public DocumentEntity<?> deserialize(JsonElement json, Type typeOfT, JsonDeseria
 			Class<?> clazz = getParameterized();
 			if (clazz != null) {
 				entity.entity = context.deserialize(obj, clazz);
-				// if
-				// (clazz.getName().equalsIgnoreCase(BaseDocument.class.getName()))
-				// {
-				// // iterate all key/value pairs of the jsonObject and
-				// // determine its class(String, Number, Boolean, HashMap,
-				// // List)
-				// ((BaseDocument)
-				// entity.entity).setProperties(DeserializeSingleEntry.deserializeJsonObject(obj));
-				// }
+
+				if (clazz.getName().equalsIgnoreCase(BaseDocument.class.getName())) {
+					// iterate all key/value pairs of the jsonObject and
+					// determine its class(String, Number, Boolean, HashMap,
+					// List)
+					((BaseDocument) entity.entity).setProperties(DeserializeSingleEntry.deserializeJsonObject(obj));
+				}
 			}
 
 			return entity;

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

@@ -52,7 +52,6 @@
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -62,8 +61,8 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
 import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHeaderElementIterator;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
@@ -88,7 +87,7 @@ public class HttpManager {
 
 	private static Logger logger = LoggerFactory.getLogger(HttpManager.class);
 
-	private HttpClientConnectionManager cm;
+	private PoolingHttpClientConnectionManager cm;
 	private CloseableHttpClient client;
 
 	private ArangoConfigure configure;
@@ -125,10 +124,9 @@ public void init() {
 				.register("http", plainsf).register("https", sslsf).build();
 
 		// ConnectionManager
-		// cm = new PoolingHttpClientConnectionManager(r);
-		cm = new BasicHttpClientConnectionManager(r);
-		// cm.setDefaultMaxPerRoute(configure.getMaxPerConnection());
-		// cm.setMaxTotal(configure.getMaxTotalConnection());
+		cm = new PoolingHttpClientConnectionManager(r);
+		cm.setDefaultMaxPerRoute(configure.getMaxPerConnection());
+		cm.setMaxTotal(configure.getMaxTotalConnection());
 
 		Builder custom = RequestConfig.custom();
 

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

@@ -401,16 +401,7 @@ public void test_getDocuments() throws ArangoException {
 		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());
+		List<String> list = Arrays.asList(doc1.getDocumentHandle(), doc2.getDocumentHandle(), doc3.getDocumentHandle());
 
 		assertTrue(documents.containsAll(list));
 	}

src/test/java/com/arangodb/ArangoDriverSimpleTest.java

@@ -71,7 +71,6 @@ public void setup() throws ArangoException {
 			driver.createCollection(COLLECTION_NAME);
 		} catch (ArangoException e) {
 		}
-		driver.truncateCollection(COLLECTION_NAME);
 
 		// add some test data
 		for (int i = 0; i < 100; i++) {
@@ -105,52 +104,6 @@ public void test_simple_all() throws ArangoException {
 		assertThat(count, is(100));
 	}
 
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_simple_all_deprecated() throws ArangoException {
-
-		CursorResultSet<TestComplexEntity01> rs = driver.executeSimpleAllWithResultSet(COLLECTION_NAME, 0, 0,
-			TestComplexEntity01.class);
-		int count = 0;
-		while (rs.hasNext()) {
-			TestComplexEntity01 entity = rs.next();
-			count++;
-
-			assertThat(entity, is(notNullValue()));
-		}
-		rs.close();
-
-		assertThat(count, is(100));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_simple_all_with_doc_deprecated() throws ArangoException {
-
-		CursorResultSet<DocumentEntity<TestComplexEntity01>> rs = driver
-				.executeSimpleAllWithDocumentResultSet(COLLECTION_NAME, 0, 0, TestComplexEntity01.class);
-		int count = 0;
-		int ageCount = 0;
-		while (rs.hasNext()) {
-			DocumentEntity<TestComplexEntity01> doc = rs.next();
-			count++;
-
-			assertThat(doc, is(notNullValue()));
-			assertThat(doc.getDocumentHandle(), startsWith(COLLECTION_NAME));
-			assertThat(doc.getDocumentKey(), is(notNullValue()));
-			assertThat(doc.getDocumentRevision(), is(not(0L)));
-
-			if (doc.getEntity().getAge() != 0) {
-				ageCount++;
-			}
-		}
-		rs.close();
-
-		assertThat(count, is(100));
-		assertThat(ageCount, is(99));
-
-	}
-
 	@Test
 	public void test_example_by() throws ArangoException {
 
@@ -168,48 +121,6 @@ public void test_example_by() throws ArangoException {
 		assertThat(count, is(10));
 	}
 
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_example_by_deprecated() throws ArangoException {
-
-		CursorResultSet<TestComplexEntity01> rs = driver.executeSimpleByExampleWithResusltSet(COLLECTION_NAME,
-			new MapBuilder().put("user", "user_6").get(), 0, 0, TestComplexEntity01.class);
-		int count = 0;
-		while (rs.hasNext()) {
-			TestComplexEntity01 entity = rs.next();
-			count++;
-
-			assertThat(entity.getUser(), is("user_6"));
-		}
-		rs.close();
-
-		assertThat(count, is(10));
-
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_example_by_with_doc_deprecated() throws ArangoException {
-
-		CursorResultSet<DocumentEntity<TestComplexEntity01>> rs = driver.executeSimpleByExampleWithDocumentResusltSet(
-			COLLECTION_NAME, new MapBuilder().put("user", "user_6").get(), 0, 0, TestComplexEntity01.class);
-		int count = 0;
-		while (rs.hasNext()) {
-			DocumentEntity<TestComplexEntity01> doc = rs.next();
-			count++;
-
-			assertThat(doc.getDocumentHandle(), startsWith(COLLECTION_NAME));
-			assertThat(doc.getDocumentKey(), is(notNullValue()));
-			assertThat(doc.getDocumentRevision(), is(not(0L)));
-
-			assertThat(doc.getEntity().getUser(), is("user_6"));
-		}
-		rs.close();
-
-		assertThat(count, is(10));
-
-	}
-
 	@Test
 	public void test_first_example() throws ArangoException {
 
@@ -263,22 +174,6 @@ public void test_range_no_skiplist() throws ArangoException {
 
 	}
 
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_range_no_skiplist_deprecated() throws ArangoException {
-
-		// no suitable index known
-		try {
-			driver.executeSimpleRangeWithResultSet(COLLECTION_NAME, "age", 5, 30, null, 0, 0,
-				TestComplexEntity01.class);
-			fail("request should fail");
-		} catch (ArangoException e) {
-			assertThat(e.getErrorNumber(), is(1209));
-			assertThat(e.getCode(), is(404));
-		}
-
-	}
-
 	@Test
 	public void test_range() throws ArangoException {
 
@@ -317,90 +212,6 @@ public void test_range() throws ArangoException {
 
 	}
 
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_range_deprecated() throws ArangoException {
-
-		// create skip-list
-		driver.createIndex(COLLECTION_NAME, IndexType.SKIPLIST, false, "age");
-
-		{
-			CursorResultSet<TestComplexEntity01> rs = driver.executeSimpleRangeWithResultSet(COLLECTION_NAME, "age", 5,
-				30, null, 0, 0, TestComplexEntity01.class);
-
-			int count = 0;
-			while (rs.hasNext()) {
-				TestComplexEntity01 entity = rs.next();
-				count++;
-				assertThat(entity, is(notNullValue()));
-			}
-			rs.close();
-			assertThat(count, is(25));
-		}
-
-		{
-			CursorResultSet<TestComplexEntity01> rs = driver.executeSimpleRangeWithResultSet(COLLECTION_NAME, "age", 5,
-				30, true, 0, 0, TestComplexEntity01.class);
-
-			int count = 0;
-			while (rs.hasNext()) {
-				TestComplexEntity01 entity = rs.next();
-				count++;
-				assertThat(entity, is(notNullValue()));
-			}
-			rs.close();
-			assertThat(count, is(26));
-		}
-
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void test_range_with_doc_deprecated() throws ArangoException {
-
-		// create skip-list
-		driver.createIndex(COLLECTION_NAME, IndexType.SKIPLIST, false, "age");
-
-		{
-			CursorResultSet<DocumentEntity<TestComplexEntity01>> rs = driver.executeSimpleRangeWithDocumentResultSet(
-				COLLECTION_NAME, "age", 5, 30, null, 0, 0, TestComplexEntity01.class);
-
-			int count = 0;
-			while (rs.hasNext()) {
-				DocumentEntity<TestComplexEntity01> doc = rs.next();
-				count++;
-				assertThat(doc, is(notNullValue()));
-				assertThat(doc.getDocumentHandle(), startsWith(COLLECTION_NAME));
-				assertThat(doc.getDocumentKey(), is(notNullValue()));
-				assertThat(doc.getDocumentRevision(), is(not(0L)));
-				assertThat(doc.getEntity(), is(notNullValue()));
-				assertThat(doc.getEntity().getAge(), is(not(0)));
-			}
-			rs.close();
-			assertThat(count, is(25));
-		}
-
-		{
-			CursorResultSet<DocumentEntity<TestComplexEntity01>> rs = driver.executeSimpleRangeWithDocumentResultSet(
-				COLLECTION_NAME, "age", 5, 30, true, 0, 0, TestComplexEntity01.class);
-
-			int count = 0;
-			while (rs.hasNext()) {
-				DocumentEntity<TestComplexEntity01> doc = rs.next();
-				count++;
-				assertThat(doc, is(notNullValue()));
-				assertThat(doc.getDocumentHandle(), startsWith(COLLECTION_NAME));
-				assertThat(doc.getDocumentKey(), is(notNullValue()));
-				assertThat(doc.getDocumentRevision(), is(not(0L)));
-				assertThat(doc.getEntity(), is(notNullValue()));
-				assertThat(doc.getEntity().getAge(), is(not(0)));
-			}
-			rs.close();
-			assertThat(count, is(26));
-		}
-
-	}
-
 	@Test
 	public void test_remove_by_example() throws ArangoException {
 

src/test/java/com/arangodb/ArangoDriverTransactionTest.java

@@ -32,6 +32,8 @@
  */
 public class ArangoDriverTransactionTest extends BaseTest {
 
+	private static final String SOME_COLLECTION = "someCollection";
+
 	public class ParamObject {
 		private String a = "a";
 
@@ -70,15 +72,13 @@ public ArangoDriverTransactionTest(ArangoConfigure configure, ArangoDriver drive
 
 	@Before
 	public void setup() throws ArangoException {
-		TestComplexEntity01 value = new TestComplexEntity01("user-" + 9999, "desc:" + 9999, 9999);
-		driver.createDocument("someCollection", value, true, false);
 		try {
-			driver.deleteCollection("someCollection");
+			driver.deleteCollection(SOME_COLLECTION);
 		} catch (ArangoException e) {
 
 		}
 		try {
-			driver.createCollection("someCollection");
+			driver.createCollection(SOME_COLLECTION);
 		} catch (ArangoException e) {
 
 		}
@@ -87,7 +87,7 @@ public void setup() throws ArangoException {
 	@After
 	public void teardown() throws ArangoException {
 		try {
-			driver.deleteCollection("someCollection");
+			driver.deleteCollection(SOME_COLLECTION);
 		} catch (ArangoException e) {
 
 		}
@@ -107,7 +107,7 @@ public void test_Transaction() throws ArangoException {
 
 		transaction = driver.createTransaction("function (params) {" + "var db = require('internal').db;"
 				+ "return db.someCollection.all().toArray()[0];" + "}");
-		transaction.addReadCollection("someCollection");
+		transaction.addReadCollection(SOME_COLLECTION);
 		result = driver.executeTransaction(transaction);
 
 		assertThat(result.getStatusCode(), is(200));