vertx-web-kotlin-dsljson updates (#10492)

Author: awmcc90

frameworks/Kotlin/vertx-web-kotlin-dsljson/build.gradle.kts

@@ -1,10 +1,9 @@
-import nu.studer.gradle.rocker.RockerConfig
+import java.net.URI
+import java.nio.charset.StandardCharsets
 import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask
-import java.net.URI
-import java.nio.charset.StandardCharsets
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -73,8 +72,12 @@ dependencies {
 
     // Log4j
     implementation(libs.log4j.core)
+    kapt(libs.log4j.core)
+
     implementation(libs.log4j.api)
     implementation(libs.log4j.api.kotlin)
+
+    // Disruptor
     implementation(libs.disruptor)
 
     // Rocker
@@ -85,7 +88,7 @@ dependencies {
 rocker {
     version = libs.versions.rocker.asProvider().get()
     configurations {
-        create("main") {
+        create("main").apply {
             javaVersion = "25"
             templateDir = project.layout.projectDirectory.dir("src/main/resources/rocker")
             outputDir = project.layout.buildDirectory.dir("generated/source/rocker")
@@ -171,7 +174,12 @@ tasks {
     }
 
     shadowJar {
+        mainClass = application.mainClass.get()
         archiveClassifier = "fat"
         mergeServiceFiles()
+        entryCompression = ZipEntryCompression.STORED
+
+        exclude("META-INF/versions/**/module-info.class")
+        exclude("module-info.class")
     }
 }

frameworks/Kotlin/vertx-web-kotlin-dsljson/gradle.properties

@@ -2,9 +2,7 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configureondemand=true
-
-org.gradle.jvmargs=-Xms512m -Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8
-org.gradle.workers.max=8
+org.gradle.jvmargs=-Xms2g -Xmx4g -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC -Dfile.encoding=UTF-8
 
 kotlin.incremental=true
 kotlin.parallel.tasks.in.project=true

frameworks/Kotlin/vertx-web-kotlin-dsljson/src/main/kotlin/com/example/starter/db/WorldRepository.kt

@@ -12,22 +12,22 @@ import io.vertx.sqlclient.Tuple
 import io.vertx.sqlclient.impl.SqlClientInternal
 import io.vertx.sqlclient.internal.ArrayTuple
 import java.util.concurrent.ThreadLocalRandom
-import java.util.concurrent.atomic.AtomicInteger
 
 @Suppress("NOTHING_TO_INLINE", "UNCHECKED_CAST")
 class WorldRepository private constructor(
     conn: PgConnection,
     private val selectWorldQuery: PreparedQuery<RowSet<Row>>,
     private val updateWorldQueries: Array<PreparedQuery<RowSet<Row>>>,
 ) : AbstractRepository<World>(conn) {
+
     fun selectRandomWorld(): Future<World> = selectWorldQuery
         .execute(Tuple.of(randomWorld()))
         .map { map(it.first()) }
 
     fun selectRandomWorlds(numWorlds: Int): Future<Array<World>> {
         val promise = Promise.promise<Array<World>>()
         val arr = arrayOfNulls<World>(numWorlds)
-        val count = AtomicInteger(0)
+        var count = 0
         (this.conn as SqlClientInternal).group { c ->
             val query = c.preparedQuery(SELECT_WORLD_SQL)
             repeat(numWorlds) { _ ->
@@ -36,13 +36,13 @@ class WorldRepository private constructor(
                         when {
                             ar.succeeded() -> {
                                 val result = ar.result()
-                                val index = count.getAndIncrement()
+                                val index = count++
                                 arr[index] = map(result.iterator().next())
                                 if (index == numWorlds - 1) {
                                     promise.complete(arr as Array<World>)
                                 }
                             }
-                            else -> promise.fail(ar.cause())
+                            else -> promise.tryFail(ar.cause())
                         }
                     }
             }
@@ -68,6 +68,7 @@ class WorldRepository private constructor(
         private const val SELECT_WORLD_SQL = "SELECT id, randomnumber FROM world WHERE id = $1"
 
         private inline fun randomWorld(): Int = 1 + ThreadLocalRandom.current().nextInt(10_000)
+
         private inline fun map(row: Row): World = World(
             row.getInteger(0),
             row.getInteger(1),

frameworks/Kotlin/vertx-web-kotlin-dsljson/src/main/kotlin/com/example/starter/handlers/DefaultHandler.kt

@@ -6,6 +6,7 @@ import io.vertx.core.buffer.Buffer
 import io.vertx.core.http.HttpServerRequest
 
 class DefaultHandler : AbstractHandler() {
+
     fun plaintext(req: HttpServerRequest): Future<Void> = req
         .response().apply {
             headers().setAll(PeriodicResolver.plaintext)

frameworks/Kotlin/vertx-web-kotlin-dsljson/src/main/kotlin/com/example/starter/helpers/Properties.kt

@@ -26,67 +26,12 @@ object Properties {
      */
     val EVENT_LOOP_POOL_SIZE: Int = SystemPropertyUtil.getInt("tfb.eventLoopPoolSize", CpuCoreSensor.availableProcessors())
 
-    /**
-     * Whether metrics are enabled.
-     * Default: Reverse of `vertx.disableMetrics` (defaults to true)
-     */
-    val METRICS_ENABLED: Boolean = SystemPropertyUtil.getBoolean("vertx.disableMetrics", true).not()
-
     /**
      * Port the HTTP server listens on.
      * Default: 8080 (tfb.http.port)
      */
     val HTTP_PORT: Int = SystemPropertyUtil.getInt("tfb.http.port", 8080)
 
-    /**
-     * Size of TCP send buffer for HTTP connections, in bytes.
-     * Default: 32768 (tfb.http.sendBufferSize)
-     */
-    val HTTP_SEND_BUFFER_SIZE: Int = SystemPropertyUtil.getInt("tfb.http.sendBufferSize", 256 * 1024)
-
-    /**
-     * Size of TCP receive buffer for HTTP connections, in bytes.
-     * Default: 32768 (tfb.http.receiveBufferSize)
-     */
-    val HTTP_RECEIVE_BUFFER_SIZE: Int = SystemPropertyUtil.getInt("tfb.http.receiveBufferSize", 256 * 1024)
-
-    /**
-     * Enables TCP Fast Open on the HTTP server.
-     * Default: true (tfb.http.tcpFastOpen)
-     */
-    val HTTP_TCP_FASTOPEN: Boolean = SystemPropertyUtil.getBoolean("tfb.http.tcpFastOpen", false)
-
-    /**
-     * Enables TCP_NODELAY (disables Nagle) on HTTP connections.
-     * Default: true (tfb.http.tcpNoDelay)
-     */
-    val HTTP_TCP_NODELAY: Boolean = SystemPropertyUtil.getBoolean("tfb.http.tcpNoDelay", false)
-
-    /**
-     * Idle timeout for HTTP connections in seconds.
-     * 0 disables idle timeout.
-     * Default: 0 (tfb.http.idleTimeout)
-     */
-    val HTTP_IDLE_TIMEOUT: Int = SystemPropertyUtil.getInt("tfb.http.idleTimeout", 0)
-
-    /**
-     * Enables SO_REUSEADDR on the HTTP server socket.
-     * Default: true (tfb.http.reuseAddress)
-     */
-    val HTTP_REUSE_ADDRESS: Boolean = SystemPropertyUtil.getBoolean("tfb.http.reuseAddress", true)
-
-    /**
-     * Enables SO_REUSEPORT on the HTTP server socket.
-     * Default: true (tfb.http.reusePort)
-     */
-    val HTTP_REUSE_PORT: Boolean = SystemPropertyUtil.getBoolean("tfb.http.reusePort", true)
-
-    /**
-     * Size of the TCP accept backlog for the HTTP server.
-     * Default: 8192 (tfb.http.acceptBacklog)
-     */
-    val HTTP_ACCEPT_BACKLOG: Int = SystemPropertyUtil.getInt("tfb.http.acceptBacklog", 8192)
-
     /**
      * PostgreSQL username used for connections.
      * Default: benchmarkdbuser (tfb.pg.user)
@@ -157,7 +102,7 @@ object Properties {
             cachePreparedStatements = PG_CACHE_PREPARED_STATEMENTS,
             preparedStatementCacheMaxSize = PG_PREPARED_STATEMENT_CACHE_MAX_SIZE,
             tracingPolicy = TracingPolicy.IGNORE,
-            pipeliningLimit = PG_PIPELINING_LIMIT
+            pipeliningLimit = PG_PIPELINING_LIMIT,
         )
     }
 }