Merge branch 'main' into release

v0.2.2 release
huanshankeji · Aug 9, 2022 · cfba401 · cfba401
2 parents a415d92 + 624a5fa
commit cfba401
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt
@@ -2,7 +2,7 @@ import com.huanshankeji.CommonDependencies
 import com.huanshankeji.CommonVersions
 import com.huanshankeji.CommonGradleClasspathDependencies
 
-val projectVersion = "0.2.1"
+val projectVersion = "0.2.2"
 
 val commonVersions = CommonVersions()
 val commonDependencies = CommonDependencies(commonVersions)

diff --git a/core/src/jvmMain/kotlin/com/huanshankeji/collections/Collections.kt b/core/src/jvmMain/kotlin/com/huanshankeji/collections/Collections.kt
@@ -0,0 +1,5 @@
+package com.huanshankeji.collections
+
+fun List<*>.areElementsDistinct() =
+    // There is a more efficient implementation.
+    distinct().size == size
diff --git a/vertx/build.gradle.kts b/vertx/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
         //testImplementation("io.vertx", "vertx-web", classifier = "tests") // This does not work well.
         testImplementation(moduleWithoutVersion("web-client"))
     }
+    testImplementation(project(":net"))
 }
 
 kotlin.sourceSets["test"].languageSettings {

diff --git a/vertx/src/main/kotlin/com/huanshankeji/vertx/kotlin/coroutines/VertxCoroutine.kt b/vertx/src/main/kotlin/com/huanshankeji/vertx/kotlin/coroutines/VertxCoroutine.kt
@@ -62,3 +62,6 @@ fun <T> CoroutineScope.coroutineToFuture(
     }
     return promise.future()
 }
+
+suspend fun <T> List<Future<T>>.awaitAll() =
+    map { it.await() }
diff --git a/vertx/src/main/kotlin/com/huanshankeji/vertx/kotlin/coroutines/ext/web/CoroutineHandlers.kt b/vertx/src/main/kotlin/com/huanshankeji/vertx/kotlin/coroutines/ext/web/CoroutineHandlers.kt
@@ -0,0 +1,21 @@
+package com.huanshankeji.vertx.kotlin.coroutines.ext.web
+
+import com.huanshankeji.vertx.ext.web.checkedRun
+import io.vertx.ext.web.Route
+import io.vertx.ext.web.RoutingContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+// workaround for context receivers
+fun coroutineHandler(
+    coroutineScope: CoroutineScope, route: Route,
+    requestHandler: suspend (RoutingContext) -> Unit
+): Route =
+    route.handler { coroutineScope.launch { requestHandler(it) } }
+
+// workaround for context receivers
+fun checkedCoroutineHandler(
+    coroutineScope: CoroutineScope, route: Route,
+    requestHandler: suspend (RoutingContext) -> Unit
+): Route =
+    coroutineHandler(coroutineScope, route) { ctx -> ctx.checkedRun { requestHandler(ctx) } }
diff --git a/vertx/src/test/kotlin/com/huanshankeji/vertx/ext/web/RoutingContextBaseTest.kt b/vertx/src/test/kotlin/com/huanshankeji/vertx/ext/web/RoutingContextBaseTest.kt
@@ -1,6 +1,7 @@
 package com.huanshankeji.vertx.ext.web
 
 import com.huanshankeji.kotlin.use
+import com.huanshankeji.net.LOCALHOST
 import com.huanshankeji.vertx.VertxBaseTest
 import io.vertx.ext.web.Router
 import io.vertx.ext.web.RoutingContext
@@ -37,7 +38,7 @@ abstract class RoutingContextBaseTest : VertxBaseTest() {
         httpServer.use({
             val port = httpServer.actualPort()
             WebClient.create(vertx).use({
-                assertEquals(500, it.get(port, null, "").send().await().statusCode())
+                assertEquals(500, it.get(port, LOCALHOST, "").send().await().statusCode())
             }, { close() })
         }, { close().await() })
     }