updated daikon-core dependency

DaikonWeb · Apr 9, 2020 · 4fd13e5 · 4fd13e5
1 parent 82cc0d7
commit 4fd13e5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 213 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ dependencies {
 
     compile "org.eclipse.jetty:jetty-server:9.4.27.v20200227"
     compile "org.eclipse.jetty:jetty-servlet:9.4.27.v20200227"
-    compile "com.github.DaikonWeb:daikon-core:1.1.0"
+    compile "com.github.DaikonWeb:daikon-core:1.2.0"
 
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.5.2"

diff --git a/src/main/kotlin/daikon/BasicAuthentication.kt b/src/main/kotlin/daikon/BasicAuthentication.kt
diff --git a/src/main/kotlin/daikon/DaikonServer.kt b/src/main/kotlin/daikon/DaikonServer.kt
diff --git a/src/main/kotlin/daikon/HttpServer.kt b/src/main/kotlin/daikon/HttpServer.kt
@@ -1,5 +1,6 @@
 package daikon
 
+import daikon.core.DaikonServer
 import daikon.core.RoutingHandler
 import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.servlet.DefaultServlet
@@ -11,7 +12,7 @@ import java.time.LocalDateTime.now
 import java.time.temporal.ChronoUnit.MILLIS
 
 
-class HttpServer(private val port: Int = 4545, initializeActions: DaikonServer.() -> Unit = {}): DaikonServer(port, initializeActions) {
+class HttpServer(private val port: Int = 4545, initializeActions: DaikonServer.() -> Unit = {}): DaikonServer(initializeActions) {
     init {
         disableJettyLog()
     }
@@ -22,6 +23,7 @@ class HttpServer(private val port: Int = 4545, initializeActions: DaikonServer.(
     override fun start(routingHandler: RoutingHandler): HttpServer {
         val beginStarting = now()
         server = Server(port)
+        context.addAttribute("port", port)
         handler.addServlet(ServletHolder(RoutingServlet(routingHandler)), "/*")
         server.handler = handler
         server.start()

diff --git a/src/main/kotlin/daikon/ServerContext.kt b/src/main/kotlin/daikon/ServerContext.kt
diff --git a/src/test/kotlin/daikon/PerformanceTest.kt b/src/test/kotlin/daikon/PerformanceTest.kt
@@ -1,5 +1,6 @@
 package daikon
 
+import daikon.core.DaikonServer
 import daikon.core.HttpStatus.OK_200
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.GlobalScope