extracted routing in an external library: daikon-core

DaikonWeb · Mar 13, 2020 · 0410810 · 0410810
1 parent 3d40960
commit 0410810
Show file tree

Hide file tree

Showing 34 changed files with 56 additions and 378 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     compile("org.eclipse.jetty:jetty-server:9.4.26.v20200117")
     compile("org.eclipse.jetty:jetty-servlet:9.4.26.v20200117")
+    compile("com.github.DaikonWeb:daikon-core:0.0.1")
     testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2")
     testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.1")

diff --git a/src/main/kotlin/daikon/BasicAuthentication.kt b/src/main/kotlin/daikon/BasicAuthentication.kt
@@ -1,6 +1,8 @@
 package daikon
 
-import daikon.RequestFlow.halt
+import daikon.core.Request
+import daikon.core.RequestFlow.halt
+import daikon.core.Response
 import org.eclipse.jetty.http.HttpHeader.AUTHORIZATION
 import org.eclipse.jetty.http.HttpHeader.WWW_AUTHENTICATE
 import java.nio.charset.StandardCharsets.UTF_8

diff --git a/src/main/kotlin/daikon/Context.kt b/src/main/kotlin/daikon/Context.kt
diff --git a/src/main/kotlin/daikon/DefaultRouteAction.kt b/src/main/kotlin/daikon/DefaultRouteAction.kt
diff --git a/src/main/kotlin/daikon/DummyRouteAction.kt b/src/main/kotlin/daikon/DummyRouteAction.kt
diff --git a/src/main/kotlin/daikon/HaltException.kt b/src/main/kotlin/daikon/HaltException.kt
diff --git a/src/main/kotlin/daikon/HttpRequest.kt b/src/main/kotlin/daikon/HttpRequest.kt
@@ -1,5 +1,8 @@
 package daikon
 
+import daikon.core.Method
+import daikon.core.PathParams
+import daikon.core.Request
 import javax.servlet.http.HttpServletRequest
 
 class HttpRequest(private val request: HttpServletRequest) : Request {

diff --git a/src/main/kotlin/daikon/HttpResponse.kt b/src/main/kotlin/daikon/HttpResponse.kt
@@ -1,5 +1,6 @@
 package daikon
 
+import daikon.core.Response
 import java.io.StringWriter
 import java.nio.charset.StandardCharsets.UTF_8
 import javax.servlet.http.HttpServletResponse

diff --git a/src/main/kotlin/daikon/HttpServer.kt b/src/main/kotlin/daikon/HttpServer.kt
@@ -1,6 +1,7 @@
 package daikon
 
-import daikon.Method.*
+import daikon.core.Method.*
+import daikon.core.*
 import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.servlet.DefaultServlet
 import org.eclipse.jetty.servlet.ServletContextHandler
@@ -163,7 +164,7 @@ class HttpServer(private val port: Int = 4545, initializeActions: HttpServer.()
     }
 
     fun after(path: String = "/*", action: (Request, Response) -> Unit): HttpServer {
-        afterActions.add(Route(ANY, joinPaths(path), DummyRouteAction(action)))
+        afterActions.add(Route(Method.ANY, joinPaths(path), DummyRouteAction(action)))
         return this
     }
 

diff --git a/src/main/kotlin/daikon/HttpStatus.kt b/src/main/kotlin/daikon/HttpStatus.kt
diff --git a/src/main/kotlin/daikon/Method.kt b/src/main/kotlin/daikon/Method.kt
diff --git a/src/main/kotlin/daikon/PathParams.kt b/src/main/kotlin/daikon/PathParams.kt
diff --git a/src/main/kotlin/daikon/Request.kt b/src/main/kotlin/daikon/Request.kt
diff --git a/src/main/kotlin/daikon/RequestFlow.kt b/src/main/kotlin/daikon/RequestFlow.kt
diff --git a/src/main/kotlin/daikon/Response.kt b/src/main/kotlin/daikon/Response.kt
diff --git a/src/main/kotlin/daikon/Route.kt b/src/main/kotlin/daikon/Route.kt
diff --git a/src/main/kotlin/daikon/RouteAction.kt b/src/main/kotlin/daikon/RouteAction.kt
diff --git a/src/main/kotlin/daikon/Routing.kt b/src/main/kotlin/daikon/Routing.kt