fixes methods which does not use defaultdatabase

Mark · Mark · commit 8176c602e7b5 · 2016-11-25T10:53:19.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,11 @@
 v2.7.5 (2016-11-25)
 ---------------------------
 * fixed issue #43 (ArangoDriver.getAqlFunctions(String) does not uses the defaultDatabase setting)
+* fixed ArangoDriver.getCurrentDatabase() (does not use the defaultDatabase)
+* fixed ArangoDriver.deleteQueryCache() (does not use the defaultDatabase)
+* fixed ArangoDriver.getQueryCacheProperties() (does not use the defaultDatabase)
+* fixed ArangoDriver.setQueryCacheProperties() (does not use the defaultDatabase)
+* fixed ArangoDriver.reloadRouting() (does not use the defaultDatabase)
 
 v2.7.4 (2016-04-15)
 ---------------------------
diff --git a/src/main/java/com/arangodb/ArangoDriver.java b/src/main/java/com/arangodb/ArangoDriver.java
@@ -2856,7 +2856,7 @@ public ArangoUnixTime getTime() throws ArangoException {
 	 * @throws ArangoException
 	 */
 	public DefaultEntity reloadRouting() throws ArangoException {
-		return adminDriver.reloadRouting();
+		return adminDriver.reloadRouting(getDefaultDatabase());
 	}
 
 	/**
@@ -3850,7 +3850,7 @@ public ImportResultEntity importDocumentsByHeaderValues(
 	 * @throws ArangoException
 	 */
 	public DatabaseEntity getCurrentDatabase() throws ArangoException {
-		return databaseDriver.getCurrentDatabase();
+		return databaseDriver.getCurrentDatabase(getDefaultDatabase());
 	}
 
 	/**
@@ -5478,7 +5478,7 @@ public <V, E> TraversalEntity<V, E> getTraversal(
 	 * @throws ArangoException
 	 */
 	public DefaultEntity deleteQueryCache() throws ArangoException {
-		return queryCacheDriver.deleteQueryCache();
+		return queryCacheDriver.deleteQueryCache(getDefaultDatabase());
 	}
 
 	/**
@@ -5489,7 +5489,7 @@ public DefaultEntity deleteQueryCache() throws ArangoException {
 	 * @throws ArangoException
 	 */
 	public QueryCachePropertiesEntity getQueryCacheProperties() throws ArangoException {
-		return queryCacheDriver.getQueryCacheProperties();
+		return queryCacheDriver.getQueryCacheProperties(getDefaultDatabase());
 	}
 
 	/**
@@ -5500,7 +5500,7 @@ public QueryCachePropertiesEntity getQueryCacheProperties() throws ArangoExcepti
 	 */
 	public QueryCachePropertiesEntity setQueryCacheProperties(QueryCachePropertiesEntity properties)
 			throws ArangoException {
-		return queryCacheDriver.setQueryCacheProperties(properties);
+		return queryCacheDriver.setQueryCacheProperties(getDefaultDatabase(), properties);
 	}
 
 	/**
diff --git a/src/main/java/com/arangodb/InternalAdminDriver.java b/src/main/java/com/arangodb/InternalAdminDriver.java
@@ -35,7 +35,7 @@ AdminLogEntity getServerLog(
 
 	ArangoUnixTime getTime() throws ArangoException;
 
-	DefaultEntity reloadRouting() throws ArangoException;
+	DefaultEntity reloadRouting(String database) throws ArangoException;
 
 	DefaultEntity executeScript(String database, String jsCode) throws ArangoException;
 }
diff --git a/src/main/java/com/arangodb/InternalDatabaseDriver.java b/src/main/java/com/arangodb/InternalDatabaseDriver.java
@@ -10,7 +10,7 @@
  * Created by fbartels on 10/27/14.
  */
 public interface InternalDatabaseDriver  extends BaseDriverInterface {
-  DatabaseEntity getCurrentDatabase() throws ArangoException;
+  DatabaseEntity getCurrentDatabase(String database) throws ArangoException;
 
   StringsResultEntity getDatabases(boolean currentUserAccessableOnly, String username, String password) throws ArangoException;
 
diff --git a/src/main/java/com/arangodb/InternalQueryCacheDriver.java b/src/main/java/com/arangodb/InternalQueryCacheDriver.java
@@ -9,10 +9,10 @@
  */
 public interface InternalQueryCacheDriver extends BaseDriverInterface {
 
-	DefaultEntity deleteQueryCache() throws ArangoException;
+	DefaultEntity deleteQueryCache(String database) throws ArangoException;
 
-	QueryCachePropertiesEntity getQueryCacheProperties() throws ArangoException;
+	QueryCachePropertiesEntity getQueryCacheProperties(String database) throws ArangoException;
 
-	QueryCachePropertiesEntity setQueryCacheProperties(QueryCachePropertiesEntity properties) throws ArangoException;
+	QueryCachePropertiesEntity setQueryCacheProperties(String database, QueryCachePropertiesEntity properties) throws ArangoException;
 
 }
diff --git a/src/main/java/com/arangodb/impl/InternalAdminDriverImpl.java b/src/main/java/com/arangodb/impl/InternalAdminDriverImpl.java
@@ -114,9 +114,9 @@ public ArangoUnixTime getTime() throws ArangoException {
 	}
 
 	@Override
-	public DefaultEntity reloadRouting() throws ArangoException {
+	public DefaultEntity reloadRouting(String database) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(null, "/_admin/routing/reload"), null,
+		HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_admin/routing/reload"), null,
 			(String) null);
 
 		return createEntity(res, DefaultEntity.class, null, false);
diff --git a/src/main/java/com/arangodb/impl/InternalDatabaseDriverImpl.java b/src/main/java/com/arangodb/impl/InternalDatabaseDriverImpl.java
@@ -41,9 +41,9 @@ public class InternalDatabaseDriverImpl extends BaseArangoDriverImpl implements
 	}
 
 	@Override
-	public DatabaseEntity getCurrentDatabase() throws ArangoException {
+	public DatabaseEntity getCurrentDatabase(String database) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(null, "/_api/database/current"));
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/database/current"));
 		return createEntity(res, DatabaseEntity.class);
 
 	}
diff --git a/src/main/java/com/arangodb/impl/InternalQueryCacheDriverImpl.java b/src/main/java/com/arangodb/impl/InternalQueryCacheDriverImpl.java
@@ -36,27 +36,27 @@ public class InternalQueryCacheDriverImpl extends BaseArangoDriverImpl
 	}
 
 	@Override
-	public DefaultEntity deleteQueryCache() throws ArangoException {
+	public DefaultEntity deleteQueryCache(String database) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doDelete(createEndpointUrl(null, "/_api/query-cache"), null);
+		HttpResponseEntity res = httpManager.doDelete(createEndpointUrl(database, "/_api/query-cache"), null);
 
 		return createEntity(res, DefaultEntity.class);
 	}
 
 	@Override
-	public QueryCachePropertiesEntity getQueryCacheProperties() throws ArangoException {
+	public QueryCachePropertiesEntity getQueryCacheProperties(String database) throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(null, "/_api/query-cache"), null);
+		HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/query-cache"), null);
 
 		return createEntity(res, QueryCachePropertiesEntity.class);
 
 	}
 
 	@Override
-	public QueryCachePropertiesEntity setQueryCacheProperties(QueryCachePropertiesEntity properties)
+	public QueryCachePropertiesEntity setQueryCacheProperties(String database, QueryCachePropertiesEntity properties)
 			throws ArangoException {
 
-		HttpResponseEntity res = httpManager.doPut(createEndpointUrl(null, "/_api/query-cache/properties"), null,
+		HttpResponseEntity res = httpManager.doPut(createEndpointUrl(database, "/_api/query-cache/properties"), null,
 			EntityFactory.toJsonString(properties));
 
 		return createEntity(res, QueryCachePropertiesEntity.class);
diff --git a/src/test/java/com/arangodb/ArangoDriverDatabaseTest.java b/src/test/java/com/arangodb/ArangoDriverDatabaseTest.java
@@ -90,7 +90,7 @@ public void test_invalid_dbname_for_delete() throws ArangoException {
 
 	@Test
 	public void test_current_database() throws ArangoException {
-
+		driver.setDefaultDatabase("_system");
 		DatabaseEntity entity = driver.getCurrentDatabase();
 		assertThat(entity.isError(), is(false));
 		assertThat(entity.getCode(), is(200));
@@ -101,6 +101,23 @@ public void test_current_database() throws ArangoException {
 
 	}
 
+	@Test
+	public void test_current_database2() throws ArangoException {
+		final String dbName = "abcdefghi1abcdefghi2abcdefghi3abcdefghi4abcdefghi5abcdefghi61234";
+		try {
+			try {
+				driver.deleteDatabase(dbName);
+			} catch (final ArangoException e) {
+			}
+			driver.createDatabase(dbName);
+			driver.setDefaultDatabase(dbName);
+			final DatabaseEntity entity = driver.getCurrentDatabase();
+			assertThat(entity.getName(), is(dbName));
+		} finally {
+			driver.deleteDatabase(dbName);
+		}
+	}
+	
 	@Test
 	public void test_createDatabase() throws ArangoException {
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ AdminLogEntity getServerLog(`
`35`	`35`
`36`	`36`	`ArangoUnixTime getTime() throws ArangoException;`
`37`	`37`
`38`		`- DefaultEntity reloadRouting() throws ArangoException;`
	`38`	`+ DefaultEntity reloadRouting(String database) throws ArangoException;`
`39`	`39`
`40`	`40`	`DefaultEntity executeScript(String database, String jsCode) throws ArangoException;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ public ArangoUnixTime getTime() throws ArangoException {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
`117`		`- public DefaultEntity reloadRouting() throws ArangoException {`
	`117`	`+ public DefaultEntity reloadRouting(String database) throws ArangoException {`
`118`	`118`
`119`		`- HttpResponseEntity res = httpManager.doPost(createEndpointUrl(null, "/_admin/routing/reload"), null,`
	`119`	`+ HttpResponseEntity res = httpManager.doPost(createEndpointUrl(database, "/_admin/routing/reload"), null,`
`120`	`120`	`(String) null);`
`121`	`121`
`122`	`122`	`return createEntity(res, DefaultEntity.class, null, false);`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ public class InternalDatabaseDriverImpl extends BaseArangoDriverImpl implements`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`
`44`		`- public DatabaseEntity getCurrentDatabase() throws ArangoException {`
	`44`	`+ public DatabaseEntity getCurrentDatabase(String database) throws ArangoException {`
`45`	`45`
`46`		`- HttpResponseEntity res = httpManager.doGet(createEndpointUrl(null, "/_api/database/current"));`
	`46`	`+ HttpResponseEntity res = httpManager.doGet(createEndpointUrl(database, "/_api/database/current"));`
`47`	`47`	`return createEntity(res, DatabaseEntity.class);`
`48`	`48`
`49`	`49`	`}`