Changed passing of services to allow testing with in-memory DB

Author: Johannes Duesing

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Configuration.scala

@@ -34,6 +34,7 @@ class Configuration( ) {
   val dockerOperationTimeout: Timeout = Timeout(20 seconds)
 
   //Database configurations
+  val useInMemoryDB = false
   val databaseHost = "jdbc:mysql://localhost/"
   val databaseName = ""
   val databaseDriver = "com.mysql.jdbc.Driver"

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Registry.scala

@@ -4,6 +4,7 @@ import akka.actor.ActorSystem
 import akka.stream.ActorMaterializer
 import de.upb.cs.swt.delphi.instanceregistry.Docker._
 import de.upb.cs.swt.delphi.instanceregistry.connection.Server
+import de.upb.cs.swt.delphi.instanceregistry.daos.{DatabaseInstanceDAO, DynamicInstanceDAO, InstanceDAO}
 
 import scala.concurrent.ExecutionContext
 import scala.language.postfixOps
@@ -15,14 +16,24 @@ object Registry extends AppLogging {
 
 
   val configuration = new Configuration()
-  val requestHandler = new RequestHandler(configuration, DockerConnection.fromEnvironment())
 
+  private val dao : InstanceDAO  = {
+    if (configuration.useInMemoryDB) {
+      new DynamicInstanceDAO(configuration)
+    } else {
+      new DatabaseInstanceDAO(configuration)
+    }
+  }
 
-  def main(args: Array[String]): Unit = {
+  private val requestHandler = new RequestHandler(configuration, dao, DockerConnection.fromEnvironment())
+
+  private val server: Server = new Server(requestHandler)
 
+
+  def main(args: Array[String]): Unit = {
     requestHandler.initialize()
     log.info("Starting server ...")
-    Server.startServer(configuration.bindHost, configuration.bindPort)
+    server.startServer(configuration.bindHost, configuration.bindPort)
     log.info("Shutting down ...")
     requestHandler.shutdown()
     system.terminate()

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala

@@ -10,7 +10,7 @@ import de.upb.cs.swt.delphi.instanceregistry.Docker.{ContainerAlreadyStoppedExce
 import akka.stream.scaladsl.{Keep, Sink, Source}
 import akka.stream.{ActorMaterializer, Materializer, OverflowStrategy}
 import de.upb.cs.swt.delphi.instanceregistry.connection.RestClient
-import de.upb.cs.swt.delphi.instanceregistry.daos.{DatabaseInstanceDAO, InstanceDAO}
+import de.upb.cs.swt.delphi.instanceregistry.daos.InstanceDAO
 import de.upb.cs.swt.delphi.instanceregistry.io.swagger.client.model.InstanceEnums.{ComponentType, InstanceState}
 import de.upb.cs.swt.delphi.instanceregistry.io.swagger.client.model.LinkEnums.LinkState
 import de.upb.cs.swt.delphi.instanceregistry.io.swagger.client.model._
@@ -20,15 +20,14 @@ import scala.concurrent.{Await, ExecutionContext, Future}
 import scala.language.postfixOps
 import scala.util.{Failure, Success, Try}
 
-class RequestHandler(configuration: Configuration, connection: DockerConnection) extends AppLogging {
+class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, connection: DockerConnection) extends AppLogging {
 
 
 
   implicit val system: ActorSystem = Registry.system
   implicit val materializer : Materializer = ActorMaterializer()
   implicit val ec: ExecutionContext = system.dispatcher
 
-  private[instanceregistry] val instanceDao: InstanceDAO = new DatabaseInstanceDAO(configuration)
 
   val (eventActor, eventPublisher) = Source.actorRef[RegistryEvent](10, OverflowStrategy.dropNew)
     .toMat(Sink.asPublisher(fanout = true))(Keep.both)

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/connection/Server.scala

@@ -20,7 +20,7 @@ import scala.util.{Failure, Success}
 /**
   * Web server configuration for Instance Registry API.
   */
-object Server extends HttpApp
+class Server (handler: RequestHandler) extends HttpApp
   with InstanceJsonSupport
   with EventJsonSupport
   with InstanceLinkJsonSupport
@@ -30,8 +30,6 @@ object Server extends HttpApp
   implicit val materializer : ActorMaterializer = ActorMaterializer()
   implicit val ec : ExecutionContext = system.dispatcher
 
-  private val handler : RequestHandler = Registry.requestHandler
-
   //Routes that map http endpoints to methods in this object
   override def routes : server.Route =
       /****************BASIC OPERATIONS****************/

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DatabaseInstanceDAO.scala

@@ -165,7 +165,7 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
         Await.result(createAction, Duration.Inf)
 
 
-      log.info("Initializing dynamic instance DAO...")
+      log.info("Initializing sql instance DAO...")
       clearData()
       log.info("Successfully initialized.")
     } else {