fixed issue 42: ArangoDriver.getAqlFunctions(String) does not uses the

defaultDatabase setting

Author: Mark

ChangeLog

@@ -1,3 +1,8 @@
+v3.0.1 (2016-07-08)
+---------------------------
+* added flag complete and details in ImportOptions
+* fixed issue #43 (ArangoDriver.getAqlFunctions(String) does not uses the defaultDatabase setting)
+
 v3.0.0 (2016-06-17)
 ---------------------------
 * removed ArangoDriver.EdgeEntity() (/_api/edge withdrawn in Server)

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

@@ -4596,7 +4596,7 @@ public <V, E> ShortestPathEntity<V, E> graphGetShortestPath(
 	 * @throws ArangoException
 	 */
 	public DefaultEntity createAqlFunction(final String name, final String code) throws ArangoException {
-		return aqlFunctionsDriver.createAqlFunction(name, code);
+		return aqlFunctionsDriver.createAqlFunction(getDefaultDatabase(), name, code);
 	}
 
 	/**
@@ -4608,7 +4608,7 @@ public DefaultEntity createAqlFunction(final String name, final String code) thr
 	 * @throws ArangoException
 	 */
 	public AqlFunctionsEntity getAqlFunctions(final String namespace) throws ArangoException {
-		return aqlFunctionsDriver.getAqlFunctions(namespace);
+		return aqlFunctionsDriver.getAqlFunctions(getDefaultDatabase(), namespace);
 	}
 
 	/**
@@ -4623,7 +4623,7 @@ public AqlFunctionsEntity getAqlFunctions(final String namespace) throws ArangoE
 	 * @throws ArangoException
 	 */
 	public DefaultEntity deleteAqlFunction(final String name, final boolean isNameSpace) throws ArangoException {
-		return aqlFunctionsDriver.deleteAqlFunction(name, isNameSpace);
+		return aqlFunctionsDriver.deleteAqlFunction(getDefaultDatabase(), name, isNameSpace);
 	}
 
 	/**

src/main/java/com/arangodb/InternalAqlFunctionsDriver.java

@@ -7,10 +7,10 @@
 /**
  * Created by fbartels on 10/27/14.
  */
-public interface InternalAqlFunctionsDriver  extends BaseDriverInterface {
-  DefaultEntity createAqlFunction(String name, String code) throws ArangoException;
+public interface InternalAqlFunctionsDriver extends BaseDriverInterface {
+	DefaultEntity createAqlFunction(String database, String name, String code) throws ArangoException;
 
-  AqlFunctionsEntity getAqlFunctions(String namespace) throws ArangoException;
+	AqlFunctionsEntity getAqlFunctions(String database, String namespace) throws ArangoException;
 
-  DefaultEntity deleteAqlFunction(String name, boolean isNameSpace) throws ArangoException;
+	DefaultEntity deleteAqlFunction(String database, String name, boolean isNameSpace) throws ArangoException;
 }

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

@@ -39,30 +39,28 @@ public class InternalAqlFunctionsDriverImpl extends BaseArangoDriverImpl
 	}
 
 	@Override
-	public DefaultEntity createAqlFunction(String name, String code) throws ArangoException {
-		HttpResponseEntity res = httpManager.doPost(
-			createEndpointUrl(configure.getDefaultDatabase(), API_AQLFUNCTION), null,
+	public DefaultEntity createAqlFunction(String database, String name, String code) throws ArangoException {
+		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, API_AQLFUNCTION), null,
 			EntityFactory.toJsonString(new MapBuilder().put("name", name).put("code", code).get()));
 		return createEntity(res, DefaultEntity.class, null, false);
 	}
 
 	@Override
-	public AqlFunctionsEntity getAqlFunctions(String namespace) throws ArangoException {
+	public AqlFunctionsEntity getAqlFunctions(String database, String namespace) throws ArangoException {
 
 		String appendix = "";
 		if (namespace != null) {
 			appendix = "?namespace=" + namespace;
 		}
-		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(null, API_AQLFUNCTION + appendix));
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, API_AQLFUNCTION + appendix));
 		return createEntity(res, AqlFunctionsEntity.class);
 
 	}
 
 	@Override
-	public DefaultEntity deleteAqlFunction(String name, boolean isNameSpace) throws ArangoException {
+	public DefaultEntity deleteAqlFunction(String database, String name, boolean isNameSpace) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doDelete(
-			createEndpointUrl(configure.getDefaultDatabase(), API_AQLFUNCTION, name),
+		HttpResponseEntity res = httpManager.doDelete(createEndpointUrl(database, API_AQLFUNCTION, name),
 			new MapBuilder().put("group", isNameSpace).get());
 
 		return createEntity(res, DefaultEntity.class);

src/test/java/com/arangodb/ArangoDriverAqlfunctionsTest.java

@@ -24,10 +24,12 @@
 import java.util.Iterator;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.arangodb.entity.AqlFunctionsEntity;
+import com.arangodb.entity.CollectionEntity;
 import com.arangodb.entity.DefaultEntity;
 
 /**
@@ -51,6 +53,10 @@ public void after() {
 
 	@Test
 	public void test_AqlFunctions() throws ArangoException {
+		{
+			final CollectionEntity count = driver.getCollectionCount("_aqlfunctions");
+			Assert.assertEquals(0, count.getCount());
+		}
 
 		DefaultEntity res = driver.createAqlFunction("someNamespace::testCode",
 			"function (celsius) { return celsius * 2.8 + 32; }");
@@ -74,6 +80,11 @@ public void test_AqlFunctions() throws ArangoException {
 		assertThat(res.getCode(), is(201));
 		assertThat(res.getErrorMessage(), is((String) null));
 
+		{
+			final CollectionEntity count = driver.getCollectionCount("_aqlfunctions");
+			Assert.assertEquals(3, count.getCount());
+		}
+
 		AqlFunctionsEntity r = driver.getAqlFunctions(null);
 		assertThat(r.size(), is(3));
 		assertTrue(r.getAqlFunctions().keySet().contains("anotherNamespace::testCode"));