Code style cleanup

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

@@ -39,7 +39,12 @@ class Configuration {
 
   lazy val elasticsearchInstance : Instance = InstanceRegistry.retrieveElasticSearchInstance(this) match {
     case Success(instance) => instance
-    case Failure(_) => Instance(None, Some(sys.env.getOrElse("DELPHI_ELASTIC_URI","elasticsearch://localhost:9200")), None, Some("Default ElasticSearch instance"), Some(ComponentType.ElasticSearch) )
+    case Failure(_) => Instance(
+      None,
+      Some(sys.env.getOrElse("DELPHI_ELASTIC_URI","elasticsearch://localhost:9200")),
+      None,
+      Some("Default ElasticSearch instance"),
+      Some(ComponentType.ElasticSearch))
   }
 
   val mavenRepoBase: URI = new URI("http://repo1.maven.org/maven2/") // TODO: Create a local demo server "http://localhost:8881/maven2/"
@@ -55,12 +60,12 @@ class Configuration {
   val instanceName = "MyCrawlerInstance"
   val instanceRegistryUri : String = sys.env.getOrElse("DELPHI_IR_URI", "http://localhost:8085")
 
-  lazy val usingInstanceRegistry = assignedID match {
+  lazy val usingInstanceRegistry : Boolean = assignedID match {
     case Some(_) => true
     case None => false
   }
 
-  lazy val assignedID = InstanceRegistry.register(this) match {
+  lazy val assignedID : Option[Long] = InstanceRegistry.register(this) match {
     case Success(id) => Some(id)
     case Failure(_) => None
   }

src/main/scala/de/upb/cs/swt/delphi/crawler/instancemanagement/InstanceRegistry.scala

@@ -18,24 +18,26 @@ package de.upb.cs.swt.delphi.crawler.instancemanagement
 
 import java.net.InetAddress
 
+import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.marshalling.Marshal
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.unmarshalling.Unmarshal
+import akka.stream.ActorMaterializer
 import de.upb.cs.swt.delphi.crawler.{AppLogging, Configuration, Crawler}
 import de.upb.cs.swt.delphi.crawler.io.swagger.client.model.InstanceEnums.ComponentType
 import de.upb.cs.swt.delphi.crawler.io.swagger.client.model.{Instance, JsonSupport}
 
 import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, Future}
+import scala.concurrent.{Await, ExecutionContext, Future}
 import scala.util.{Failure, Success, Try}
 
 object InstanceRegistry extends JsonSupport with AppLogging
 {
 
-  implicit val system = Crawler.system
-  implicit val ec = system.dispatcher
-  implicit val materializer = Crawler.materializer
+  implicit val system : ActorSystem = Crawler.system
+  implicit val ec  : ExecutionContext = system.dispatcher
+  implicit val materializer : ActorMaterializer = Crawler.materializer
 
 
   def register(configuration: Configuration) : Try[Long] = {
@@ -102,7 +104,9 @@ object InstanceRegistry extends JsonSupport with AppLogging
         Failure(new RuntimeException("Cannot post matching result to Instance Registry, assigned ElasticSearch instance has no ID."))
       } else {
         val IdToPost = configuration.elasticsearchInstance.iD.get
-        val request = HttpRequest(method = HttpMethods.POST, configuration.instanceRegistryUri + s"/matchingResult?Id=$IdToPost&MatchingSuccessful=$isElasticSearchReachable")
+        val request = HttpRequest(
+          method = HttpMethods.POST,
+          configuration.instanceRegistryUri + s"/matchingResult?Id=$IdToPost&MatchingSuccessful=$isElasticSearchReachable")
 
         Await.result(Http(system).singleRequest(request) map {response =>
           if(response.status == StatusCodes.OK){
@@ -157,5 +161,6 @@ object InstanceRegistry extends JsonSupport with AppLogging
     }
 
 
-  private def createInstance(id: Option[Long], controlPort : Int, name : String) : Instance = Instance(id, Option(InetAddress.getLocalHost().getHostAddress()), Option(controlPort), Option(name), Option(ComponentType.Crawler))
+  private def createInstance(id: Option[Long], controlPort : Int, name : String) : Instance =
+    Instance(id, Option(InetAddress.getLocalHost.getHostAddress), Option(controlPort), Option(name), Option(ComponentType.Crawler))
 }

src/main/scala/de/upb/cs/swt/delphi/crawler/io/swagger/client/model/Instance.scala

@@ -11,7 +11,7 @@ import spray.json._
 
 trait JsonSupport extends SprayJsonSupport with DefaultJsonProtocol {
   implicit val componentTypeFormat = new JsonFormat[InstanceEnums.ComponentType] {
-    def write(compType : InstanceEnums.ComponentType) = JsString(compType.toString())
+    def write(compType : InstanceEnums.ComponentType) = JsString(compType.toString)
 
     def read(value: JsValue) = value match {
       case JsString(s) => s match {

src/main/scala/de/upb/cs/swt/delphi/crawler/storage/ElasticReachablePreflightCheck.scala

@@ -46,13 +46,13 @@ object ElasticReachablePreflightCheck extends PreflightCheck {
     val f = (client.execute {
       nodeInfo()
     } map { i => {
-      if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(true, configuration)
+      if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(isElasticSearchReachable = true, configuration)
       Success(configuration)
     }
-    } recover { case e => {
-      if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(false, configuration)
+    } recover { case e =>
+      if(configuration.usingInstanceRegistry) InstanceRegistry.sendMatchingResult(isElasticSearchReachable = false, configuration)
       Failure(e)
-    }
+
     }).andThen {
       case _ => client.close()
     }