Implementation and testing of functions with respect to new API refs #23

Author: Ayybeeshafi

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

@@ -57,10 +57,8 @@ class Configuration(  //Server and Elasticsearch configuration
     case Some(_) => true
     case None => false
   }
-  lazy val assignedID : Option[Long] = InstanceRegistry.register(configuration = this) match {
-    case Success(id) => Some(id)
-    case Failure(_) => None
-  }
+  lazy val assignedID : Option[Long] = InstanceRegistry.handleInstanceStart(configuration = this)
+
   lazy val fallbackElasticSearchPort : Int = sys.env.get("DELPHI_ELASTIC_URI") match {
     case Some(hostString) => if(hostString.count(c => c == ':') == 3){
       Try(hostString.split(":")(2).toInt) match {

src/main/scala/de/upb/cs/swt/delphi/webapi/Server.scala

@@ -2,7 +2,9 @@ package de.upb.cs.swt.delphi.webapi
 
 import java.util.concurrent.TimeUnit
 
-import akka.actor.ActorSystem
+import akka.Done
+import akka.actor.{ActorSystem, PoisonPill}
+import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.HttpApp
 import akka.pattern.ask
 import akka.stream.ActorMaterializer
@@ -17,7 +19,7 @@ import spray.json._
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, ExecutionContext}
-import scala.util.{Failure, Success}
+import scala.util.{Failure, Success, Try}
 
 /**
   * Web server configuration for Delphi web API.
@@ -110,7 +112,7 @@ object Server extends HttpApp with JsonSupport with AppLogging {
       Await.ready(f, Duration.Inf)
 
     Server.startServer(configuration.bindHost, configuration.bindPort)
-    InstanceRegistry.deregister(configuration)
+    InstanceRegistry.handleInstanceStop(configuration)
     system.terminate()
   }