CSPACE-4979: Added method to ConfigUtils class called getDatabaseName() which returns...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
index 614ab3a7b249e8f209f596830e06c044556441aa..0d0ac8e833676a91f954dd15faf8a4bfccab6fea 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
@@ -18,6 +18,7 @@
 package org.collectionspace.services.common.storage;\r
 \r
 import org.collectionspace.services.common.api.Tools;\r
+import org.collectionspace.services.common.config.ConfigUtils;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -41,9 +42,9 @@ public class JDBCTools {
     public static String CSPACE_DATASOURCE_NAME = "CspaceDS";\r
     public static String NUXEO_DATASOURCE_NAME = "NuxeoDS";\r
     // Default database names\r
-    public static String DEFAULT_CSPACE_DATABASE_NAME = "cspace";\r
-    public static String DEFAULT_NUXEO_REPOSITORY_NAME = "default";\r
-    public static String DEFAULT_NUXEO_DATABASE_NAME = "nuxeo";\r
+    public static String DEFAULT_CSPACE_DATABASE_NAME = ConfigUtils.DEFAULT_CSPACE_DATABASE_NAME;\r
+    public static String DEFAULT_NUXEO_REPOSITORY_NAME = ConfigUtils.DEFAULT_NUXEO_REPOSITORY_NAME;\r
+    public static String DEFAULT_NUXEO_DATABASE_NAME = ConfigUtils.DEFAULT_NUXEO_DATABASE_NAME;\r
     //\r
     // Private constants\r
     //\r

diff --git a/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java b/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
index 3e8c4e1a5b3263c8097789ba718dacb5666cc9d3..0957ca05b6cf444197ea891a4667a53f990c99f8 100644 (file)
--- a/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
+++ b/services/config/src/main/java/org/collectionspace/services/common/config/ConfigUtils.java
@@ -11,6 +11,11 @@ import org.slf4j.LoggerFactory;
 public class ConfigUtils {
     final static Logger logger = LoggerFactory.getLogger(ConfigUtils.class);
     
+    // Default database names
+    public static String DEFAULT_CSPACE_DATABASE_NAME = "cspace";
+    public static String DEFAULT_NUXEO_REPOSITORY_NAME = "default";
+    public static String DEFAULT_NUXEO_DATABASE_NAME = "nuxeo";
+    
     /*
      * Returns the list of repository/DB names defined by a tenant bindings file
      */
@@ -28,6 +33,20 @@ public class ConfigUtils {
        return result;
     }
     
+    /*
+     * By convention, the repository name and database name are the same.  However, this
+     * call encapulates that convention and allows overrides.
+     */
+    public static String getDatabaseName(TenantBindingType tenantBindingType, String domainName) {
+       String result = getRepositoryName(tenantBindingType, domainName);
+       
+       if (result.equalsIgnoreCase(DEFAULT_NUXEO_REPOSITORY_NAME) == true) {
+               result = DEFAULT_NUXEO_DATABASE_NAME;
+       }
+       
+       return result;
+    }
+    
     public static String getRepositoryName(TenantBindingType tenantBindingType, String domainName) {
                String result = null;