make this more generic

2 files changed, 4 insertions, 5 deletions

diff --git a/src/main/scala/cake/application.scala b/src/main/scala/cake/application.scala
index 0dac58b..20ef0ed 100644
--- a/src/main/scala/cake/application.scala
+++ b/src/main/scala/cake/application.scala
@@ -1,13 +1,11 @@
 package cake.application
 
-import cake.logger.FileLogger
-import cake.database.DBI
+import cake.services._
 
-class Application (val logger: FileLogger, val dbh: DBI) {
+class Application (val logger: HasLogger#ILogger, val dbh: HasDatabase#IDatabase) {
   def run (): Unit = {
     logger.log("starting")
-    logger.log("got a dbh: " +
-      List(dbh.dsn, dbh.username, dbh.password).mkString(", "))
+    logger.log("got a dbh: " + dbh)
     logger.log(dbh.query("foo"))
     logger.log("ending")
   }
diff --git a/src/main/scala/cake/database.scala b/src/main/scala/cake/database.scala
index 8c3a234..f0de51c 100644
--- a/src/main/scala/cake/database.scala
+++ b/src/main/scala/cake/database.scala
@@ -5,6 +5,7 @@ class DBI protected (
   val username: String,
   val password: String) {
   def query (search: String): String = "found " + search
+  override def toString = List(dsn, username, password).mkString(", ")
 }
 
 object DBI {