#80 expose database name

Author: aburmeis

src/main/java/com/arangodb/springframework/core/ArangoOperations.java

@@ -22,6 +22,7 @@
 
 import com.arangodb.ArangoCursor;
 import com.arangodb.ArangoDB;
+import com.arangodb.DbName;
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.MultiDocumentEntity;
@@ -57,6 +58,8 @@ public interface ArangoOperations {
 	 */
 	ArangoDBVersion getVersion() throws DataAccessException;
 
+	DbName getDatabaseName();
+
 	/**
 	 * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new
 	 * {@code ArangoCursor} instance for the result list.

src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java

@@ -20,11 +20,7 @@
 
 package com.arangodb.springframework.core.template;
 
-import com.arangodb.ArangoCollection;
-import com.arangodb.ArangoCursor;
-import com.arangodb.ArangoDB;
-import com.arangodb.ArangoDBException;
-import com.arangodb.ArangoDatabase;
+import com.arangodb.*;
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.MultiDocumentEntity;
@@ -149,9 +145,8 @@ public ArangoTemplate(final ArangoDB arango, final String database, final Arango
 		version = null;
 	}
 
-	private ArangoDatabase db() {
-		final String key = databaseExpression != null ? databaseExpression.getValue(context, String.class)
-				: databaseName;
+	ArangoDatabase db() {
+		final String key = getDatabaseName().get();
 		return databaseCache.computeIfAbsent(key, name -> {
 			final ArangoDatabase db = arango.db(name);
 			if (!db.exists()) {
@@ -341,6 +336,12 @@ public ArangoDBVersion getVersion() throws DataAccessException {
 		}
 	}
 
+	@Override
+	public DbName getDatabaseName() {
+		return DbName.of(databaseExpression != null ? databaseExpression.getValue(context, String.class)
+				: databaseName);
+	}
+
 	@Override
 	public <T> ArangoCursor<T> query(final String query, final Class<T> entityClass) throws DataAccessException {
 		return query(query, null, null, entityClass);

src/main/java/com/arangodb/springframework/transaction/ArangoTransaction.java

@@ -39,7 +39,8 @@ String begin(Collection<String> collections) {
         if (definition instanceof TransactionAttribute) {
             allCollections.addAll(((TransactionAttribute) definition).getLabels());
         }
-        StreamTransactionOptions options = new StreamTransactionOptions().allowImplicit(true)
+        StreamTransactionOptions options = new StreamTransactionOptions()
+                .allowImplicit(true)
                 .writeCollections(allCollections.toArray(new String[0]))
                 .lockTimeout(definition.getTimeout() == -1 ? 0 : definition.getTimeout());
         transaction = database.beginStreamTransaction(options);

src/test/java/com/arangodb/springframework/core/template/ArangoTemplateTest.java

@@ -71,6 +71,7 @@ public void template() {
 		assertThat(version.getLicense(), is(notNullValue()));
 		assertThat(version.getServer(), is(notNullValue()));
 		assertThat(version.getVersion(), is(notNullValue()));
+		assertThat(template.getDatabaseName(), is(notNullValue()));
 	}
 
 	@Test