#250 replace dbname by database itself

aburmeis · aburmeis · commit b9b48d3ce8f1 · 2023-08-23T08:46:19.000+02:00
diff --git a/src/main/java/com/arangodb/springframework/core/ArangoOperations.java b/src/main/java/com/arangodb/springframework/core/ArangoOperations.java
@@ -22,7 +22,7 @@
 
 import com.arangodb.ArangoCursor;
 import com.arangodb.ArangoDB;
-import com.arangodb.DbName;
+import com.arangodb.ArangoDatabase;
 import com.arangodb.entity.ArangoDBVersion;
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.MultiDocumentEntity;
@@ -58,7 +58,13 @@ public interface ArangoOperations {
 	 */
 	ArangoDBVersion getVersion() throws DataAccessException;
 
-	DbName getDatabaseName();
+	/**
+	 * Returns the underlying database. The database will be created if it does not exist.
+	 *
+	 * @return the database object
+	 * @throws DataAccessException
+	 */
+	ArangoDatabase db() throws DataAccessException;
 
 	/**
 	 * Performs a database query using the given {@code query} and {@code bindVars}, then returns a new
diff --git a/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java b/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java
@@ -57,6 +57,7 @@
 import org.springframework.context.expression.BeanFactoryAccessor;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
@@ -133,14 +134,20 @@ public ArangoTemplate(final ArangoDB arango, final String database, final Arango
 		version = null;
 	}
 
-	ArangoDatabase db() {
-		final String key = getDatabaseName().get();
+	@Override
+	public ArangoDatabase db() throws DataAccessException {
+		final String key = databaseExpression != null ? databaseExpression.getValue(context, String.class)
+				: databaseName;
 		return databaseCache.computeIfAbsent(key, name -> {
 			final ArangoDatabase db = arango.db(name);
-			if (!db.exists()) {
-				db.create();
+			try {
+				if (!db.exists()) {
+					db.create();
+				}
+				return db;
+			} catch (ArangoDBException error) {
+				throw DataAccessUtils.translateIfNecessary(error, exceptionTranslator);
 			}
-			return db;
 		});
 	}
 
@@ -324,12 +331,6 @@ 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 Map<String, Object> bindVars,
 			final AqlQueryOptions options, final Class<T> entityClass) throws DataAccessException {
diff --git a/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java b/src/main/java/com/arangodb/springframework/transaction/ArangoTransactionManager.java
@@ -36,7 +36,7 @@
 
 /**
  * Transaction manager using ArangoDB stream transactions on the
- * {@linkplain ArangoOperations#getDatabaseName() current database} of the
+ * {@linkplain ArangoOperations#db() current database} of the
  * template. A {@linkplain ArangoTransactionObject transaction object} using
  * a shared {@linkplain ArangoTransactionHolder holder} is used for the
  * {@link DefaultTransactionStatus}. Neither
@@ -79,10 +79,9 @@ public void afterPropertiesSet() {
      */
     @Override
     protected ArangoTransactionObject doGetTransaction() {
-        DbName database = operations.getDatabaseName();
-        ArangoTransactionHolder holder = (ArangoTransactionHolder) TransactionSynchronizationManager.getResource(database);
+        ArangoTransactionHolder holder = (ArangoTransactionHolder) TransactionSynchronizationManager.getResource(this);
         try {
-            return new ArangoTransactionObject(operations.driver().db(database), getDefaultTimeout(), holder);
+            return new ArangoTransactionObject(operations.db(), getDefaultTimeout(), holder);
         } catch (ArangoDBException error) {
             throw new TransactionSystemException("Cannot create transaction object", error);
         }
@@ -173,7 +172,7 @@ protected void doRollback(DefaultTransactionStatus status) throws TransactionExc
     @Override
     protected boolean isExistingTransaction(Object transaction) throws TransactionException {
         ArangoTransactionHolder holder = ((ArangoTransactionObject) transaction).getHolder();
-        return holder == TransactionSynchronizationManager.getResource(operations.getDatabaseName());
+        return holder == TransactionSynchronizationManager.getResource(this);
     }
 
     /**
@@ -210,12 +209,12 @@ protected void prepareSynchronization(DefaultTransactionStatus status, Transacti
         super.prepareSynchronization(status, definition);
         if (status.isNewSynchronization()) {
             ArangoTransactionHolder holder = ((ArangoTransactionObject) status.getTransaction()).getHolder();
-            TransactionSynchronizationManager.bindResource(operations.getDatabaseName(), holder);
+            TransactionSynchronizationManager.bindResource(this, holder);
         }
     }
 
     private void afterCompletion() {
         bridge.clearCurrentTransaction();
-        TransactionSynchronizationManager.unbindResource(operations.getDatabaseName());
+        TransactionSynchronizationManager.unbindResource(this);
     }
 }
diff --git a/src/test/java/com/arangodb/springframework/core/template/ArangoTemplateTest.java b/src/test/java/com/arangodb/springframework/core/template/ArangoTemplateTest.java
@@ -71,7 +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()));
+		assertThat(template.db(), is(notNullValue()));
 	}
 
 	@Test
diff --git a/src/test/java/com/arangodb/springframework/transaction/ArangoTransactionManagerTest.java b/src/test/java/com/arangodb/springframework/transaction/ArangoTransactionManagerTest.java
@@ -43,17 +43,13 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ArangoTransactionManagerTest {
 
-    private static final DbName DATABASE_NAME = DbName.of("test");
-
     @Mock
     private ArangoOperations operations;
     @Mock
     private QueryTransactionBridge bridge;
     @InjectMocks
     private ArangoTransactionManager underTest;
     @Mock
-    private ArangoDB driver;
-    @Mock
     private ArangoDatabase database;
     @Mock
     private StreamTransactionEntity streamTransaction;
@@ -64,27 +60,22 @@ public class ArangoTransactionManagerTest {
 
     @Before
     public void setupMocks() {
-        when(operations.getDatabaseName())
-                .thenReturn(DATABASE_NAME);
-        when(operations.driver())
-                .thenReturn(driver);
-        when(driver.db(any(DbName.class)))
+        when(operations.db())
                 .thenReturn(database);
     }
 
     @After
     public void cleanupSync() {
-        TransactionSynchronizationManager.unbindResourceIfPossible(DATABASE_NAME);
+        TransactionSynchronizationManager.unbindResourceIfPossible(underTest);
         TransactionSynchronizationManager.clear();
     }
 
     @Test
     public void getTransactionReturnsNewTransactionWithoutStreamTransaction() {
         TransactionStatus status = underTest.getTransaction(new DefaultTransactionAttribute());
         assertThat(status.isNewTransaction(), is(true));
-        verify(driver).db(DATABASE_NAME);
         verify(bridge).setCurrentTransaction(any());
-        ArangoTransactionHolder resource = (ArangoTransactionHolder) TransactionSynchronizationManager.getResource(DATABASE_NAME);
+        ArangoTransactionHolder resource = (ArangoTransactionHolder) TransactionSynchronizationManager.getResource(underTest);
         assertThat(resource.getStreamTransactionId(), nullValue());
         assertThat(resource.getCollectionNames(), empty());
         assertThat(resource.isRollbackOnly(), is(false));
@@ -113,7 +104,7 @@ public void innerRollbackCausesUnexpectedRollbackOnOuterCommit() {
         try {
             underTest.commit(outer);
         } finally {
-            assertThat(TransactionSynchronizationManager.getResource(DATABASE_NAME), nullValue());
+            assertThat(TransactionSynchronizationManager.getResource(underTest), nullValue());
         }
     }
 
@@ -159,7 +150,7 @@ public void nestedGetTransactionReturnsExistingTransactionWithFormerCollections(
         underTest.commit(inner2);
         underTest.commit(outer);
         verify(database).commitStreamTransaction("123");
-        assertThat(TransactionSynchronizationManager.getResource(DATABASE_NAME), nullValue());
+        assertThat(TransactionSynchronizationManager.getResource(underTest), nullValue());
     }
 
     @Test
@@ -171,7 +162,7 @@ public void getTransactionForPropagationSupportsWithoutExistingCreatesDummyTrans
         assertThat(empty.isNewTransaction(), is(false));
         underTest.commit(empty);
         verifyNoInteractions(database);
-        assertThat(TransactionSynchronizationManager.getResource(DATABASE_NAME), nullValue());
+        assertThat(TransactionSynchronizationManager.getResource(underTest), nullValue());
     }
 
     @Test
@@ -186,7 +177,7 @@ public void getTransactionForPropagationSupportsWithExistingCreatesInner() {
         assertThat(inner.isNewTransaction(), is(false));
         underTest.commit(inner);
         ArangoTransactionObject transactionObject = getTransactionObject(inner);
-        assertThat(TransactionSynchronizationManager.getResource(DATABASE_NAME), is(transactionObject.getHolder()));
+        assertThat(TransactionSynchronizationManager.getResource(underTest), is(transactionObject.getHolder()));
         verifyNoInteractions(database);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void template() {`
`71`	`71`	`assertThat(version.getLicense(), is(notNullValue()));`
`72`	`72`	`assertThat(version.getServer(), is(notNullValue()));`
`73`	`73`	`assertThat(version.getVersion(), is(notNullValue()));`
`74`		`- assertThat(template.getDatabaseName(), is(notNullValue()));`
	`74`	`+ assertThat(template.db(), is(notNullValue()));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Test`