fixed issue #43 (ArangoDriver.getAqlFunctions(String) does not uses the

defaultDatabase setting)

Author: Mark

ChangeLog

@@ -1,6 +1,6 @@
-v2.7.5 (2016-XX-XX)
+v2.7.5 (2016-11-25)
 ---------------------------
-
+* fixed issue #43 (ArangoDriver.getAqlFunctions(String) does not uses the defaultDatabase setting)
 
 v2.7.4 (2016-04-15)
 ---------------------------

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

@@ -5365,7 +5365,7 @@ public <V, E> ShortestPathEntity<V, E> graphGetShortestPath(
 	 * @throws ArangoException
 	 */
 	public DefaultEntity createAqlFunction(String name, String code) throws ArangoException {
-		return aqlFunctionsDriver.createAqlFunction(name, code);
+		return aqlFunctionsDriver.createAqlFunction(getDefaultDatabase(), name, code);
 	}
 
 	/**
@@ -5377,7 +5377,7 @@ public DefaultEntity createAqlFunction(String name, String code) throws ArangoEx
 	 * @throws ArangoException
 	 */
 	public AqlFunctionsEntity getAqlFunctions(String namespace) throws ArangoException {
-		return aqlFunctionsDriver.getAqlFunctions(namespace);
+		return aqlFunctionsDriver.getAqlFunctions(getDefaultDatabase(), namespace);
 	}
 
 	/**
@@ -5392,7 +5392,7 @@ public AqlFunctionsEntity getAqlFunctions(String namespace) throws ArangoExcepti
 	 * @throws ArangoException
 	 */
 	public DefaultEntity deleteAqlFunction(String name, boolean isNameSpace) throws ArangoException {
-		return aqlFunctionsDriver.deleteAqlFunction(name, isNameSpace);
+		return aqlFunctionsDriver.deleteAqlFunction(getDefaultDatabase(), name, isNameSpace);
 	}
 
 	/**

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

@@ -8,9 +8,9 @@
  * Created by fbartels on 10/27/14.
  */
 public interface InternalAqlFunctionsDriver  extends BaseDriverInterface {
-  DefaultEntity createAqlFunction(String name, String code) throws ArangoException;
+  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,30 @@ public class InternalAqlFunctionsDriverImpl extends BaseArangoDriverImpl
 	}
 
 	@Override
-	public DefaultEntity createAqlFunction(String name, String code) throws ArangoException {
+	public DefaultEntity createAqlFunction(String database, String name, String code) throws ArangoException {
 		HttpResponseEntity res = httpManager.doPost(
-			createEndpointUrl(configure.getDefaultDatabase(), API_AQLFUNCTION), null,
+			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),
+			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;
 
 /**
@@ -57,6 +59,11 @@ public void after() {
   @Test
   public void test_AqlFunctions() throws ArangoException {
 
+	{
+		CollectionEntity count = driver.getCollectionCount("_aqlfunctions");
+		Assert.assertEquals(0, count.getCount());
+	}
+	  
     DefaultEntity res = driver.createAqlFunction(
       "someNamespace::testCode", "function (celsius) { return celsius * 2.8 + 32; }"
     );
@@ -83,6 +90,11 @@ public void test_AqlFunctions() throws ArangoException {
     assertThat(res.getCode(), is(201));
     assertThat(res.getErrorMessage(), is((String) null));
 
+    {
+    	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"));