Skip to content

Commit 83db590

Browse files
jaguilillajaguililla
authored
[ Kotlin / Hexagon ] Benchmark next release (#9563)
* Update dependencies * Update dependencies * Update dependencies * Update dependencies * Update dependencies * Fix native image settings * Change implementations * Update version * Add tests for new adapter * Update dependencies * Update dependencies
1 parent 83bb868 commit 83db590

File tree

40 files changed

+233
-164
lines changed

40 files changed

+233
-164
lines changed

‎frameworks/Kotlin/hexagon/benchmark_config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"notes": "http://hexagonkt.com",
4949
"versus": "servlet"
5050
},
51-
"jettyloom": {
51+
"jdk": {
5252
"json_url": "/json",
5353
"db_url": "/db",
5454
"query_url": "/query?queries=",
@@ -67,11 +67,11 @@
6767
"webserver": "None",
6868
"os": "Linux",
6969
"database_os": "Linux",
70-
"display_name": "Hexagon Jetty Loom PostgreSQL",
70+
"display_name": "Hexagon JDK PostgreSQL",
7171
"notes": "http://hexagonkt.com",
7272
"versus": "servlet"
7373
},
74-
"jettyloom-pgclient": {
74+
"jdk-pgclient": {
7575
"json_url": "/json",
7676
"db_url": "/db",
7777
"query_url": "/query?queries=",
@@ -90,7 +90,7 @@
9090
"webserver": "None",
9191
"os": "Linux",
9292
"database_os": "Linux",
93-
"display_name": "Hexagon Jetty Loom PgClient",
93+
"display_name": "Hexagon JDK PgClient",
9494
"notes": "http://hexagonkt.com",
9595
"versus": "servlet"
9696
},

‎frameworks/Kotlin/hexagon/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11

22
plugins {
3-
id "org.jetbrains.kotlin.jvm" version "2.0.21" apply false
4-
id "org.graalvm.buildtools.native" version "0.10.4" apply false
3+
id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false
4+
id "org.graalvm.buildtools.native" version "0.10.5" apply false
55
}
66

77
version = "1.0.0"
88
description = "TFB benchmark"
9-
group = "com.hexagonkt"
9+
group = "com.hexagontk"
1010

1111
ext {
12-
hexagonVersion = "3.7.3"
12+
hexagonVersion = "4.0.1"
1313
jettyVersion = "12.0.16"
14-
nettyVersion = "4.1.116.Final"
14+
nettyVersion = "4.1.118.Final"
1515

1616
hikariVersion = "6.2.1"
17-
postgresqlVersion = "42.7.4"
18-
vertxVersion = "4.5.11"
17+
postgresqlVersion = "42.7.5"
18+
vertxVersion = "4.5.12"
1919
cache2kVersion = "2.6.1.Final"
2020

21-
applicationClass = "com.hexagonkt.BenchmarkKt"
21+
applicationClass = "com.hexagontk.BenchmarkKt"
2222
modules = "java.naming,java.sql,java.management"
23-
gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/$hexagonVersion/gradle"
23+
gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle"
2424
}
2525

2626
subprojects {
@@ -30,5 +30,5 @@ subprojects {
3030
}
3131

3232
tasks.wrapper {
33-
gradleVersion = "8.10.2"
33+
gradleVersion = "8.12.1"
3434
}

‎frameworks/Kotlin/hexagon/config.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ platform = "Servlet"
1919
webserver = "None"
2020
versus = "servlet"
2121

22-
[jettyloom]
22+
[jdk]
2323
urls.plaintext = "/plaintext"
2424
urls.json = "/json"
2525
urls.db = "/db"
@@ -37,7 +37,7 @@ platform = "Servlet"
3737
webserver = "None"
3838
versus = "servlet"
3939

40-
[jettyloom-pgclient]
40+
[jdk-pgclient]
4141
urls.plaintext = "/plaintext"
4242
urls.json = "/json"
4343
urls.db = "/db"

‎frameworks/Kotlin/hexagon/core/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11

22
plugins {
3-
id("gg.jte.gradle") version("3.1.4")
3+
id("gg.jte.gradle") version("3.1.13")
44
}
55

66
dependencies {
77
api(project(":model"))
8-
api("com.hexagonkt:http_server:$hexagonVersion")
9-
api("com.hexagonkt:templates_jte:$hexagonVersion")
10-
api("com.hexagonkt:serialization_jackson_json:$hexagonVersion")
8+
api("com.hexagontk.http:http_server:$hexagonVersion")
9+
api("com.hexagontk.templates:templates_jte:$hexagonVersion")
10+
api("com.hexagontk.serialization:serialization_jackson_json:$hexagonVersion")
1111
api("org.cache2k:cache2k-core:$cache2kVersion")
1212

13-
jteGenerate("gg.jte:jte-native-resources:3.1.4")
13+
jteGenerate("gg.jte:jte-native-resources:3.1.13")
1414
}
1515

1616
tasks.register("minimizeTemplate") {

‎frameworks/Kotlin/hexagon/core/src/main/kotlin/Benchmark.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.hexagonkt
1+
package com.hexagontk
22

3-
import com.hexagonkt.http.server.HttpServer
4-
import com.hexagonkt.http.server.HttpServerPort
5-
import com.hexagonkt.http.server.HttpServerSettings
6-
import com.hexagonkt.store.BenchmarkStore
7-
import com.hexagonkt.templates.TemplatePort
3+
import com.hexagontk.http.server.HttpServer
4+
import com.hexagontk.http.server.HttpServerPort
5+
import com.hexagontk.http.server.HttpServerSettings
6+
import com.hexagontk.store.BenchmarkStore
7+
import com.hexagontk.templates.TemplatePort
88
import java.net.InetAddress
99
import java.net.URL
1010

‎frameworks/Kotlin/hexagon/core/src/main/kotlin/Controller.kt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
package com.hexagonkt
2-
3-
import com.hexagonkt.core.fieldsMapOf
4-
import com.hexagonkt.core.media.APPLICATION_JSON
5-
import com.hexagonkt.core.media.TEXT_HTML
6-
import com.hexagonkt.core.media.TEXT_PLAIN
7-
import com.hexagonkt.http.model.ContentType
8-
import com.hexagonkt.http.model.Header
9-
import com.hexagonkt.http.model.Headers
10-
import com.hexagonkt.http.server.callbacks.DateCallback
11-
import com.hexagonkt.http.handlers.HttpContext
12-
import com.hexagonkt.http.handlers.PathHandler
13-
import com.hexagonkt.http.handlers.path
14-
import com.hexagonkt.model.*
15-
import com.hexagonkt.serialization.jackson.json.Json
16-
import com.hexagonkt.serialization.serialize
17-
import com.hexagonkt.store.BenchmarkStore
18-
import com.hexagonkt.templates.TemplatePort
1+
package com.hexagontk
2+
3+
import com.hexagontk.core.fieldsMapOf
4+
import com.hexagontk.core.media.APPLICATION_JSON
5+
import com.hexagontk.core.media.TEXT_HTML
6+
import com.hexagontk.core.media.TEXT_PLAIN
7+
import com.hexagontk.http.model.ContentType
8+
import com.hexagontk.http.model.Field
9+
import com.hexagontk.http.model.Headers
10+
import com.hexagontk.http.server.callbacks.DateCallback
11+
import com.hexagontk.http.handlers.HttpContext
12+
import com.hexagontk.http.handlers.PathHandler
13+
import com.hexagontk.http.handlers.path
14+
import com.hexagontk.model.*
15+
import com.hexagontk.serialization.jackson.json.Json
16+
import com.hexagontk.serialization.serialize
17+
import com.hexagontk.store.BenchmarkStore
18+
import com.hexagontk.templates.TemplatePort
1919
import java.net.URL
2020
import java.util.concurrent.ThreadLocalRandom
2121
import kotlin.text.Charsets.UTF_8
@@ -35,7 +35,7 @@ class Controller(
3535
private val json: ContentType = ContentType(APPLICATION_JSON)
3636
private val html: ContentType = ContentType(TEXT_HTML, charset = UTF_8)
3737

38-
private val headers = Headers(Header("server", "Hexagon"))
38+
private val headers = Headers(Field("server", "Hexagon"))
3939

4040
val path: PathHandler by lazy {
4141
path {
@@ -105,7 +105,7 @@ class Controller(
105105
ok(body.serialize(Json.raw), contentType = json)
106106

107107
private fun HttpContext.getWorldsCount(parameter: String): Int =
108-
request.queryParameters[parameter]?.string()?.toIntOrNull().let {
108+
request.queryParameters[parameter]?.text?.toIntOrNull().let {
109109
when {
110110
it == null -> 1
111111
it < 1 -> 1

‎frameworks/Kotlin/hexagon/core/src/main/kotlin/store/BenchmarkStore.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.hexagonkt.store
1+
package com.hexagontk.store
22

3-
import com.hexagonkt.model.CachedWorld
4-
import com.hexagonkt.model.Fortune
5-
import com.hexagonkt.Settings
6-
import com.hexagonkt.model.World
3+
import com.hexagontk.model.CachedWorld
4+
import com.hexagontk.model.Fortune
5+
import com.hexagontk.Settings
6+
import com.hexagontk.model.World
77
import org.cache2k.Cache
88
import org.cache2k.Cache2kBuilder
99

‎frameworks/Kotlin/hexagon/core/src/main/resources/META-INF/native-image/com.hexagonkt.benchmark/core/native-image.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ Args= \
33
--static \
44
--libc=musl \
55
--gc=G1 \
6-
--enable-sbom
6+
--enable-sbom \
7+
--initialize-at-build-time=org.slf4j.LoggerFactory \
8+
--initialize-at-build-time=org.slf4j.helpers.Reporter \
9+
--initialize-at-build-time=org.slf4j.LoggerFactoinitialize-at-build-timery

‎frameworks/Kotlin/hexagon/core/src/main/resources/fortunes.jte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import java.util.*
2-
@import com.hexagonkt.model.Fortune
2+
@import com.hexagontk.model.Fortune
33

44
@param List<Fortune> fortunes
55

‎frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)