Merge branch 'develop' of https://github.com/delphi-hub/delphi-webapi into feat/global-sbt

updated the feature branch to contain the most recent changes on the develop branch to prepare the pull request.

Author: janniclas

build.sbt

@@ -7,6 +7,22 @@ scalaVersion := "2.12.4"
 libraryDependencies += "org.parboiled" %% "parboiled" % "2.1.4"
 libraryDependencies += "com.typesafe.akka" %% "akka-http" % "10.0.11"
 
+val elastic4sVersion = "6.2.8"
+libraryDependencies ++= Seq(
+  "com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
+
+  // for the http client
+  "com.sksamuel.elastic4s" %% "elastic4s-http" % elastic4sVersion,
+
+  // if you want to use reactive streams
+  "com.sksamuel.elastic4s" %% "elastic4s-http-streams" % elastic4sVersion,
+
+  // testing
+  "com.sksamuel.elastic4s" %% "elastic4s-testkit" % elastic4sVersion % "test",
+  "com.sksamuel.elastic4s" %% "elastic4s-embedded" % elastic4sVersion % "test"
+)
+
+
 lazy val webapi = (project in file(".")).
   enablePlugins(JavaAppPackaging).
   enablePlugins(DockerPlugin).

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

@@ -0,0 +1,13 @@
+package de.upb.cs.swt.delphi.webapi
+
+import com.sksamuel.elastic4s.ElasticsearchClientUri
+
+/**
+  * @author Ben Hermann
+  */
+class Configuration(val bindHost: String = "0.0.0.0",
+                    val bindPort: Int = 8080,
+                    val elasticsearchClientUri: ElasticsearchClientUri = ElasticsearchClientUri(
+                      sys.env.getOrElse("DELPHI_ELASTIC_URI", "elasticsearch://localhost:9200"))) {
+
+}

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

@@ -45,7 +45,8 @@ object Server extends HttpApp {
   }
 
   def main(args: Array[String]): Unit = {
-    Server.startServer("0.0.0.0", 8080)
+    val configuration = new Configuration()
+    Server.startServer(configuration.bindHost, configuration.bindPort)
   }