Move default JDBC config to application.conf; get rid of getOrElse

Author: velvia

job-server/src/main/resources/application.conf

@@ -17,6 +17,21 @@ spark {
       rootdir = /tmp/spark-jobserver/filedao/data
     }
 
+    sqldao {
+      # Slick database driver, full classpath
+      slick-driver = scala.slick.driver.H2Driver
+
+      # JDBC driver, full classpath
+      jdbc-driver = org.h2.Driver
+
+      # Directory where default H2 driver stores its data. Only needed for H2.
+      rootdir = /tmp/spark-jobserver/sqldao/data
+
+      # Full JDBC URL / init string.  Sorry, needs to match above.
+      # Substitutions may be used to launch job-server, but leave it out here in the default or tests won't pass
+      jdbc.url = "jdbc:h2:file:/tmp/spark-jobserver/sqldao/data/h2-db"
+    }
+
     # Time out for job server to wait while creating contexts
     context-creation-timeout = 15 s
 
@@ -53,7 +68,7 @@ spark {
     # A zero-arg class implementing spark.jobserver.context.SparkContextFactory
     # Determines the type of jobs that can run in a SparkContext
     context-factory = spark.jobserver.context.DefaultSparkContextFactory
-    
+
     # uris of jars to be loaded into the classpath for this context. Uris is a string list, or a string separated by commas ','
     # dependent-jar-uris = ["file:///some/path/present/in/each/mesos/slave/somepackage.jar"]
 

job-server/src/spark.jobserver/io/JobDAO.scala

@@ -82,14 +82,4 @@ trait JobDAO {
    */
   def getLastUploadTime(appName: String): Option[DateTime] =
     getApps.get(appName)
-
-  /**
-   * A safe API for getting values from Typesafe Config, will return a default if the
-   * value is missing.  If the value is badly formatted, error still goes through.
-   */
-  def getOrElse[T](getter: => T, default: T): T = {
-    try getter catch {
-      case e: ConfigException.Missing => default
-    }
-  }
 }

job-server/src/spark.jobserver/io/JobFileDAO.scala

@@ -16,8 +16,7 @@ class JobFileDAO(config: Config) extends JobDAO {
   // jobId to its Config
   private val configs = mutable.HashMap.empty[String, Config]
 
-  private val rootDir = getOrElse(config.getString("spark.jobserver.filedao.rootdir"),
-    "/tmp/spark-jobserver/filedao/data")
+  private val rootDir = config.getString("spark.jobserver.filedao.rootdir")
   private val rootDirFile = new File(rootDir)
   logger.info("rootDir is " + rootDirFile.getAbsolutePath)
 

job-server/src/spark.jobserver/io/JobSqlDAO.scala

@@ -10,10 +10,8 @@ import scala.slick.jdbc.meta.MTable
 import scala.reflect.runtime.universe
 
 class JobSqlDAO(config: Config) extends JobDAO {
-  val slickDriverClass = getOrElse(config.getString("spark.jobserver.sqldao.slick-driver"),
-    "scala.slick.driver.H2Driver")
-  val jdbcDriverClass = getOrElse(config.getString("spark.jobserver.sqldao.jdbc-driver"),
-    "org.h2.Driver")
+  val slickDriverClass = config.getString("spark.jobserver.sqldao.slick-driver")
+  val jdbcDriverClass = config.getString("spark.jobserver.sqldao.jdbc-driver")
 
   val runtimeMirror = universe.runtimeMirror(getClass.getClassLoader)
   val profileModule = runtimeMirror.staticModule(slickDriverClass)
@@ -22,8 +20,8 @@ class JobSqlDAO(config: Config) extends JobDAO {
 
   private val logger = LoggerFactory.getLogger(getClass)
 
-  private val rootDir = getOrElse(config.getString("spark.jobserver.sqldao.rootdir"),
-    "/tmp/spark-jobserver/sqldao/data")
+  // NOTE: below is only needed for H2 drivers
+  private val rootDir = config.getString("spark.jobserver.sqldao.rootdir")
   private val rootDirFile = new File(rootDir)
   logger.info("rootDir is " + rootDirFile.getAbsolutePath)
 
@@ -63,8 +61,7 @@ class JobSqlDAO(config: Config) extends JobDAO {
   val configs = TableQuery[Configs]
 
   // DB initialization
-  val defaultJdbcUrl = "jdbc:h2:file:" + rootDir + "/h2-db"
-  val jdbcUrl = getOrElse(config.getString("spark.jobserver.sqldao.jdbc.url"), defaultJdbcUrl)
+  val jdbcUrl = config.getString("spark.jobserver.sqldao.jdbc.url")
   val db = Database.forURL(jdbcUrl, driver = jdbcDriverClass)
 
   // Server initialization

job-server/src/test/resources/local.test.jobsqldao.conf

@@ -7,5 +7,11 @@ spark.jobserver {
     rootdir = /tmp/spark-job-server-test/sqldao/data
     # https://coderwall.com/p/a2vnxg
     jdbc.url = "jdbc:h2:mem:jobserver-test;DATABASE_TO_UPPER=false;DB_CLOSE_DELAY=-1"
+
+    # Slick database driver, full classpath
+    slick-driver = scala.slick.driver.H2Driver
+
+    # JDBC driver, full classpath
+    jdbc-driver = org.h2.Driver
   }
 }