Fix db, collection creation

arangodb · Jul 24, 2018 · 3429a50 · 3429a50
1 parent 9d0c9f2
commit 3429a50
Showing 1 changed file with 4 additions and 24 deletions.
diff --git a/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java b/src/main/java/com/arangodb/springframework/core/template/ArangoTemplate.java
@@ -125,18 +125,8 @@ private ArangoDatabase db() {
 				return db;
 			}
 			db = arango.db(databaseName);
-			try {
-				db.getInfo();
-			} catch (final ArangoDBException e) {
-				if (new Integer(404).equals(e.getResponseCode())) {
-					try {
-						arango.createDatabase(databaseName);
-					} catch (final ArangoDBException e1) {
-						throw translateExceptionIfPossible(e1);
-					}
-				} else {
-					throw translateExceptionIfPossible(e);
-				}
+			if (!db.exists()) {
+				db.create();
 			}
 			database = db;
 			return db;
@@ -169,18 +159,8 @@ private ArangoCollection _collection(
 
 		return collectionCache.computeIfAbsent(name, collName -> {
 			final ArangoCollection collection = db().collection(collName);
-			try {
-				collection.getInfo();
-			} catch (final ArangoDBException e) {
-				if (new Integer(404).equals(e.getResponseCode())) {
-					try {
-						db().createCollection(collName, options);
-					} catch (final ArangoDBException e1) {
-						throw translateExceptionIfPossible(e1);
-					}
-				} else {
-					throw translateExceptionIfPossible(e);
-				}
+			if (!collection.exists()) {
+				collection.create(options);
 			}
 			if (persistentEntity != null) {
 				ensureCollectionIndexes(collection(collection), persistentEntity);