Fix alias resolution

Author: adrienlauer

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

@@ -50,14 +50,22 @@ public static MorphiaDatastore getMongoDatastore(Application application, Class<
     }
 
     /**
-     * Resolve database alias.
+     * Resolve the real database name given an alias.
      *
      * @param clientConfiguration the configuration of the client.
      * @param dbName              the name of the alias or the database.
      * @return the resolved database name (may be the provided database name if no alias is defined).
      */
     public static String resolveDatabaseAlias(Configuration clientConfiguration, String dbName) {
-        return clientConfiguration.getString(String.format("alias.%s", dbName), dbName);
+        String[] databases = clientConfiguration.getStringArray("databases");
+        if (databases != null) {
+            for (String database : databases) {
+                if (dbName.equals(clientConfiguration.getString(String.format("alias.%s", database), dbName))) {
+                    return database;
+                }
+            }
+        }
+        return dbName;
     }
 
     /**
@@ -92,7 +100,7 @@ private static void checkMongoClient(Configuration configuration, Class<?> mappe
         String[] dbNames = mongodbClientConfiguration.getStringArray("databases");
         boolean found = false;
         for (String nameToCheck : dbNames) {
-            if (dbName.equals(resolveDatabaseAlias(mongodbClientConfiguration, nameToCheck))) {
+            if (nameToCheck.equals(resolveDatabaseAlias(mongodbClientConfiguration, dbName))) {
                 found = true;
                 break;
             }

pom.xml

@@ -47,6 +47,7 @@
                         <includedLicenses>
                             <includedLicense>Apache 2</includedLicense>
                             <includedLicense>BSD</includedLicense>
+                            <includedLicense>CDDL 1.0</includedLicense>
                             <includedLicense>LGPL 3.0</includedLicense>
                             <includedLicense>MIT License</includedLicense>
                             <includedLicense>MPL 2.0</includedLicense>
@@ -63,6 +64,7 @@
                             <licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
                             <licenseMerge>BSD|The New BSD License</licenseMerge>
                             <licenseMerge>BSD|https://svn.codehaus.org/proxytoys/trunk/LICENSE.txt</licenseMerge>                            
+                            <licenseMerge>CDDL 1.0|CDDL + GPLv2 with classpath exception</licenseMerge>
                             <licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
                             <licenseMerge>IGNORED_LICENSE|LGPL 2.1</licenseMerge>