Revised DatabaseUrlDataSource to have a no-arg cstr. Moved extractUrl…

… to instance method
slick · Jul 28, 2015 · d7a7d2e · d7a7d2e
1 parent c372546
commit d7a7d2e
Showing 1 changed file with 15 additions and 58 deletions.
diff --git a/slick/src/main/scala/slick/jdbc/DatabaseUrlDataSource.scala b/slick/src/main/scala/slick/jdbc/DatabaseUrlDataSource.scala
@@ -1,39 +1,27 @@
 package slick.jdbc
 
-import scala.language.reflectiveCalls
-
-import java.io.{PrintWriter, Closeable}
-import java.sql._
-import java.util.Properties
-import java.util.logging.Logger
-import javax.sql.DataSource
-
-import slick.SlickException
-import slick.util.{ClassLoaderUtil, Logging, ignoreFollowOnError}
-
-import scala.beans.BeanProperty
-import scala.collection.JavaConverters._
-import scala.util.control.NonFatal
-
-object DatabaseUrlDataSource {
+/** A DataSource that wraps the DriverManager API. It can be configured as a Java Bean and used
+  * both stand-alone and as a source for a connection pool. This implementation is design
+  * specifically to handle a non-JDBC Database URL in the format defined by the libpq standard.
+  */
+class DatabaseUrlDataSource extends DriverDataSource(null) {
 
   private val PostgresFullUrl = "^postgres://([a-zA-Z0-9_]+):([^@]+)@([^/]+)/([^\\s]+)$".r
   private val MysqlFullUrl = "^mysql://([a-zA-Z0-9_]+):([^@]+)@([^/]+)/([^\\s]+)$".r
   private val MysqlCustomProperties = ".*\\?(.*)".r
 
-  def extractUrl(databaseUrl: Option[String]): String = {
-    extractUrlComponents(Some(databaseUrl.getOrElse(defaultUrl)))._1.orNull
-  }
-
-  def extractUser(databaseUrl: Option[String], default:String): String = {
-    extractUrlComponents(Some(databaseUrl.getOrElse(defaultUrl)))._2.map(_._1).getOrElse(default)
-  }
+  @volatile private[this] var initialized = false
 
-  def extractPassword(databaseUrl: Option[String], default:String): String = {
-    extractUrlComponents(Some(databaseUrl.getOrElse(defaultUrl)))._2.map(_._2).getOrElse(default)
+  override def init: Unit = if(!initialized) {
+    val (jdbcUrl, userAndPass) = extractUrl(Some(if (url == null) defaultUrl else url))
+    url = jdbcUrl.orNull
+    user = userAndPass.map(_._1).getOrElse(user)
+    password = userAndPass.map(_._2).getOrElse(password)
+    initialized = true
+    super.init
   }
 
-  def extractUrlComponents(databaseUrl: Option[String]): (Option[String], Option[(String, String)]) = {
+  private[this] def extractUrl(databaseUrl: Option[String]): (Option[String], Option[(String, String)]) = {
     databaseUrl match {
       case Some(PostgresFullUrl(username, password, host, dbname)) =>
         Some(s"jdbc:postgresql://$host/$dbname") -> Some(username -> password)
@@ -51,38 +39,7 @@ object DatabaseUrlDataSource {
     }
   }
 
-  def defaultUrl():String = {
+  private[this] def defaultUrl():String = {
     System.getenv("DATABASE_URL")
   }
 }
-
-/** A DataSource that wraps the DriverManager API. It can be configured as a Java Bean and used
-  * both stand-alone and as a source for a connection pool. */
-class DatabaseUrlDataSource(
-    /** The Database URL */
-    dbUrl: String,
-    /** Optional user name */
-    dbUrlUser: String = null,
-    /** Optional password */
-    dbUrlPassword: String = null,
-    /** Optional connection properties */
-    dbUrlProperties: Properties = null,
-    /** Name of the `java.sql.Driver` class. This must be set unless a `driverObject` is set
-      * directly or the driver is already registered with the DriverManager. */
-    dbUrlDriverClassName: String = null,
-    /** When `close()` is called, try to deregister a driver that was registered by this instance. */
-    dbUrlDeregisterDriver: Boolean = false,
-    /** The JDBC driver to use. If this is set, `driverClassName` will be ignored. */
-    dbUrlDriverObject: Driver = null,
-    /** The ClassLoader that is used to load `driverClassName` */
-    dbUrlClassLoader: ClassLoader = ClassLoaderUtil.defaultClassLoader
-  ) extends DriverDataSource(
-    DatabaseUrlDataSource.extractUrl(Some(dbUrl)),
-    DatabaseUrlDataSource.extractUser(Some(dbUrl), dbUrlUser),
-    DatabaseUrlDataSource.extractPassword(Some(dbUrl), dbUrlPassword),
-    dbUrlProperties,
-    dbUrlDriverClassName,
-    dbUrlDeregisterDriver,
-    dbUrlDriverObject,
-    dbUrlClassLoader
-  ) { }