Simplify callbacks usage

hexagontk · Mar 17, 2024 · e02615f · e02615f
1 parent b17b24f
commit e02615f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/http/http_server/api/http_server.api b/http/http_server/api/http_server.api
@@ -104,6 +104,7 @@ public final class com/hexagonkt/http/server/callbacks/DateCallback : kotlin/jvm
 
 public final class com/hexagonkt/http/server/callbacks/FileCallback : kotlin/jvm/functions/Function1 {
 	public fun <init> (Ljava/io/File;)V
+	public fun <init> (Ljava/lang/String;)V
 	public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext;
 	public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object;
 }
@@ -117,6 +118,7 @@ public final class com/hexagonkt/http/server/callbacks/LoggingCallback : kotlin/
 }
 
 public final class com/hexagonkt/http/server/callbacks/UrlCallback : kotlin/jvm/functions/Function1 {
+	public fun <init> (Ljava/lang/String;)V
 	public fun <init> (Ljava/net/URL;)V
 	public fun invoke (Lcom/hexagonkt/http/handlers/HttpContext;)Lcom/hexagonkt/http/handlers/HttpContext;
 	public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object;

diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/FileCallback.kt
@@ -18,6 +18,9 @@ import java.io.File
  * @param file Base file used to resolve paths passed on the request.
  */
 class FileCallback(private val file: File) : (HttpContext) -> HttpContext {
+
+    constructor(file: String) : this(File(file))
+
     private companion object {
         val logger: Logger = Logger(FileCallback::class)
     }

diff --git a/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt b/http/http_server/src/main/kotlin/com/hexagonkt/http/server/callbacks/UrlCallback.kt
@@ -10,6 +10,9 @@ import com.hexagonkt.http.handlers.HttpContext
 import java.net.URL
 
 class UrlCallback(private val url: URL) : (HttpContext) -> HttpContext {
+
+    constructor(url: String) : this(urlOf(url))
+
     private companion object {
         val logger: Logger = Logger(UrlCallback::class)
     }

diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/FileCallbackTest.kt
@@ -70,7 +70,7 @@ internal class FileCallbackTest {
         requestPath: String,
         pathPattern: String
     ): HttpResponsePort =
-        FileCallback(File(filePath))(
+        FileCallback(filePath)(
             HttpContext(
                 request = HttpRequest(path = requestPath),
                 predicate = HttpPredicate(pathPattern = TemplatePathPattern(pathPattern)),

diff --git a/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt b/http/http_server/src/test/kotlin/com/hexagonkt/http/server/callbacks/UrlCallbackTest.kt
@@ -70,7 +70,7 @@ internal class UrlCallbackTest {
         requestPath: String,
         pathPattern: String
     ): HttpResponsePort =
-        UrlCallback(urlOf(url))(
+        UrlCallback(url)(
             HttpContext(
                 HttpCall(HttpRequest(path = requestPath)),
                 HttpPredicate(pathPattern = TemplatePathPattern(pathPattern))