Eliminate need for database properties in config.properties (#1164)

Author: labkey-adam

src/org/labkey/test/Runner.java

@@ -424,16 +424,15 @@ private static void addTests(TestSuite suite, Set<Class<?>> testClasses)
             {
                 List<Class<?>> interfaces = ClassUtils.getAllInterfaces(testClass);
                 WebTestHelper.DatabaseType databaseType = WebTestHelper.getDatabaseType();
-                String databaseVersion = WebTestHelper.getDatabaseVersion();
                 String osName = System.getProperty("os.name", "<unknown>");
                 if (interfaces.contains(PostgresOnlyTest.class) && databaseType != WebTestHelper.DatabaseType.PostgreSQL)
                 {
-                    LOG.warn("** Skipping " + testClass.getSimpleName() + " test for unsupported database: " + databaseType + " " + databaseVersion);
+                    LOG.warn("** Skipping " + testClass.getSimpleName() + " test for unsupported database: " + databaseType);
                     continue;
                 }
                 else if (interfaces.contains(SqlserverOnlyTest.class) && databaseType != WebTestHelper.DatabaseType.MicrosoftSQLServer)
                 {
-                    LOG.warn("** Skipping " + testClass.getSimpleName() + " test for unsupported database: " + databaseType + " " + databaseVersion);
+                    LOG.warn("** Skipping " + testClass.getSimpleName() + " test for unsupported database: " + databaseType);
                     continue;
                 }
 

src/org/labkey/test/WebTestHelper.java

@@ -16,6 +16,7 @@
 
 package org.labkey.test;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
@@ -73,13 +74,13 @@
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
-import java.util.Set;
 
 /**
  * Static methods for getting properties of and communicating with a running LabKey server
@@ -285,31 +286,53 @@ else if (url.indexOf("/") == 0)
 
     public enum DatabaseType
     {
-        PostgreSQL("postgres", "pg"),
-        MicrosoftSQLServer("sqlserver", "mssql", "jtds");
+        PostgreSQL("org.postgresql.Driver", "pg", "postgres"),
+        MicrosoftSQLServer("com.microsoft.sqlserver.jdbc.SQLServerDriver", "net.sourceforge.jtds.jdbc.Driver", "mssql", "sqlserver");
 
-        private final Set<String> typeNames;
+        private static final Map<String, DatabaseType> DATABASE_TYPE_MAP;
 
-        DatabaseType(String... typeNames)
+        static
         {
-            this.typeNames = Set.of(typeNames);
+            Map<String, DatabaseType> tempMap = new HashMap<>();
+            Arrays.stream(values())
+                .forEach(dt -> Arrays.stream(dt._typeKeys)
+                    .forEach(name -> tempMap.put(name, dt)));
+            DATABASE_TYPE_MAP = Collections.unmodifiableMap(tempMap);
+        }
+
+        private final String[] _typeKeys;
+
+        DatabaseType(String... typeKeys)
+        {
+            _typeKeys = typeKeys;
+        }
+
+        static @Nullable DatabaseType get(String driverClassName)
+        {
+            return DATABASE_TYPE_MAP.get(driverClassName);
         }
     }
 
     public static DatabaseType getDatabaseType()
     {
-        String databaseType = getServerProperty("databaseType");
+        String typeKey = getServerProperty("databaseType");
+        if (StringUtils.isBlank(typeKey))
+        {
+            // Use driver class name from 'config.properties' if 'databaseType' isn't specified
+            typeKey = getServerProperty("jdbcDriverClassName");
+        }
 
-        if (null == databaseType)
-            throw new IllegalStateException("Can't determine database type: databaseType property is not set");
+        if (StringUtils.isBlank(typeKey))
+        {
+            throw new IllegalStateException("Can't determine database type: Neither 'jdbcDriverClassName' nor 'databaseType' property is not set");
+        }
 
-        if (DatabaseType.PostgreSQL.typeNames.contains(databaseType))
-            return DatabaseType.PostgreSQL;
+        DatabaseType dt = DatabaseType.get(typeKey);
 
-        if (DatabaseType.MicrosoftSQLServer.typeNames.contains(databaseType))
-            return DatabaseType.MicrosoftSQLServer;
+        if (null == dt)
+            throw new IllegalStateException("Unknown database type: " + typeKey);
 
-        throw new IllegalStateException("Unknown database type: " + databaseType);
+        return dt;
     }
 
     private static String getServerProperty(String property)
@@ -335,11 +358,6 @@ private static String getServerProperty(String property)
         return val;
     }
 
-    public static String getDatabaseVersion()
-    {
-        return getServerProperty("databaseVersion");
-    }
-
     public static String getBaseUrlWithoutContextPath()
     {
         int defaultPort = getTargetServer().startsWith("https") ? 443 : 80;