Merge pull request #68 from delphi-hub/feature/bugfix

Feature/bugfix

Author: johannesduesing

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

@@ -28,7 +28,7 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
   private val eventMaps : TableQuery[EventMaps] = TableQuery[EventMaps]
 
   implicit val system : ActorSystem = Registry.system
-  implicit val materializer : ActorMaterializer = Registry.materializer
+  implicit val materializer : ActorMaterializer = ActorMaterializer()
   implicit val ec : ExecutionContext = system.dispatcher
 
   private var db = Database.forURL(configuration.databaseHost + configuration.databaseName, driver = configuration.databaseDriver, user = configuration.databaseUsername, password = configuration.databasePassword)

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

@@ -28,7 +28,7 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
   private val instanceLinks: mutable.Set[InstanceLink] = new mutable.HashSet[InstanceLink]()
 
   implicit val system : ActorSystem = Registry.system
-  implicit val materializer : ActorMaterializer = Registry.materializer
+  implicit val materializer : ActorMaterializer = ActorMaterializer()
   implicit val ec : ExecutionContext = system.dispatcher
 
 

src/test/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandlerTest.scala

@@ -14,9 +14,10 @@ import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
 import scala.concurrent.ExecutionContext
 
 class RequestHandlerTest extends FlatSpec with Matchers with BeforeAndAfterEach {
-  implicit val system: ActorSystem = ActorSystem()
-  implicit val materializer: ActorMaterializer = ActorMaterializer()
-  implicit val ec: ExecutionContext = system.dispatcher
+
+  implicit val system : ActorSystem = ActorSystem("test_system")
+  implicit val materializer : ActorMaterializer = ActorMaterializer()
+
   val configuration: Configuration = new Configuration()
   val dao: InstanceDAO = new DynamicInstanceDAO(configuration)
   val handler: RequestHandler = new RequestHandler(configuration, dao, DockerConnection.fromEnvironment())