added convenience methods (ArangoCollection.getIndex/ .deleteIndex)

Author: mpv1989

ChangeLog

@@ -1,6 +1,8 @@
 v4.1.11 (2017-03-xx)
 ---------------------------
 * added convenience methods (ArangoDatabase.arango(), ArangoCollection.db(), ArangoGraph.db())
+* added convenience methods (ArangoCollection.getIndex(String), .deleteIndex(key))
+* fixed exception handling in Connection (issue #110)
 
 v4.1.10 (2017-02-22)
 ---------------------------

src/main/java/com/arangodb/ArangoCollectionAsync.java

@@ -517,6 +517,30 @@ public CompletableFuture<Boolean> documentExists(final String key, final Documen
 		};
 	}
 
+	/**
+	 * Returns an index
+	 * 
+	 * @see <a href="https://docs.arangodb.com/current/HTTP/Indexes/WorkingWith.html#read-index">API Documentation</a>
+	 * @param id
+	 *            The index-handle
+	 * @return information about the index
+	 */
+	public CompletableFuture<IndexEntity> getIndex(final String id) {
+		return executor.execute(getIndexRequest(id), IndexEntity.class);
+	}
+
+	/**
+	 * Deletes an index
+	 * 
+	 * @see <a href="https://docs.arangodb.com/current/HTTP/Indexes/WorkingWith.html#delete-index">API Documentation</a>
+	 * @param id
+	 *            The index-handle
+	 * @return the id of the index
+	 */
+	public CompletableFuture<String> deleteIndex(final String id) {
+		return executor.execute(deleteIndexRequest(id), deleteIndexResponseDeserializer());
+	}
+
 	/**
 	 * Creates a hash index for the collection, if it does not already exist.
 	 * 

src/main/java/com/arangodb/ArangoDatabaseAsync.java

@@ -157,7 +157,9 @@ public CompletableFuture<Collection<CollectionEntity>> getCollections(final Coll
 	 * @return information about the index
 	 */
 	public CompletableFuture<IndexEntity> getIndex(final String id) {
-		return executor.execute(getIndexRequest(id), IndexEntity.class);
+		executor.validateIndexId(id);
+		final String[] split = id.split("/");
+		return collection(split[0]).getIndex(split[1]);
 	}
 
 	/**
@@ -169,7 +171,9 @@ public CompletableFuture<IndexEntity> getIndex(final String id) {
 	 * @return the id of the index
 	 */
 	public CompletableFuture<String> deleteIndex(final String id) {
-		return executor.execute(deleteIndexRequest(id), deleteIndexResponseDeserializer());
+		executor.validateIndexId(id);
+		final String[] split = id.split("/");
+		return collection(split[0]).deleteIndex(split[1]);
 	}
 
 	/**

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

@@ -20,14 +20,14 @@
 
 package com.arangodb;
 
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertThat;
@@ -733,6 +733,72 @@ public void deleteDocumentIfMatchFail() throws InterruptedException, ExecutionEx
 		}
 	}
 
+	@Test
+	public void getIndex() throws InterruptedException, ExecutionException {
+		final Collection<String> fields = new ArrayList<>();
+		fields.add("a");
+		final IndexEntity createResult = db.collection(COLLECTION_NAME).createHashIndex(fields, null).get();
+		final CompletableFuture<IndexEntity> f = db.collection(COLLECTION_NAME).getIndex(createResult.getId());
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((readResult, ex) -> {
+			assertThat(readResult.getId(), is(createResult.getId()));
+			assertThat(readResult.getType(), is(createResult.getType()));
+		});
+		f.get();
+	}
+
+	@Test
+	public void getIndexByKey() throws InterruptedException, ExecutionException {
+		final Collection<String> fields = new ArrayList<>();
+		fields.add("a");
+		final IndexEntity createResult = db.collection(COLLECTION_NAME).createHashIndex(fields, null).get();
+		final CompletableFuture<IndexEntity> f = db.collection(COLLECTION_NAME)
+				.getIndex(createResult.getId().split("/")[1]);
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((readResult, ex) -> {
+			assertThat(readResult.getId(), is(createResult.getId()));
+			assertThat(readResult.getType(), is(createResult.getType()));
+		});
+		f.get();
+	}
+
+	@Test
+	public void deleteIndex() throws InterruptedException, ExecutionException {
+		final Collection<String> fields = new ArrayList<>();
+		fields.add("a");
+		final IndexEntity createResult = db.collection(COLLECTION_NAME).createHashIndex(fields, null).get();
+		final CompletableFuture<String> f = db.collection(COLLECTION_NAME).deleteIndex(createResult.getId());
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((id, ex) -> {
+			assertThat(id, is(createResult.getId()));
+			try {
+				db.getIndex(id);
+				fail();
+			} catch (final ArangoDBException e) {
+			}
+		});
+		f.get();
+	}
+
+	@Test
+	public void deleteIndexByKey() throws InterruptedException, ExecutionException {
+		final Collection<String> fields = new ArrayList<>();
+		fields.add("a");
+		final IndexEntity createResult = db.collection(COLLECTION_NAME).createHashIndex(fields, null).get();
+		final CompletableFuture<String> f = db.collection(COLLECTION_NAME)
+				.deleteIndex(createResult.getId().split("/")[1]);
+		assertThat(f, is(notNullValue()));
+		f.whenComplete((id, ex) -> {
+			assertThat(id, is(createResult.getId()));
+			try {
+				db.getIndex(id);
+				fail();
+			} catch (final ArangoDBException e) {
+			}
+		});
+		f.get();
+	}
+
 	@Test
 	public void createHashIndex() throws InterruptedException, ExecutionException {
 		final Collection<String> fields = new ArrayList<>();