Take aliases into account when checking configuration

Author: adrienlauer

morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaDatastoreImpl.java

@@ -21,7 +21,7 @@ class MorphiaDatastoreImpl implements MorphiaDatastore, Serializable {
     private String clientName;
     private String dbName;
 
-    public MorphiaDatastoreImpl(String clientName, String dbName) {
+    MorphiaDatastoreImpl(String clientName, String dbName) {
         this.clientName = clientName;
         this.dbName = dbName;
     }

morphia/src/main/java/org/seedstack/mongodb/morphia/internal/MorphiaUtils.java

@@ -12,8 +12,6 @@
 import org.seedstack.seed.Application;
 import org.seedstack.seed.SeedException;
 
-import java.util.Arrays;
-
 public final class MorphiaUtils {
     private MorphiaUtils() {
 
@@ -29,39 +27,65 @@ private MorphiaUtils() {
     public static MorphiaDatastore getMongoDatastore(Application application, Class<?> morphiaClass) {
         Configuration morphiaEntityConfiguration = application.getConfiguration(morphiaClass).subset("morphia");
         if (morphiaEntityConfiguration.isEmpty()) {
-            throw SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CONFIGURATION).put("aggregate",
-                    morphiaClass.getName());
+            throw SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CONFIGURATION)
+                    .put("aggregate", morphiaClass.getName());
         }
+
         String clientName = morphiaEntityConfiguration.getString("clientName");
         String dbName = morphiaEntityConfiguration.getString("dbName");
         if (clientName == null) {
             throw SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_CLIENT)
-                    .put("aggregate", morphiaClass.getName()).put("clientName", clientName);
+                    .put("aggregate", morphiaClass.getName())
+                    .put("clientName", clientName);
         }
         if (dbName == null) {
             throw SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATASTORE_DATABASE)
-                    .put("aggregate", morphiaClass.getName()).put("clientName", clientName).put("dbName", dbName);
+                    .put("aggregate", morphiaClass.getName())
+                    .put("clientName", clientName)
+                    .put("dbName", dbName);
         }
+
         checkMongoClient(application.getConfiguration(), morphiaClass, clientName, dbName);
-        MorphiaDatastore morphiaDatastore = new MorphiaDatastoreImpl(clientName, dbName);
-        return morphiaDatastore;
+
+        return new MorphiaDatastoreImpl(clientName, dbName);
     }
 
     private static void checkMongoClient(Configuration configuration, Class<?> mappedClass, String clientName, String dbName) {
         Configuration configurationClientMongodb = configuration.subset(MongoDbPlugin.CONFIGURATION_PREFIX + ".client." + clientName);
         if (configurationClientMongodb.isEmpty()) {
             throw SeedException.createNew(MongoDbErrorCodes.UNKNOWN_CLIENT_SPECIFIED)
-                    .put("aggregate", mappedClass.getName()).put("clientName", clientName).put("dbName", dbName);
+                    .put("aggregate", mappedClass.getName())
+                    .put("clientName", clientName)
+                    .put("dbName", dbName);
         }
+
         boolean async = configurationClientMongodb.getBoolean("async", false);
         if (async) {
             throw SeedException.createNew(MorphiaErrorCodes.ERROR_ASYNC_CLIENT)
-                    .put("aggregate", mappedClass.getName()).put("clientName", clientName).put("dbName", dbName);
+                    .put("aggregate", mappedClass.getName())
+                    .put("clientName", clientName)
+                    .put("dbName", dbName);
         }
+
         String[] dbNames = configurationClientMongodb.getStringArray("databases");
-        if (dbNames != null && dbNames.length > 0 && !Arrays.asList(dbNames).contains(dbName)) {
+        if (!dbOrAliasExists(dbName, configurationClientMongodb, dbNames)) {
             throw SeedException.createNew(MorphiaErrorCodes.UNKNOW_DATABASE_NAME)
-                    .put("aggregate", mappedClass.getName()).put("clientName", clientName).put("dbName", dbName);
+                    .put("aggregate", mappedClass.getName())
+                    .put("clientName", clientName)
+                    .put("dbName", dbName);
+        }
+    }
+
+    private static boolean dbOrAliasExists(String dbName, Configuration configurationClientMongodb, String[] dbNames) {
+        boolean foundDb = false;
+        if (dbNames != null) {
+            for (String name : dbNames) {
+                if (dbName.equals(configurationClientMongodb.getString(String.format("alias.%s", name), name))) {
+                    foundDb = true;
+                    break;
+                }
+            }
         }
+        return foundDb;
     }
 }