Add blackbird test and update Hexagon version (#6849)

* Fix error with URLs in JEE servers

* Clean up

* Avoid classpath URLs

* Fix template loading error

* Fix template loading error

* Chores

* Fix template loading error

* Delete MongoDB DB support

Storage support in Hexagon will be moved outside the Toolkit, and so, it will be left outside the benchmark.

* Fix runtime problem

* Update Hexagon version

* Make Jackson Blackbird module optional

* Add variation with Blackbird module enabled

* Upgrade Hexagon version

Author: jaguililla

frameworks/Kotlin/hexagon/benchmark_config.json

@@ -25,6 +25,29 @@
                 "notes": "http://hexagonkt.com",
                 "versus": "servlet"
             },
+            "blackbird": {
+                "json_url": "/json",
+                "db_url": "/postgresql/db",
+                "query_url": "/postgresql/query?queries=",
+                "fortune_url": "/postgresql/pebble/fortunes",
+                "update_url": "/postgresql/update?queries=",
+                "cached_query_url": "/postgresql/cached?count=",
+                "plaintext_url": "/plaintext",
+                "port": 9090,
+                "approach": "Realistic",
+                "classification": "Micro",
+                "database": "postgres",
+                "framework": "Hexagon",
+                "language": "Kotlin",
+                "orm": "Raw",
+                "platform": "Servlet",
+                "webserver": "None",
+                "os": "Linux",
+                "database_os": "Linux",
+                "display_name": "Hexagon Jetty PostgreSQL",
+                "notes": "http://hexagonkt.com",
+                "versus": "servlet"
+            },
             "resin": {
                 "json_url": "/json",
                 "db_url": "/postgresql/db",

frameworks/Kotlin/hexagon/build.gradle

@@ -1,17 +1,17 @@
 
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.5.21"
+    id "org.jetbrains.kotlin.jvm" version "1.5.31"
 }
 
 ext {
-    gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/1.4.2/gradle"
+    gradleScripts = "https://raw.githubusercontent.com/hexagonkt/hexagon/1.4.7/gradle"
 
-    hexagonVersion = "1.4.2"
+    hexagonVersion = "1.4.7"
     hikariVersion = "5.0.0"
-    jettyVersion = "10.0.6"
-    postgresqlVersion = "42.2.23"
+    jettyVersion = "10.0.7"
+    postgresqlVersion = "42.2.24"
     cache2kVersion = "2.2.1.Final"
-    jacksonBlackbirdVersion = "2.12.4"
+    jacksonBlackbirdVersion = "2.13.0"
 }
 
 apply(from: "$gradleScripts/kotlin.gradle")

frameworks/Kotlin/hexagon/config.toml

@@ -19,6 +19,24 @@ platform = "Servlet"
 webserver = "None"
 versus = "servlet"
 
+[blackbird]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+urls.db = "/postgresql/db"
+urls.query = "/postgresql/query?queries="
+urls.update = "/postgresql/update?queries="
+urls.fortune = "/postgresql/pebble/fortunes"
+urls.cached_query = "/postgresql/cached?count="
+approach = "Realistic"
+classification = "Micro"
+database = "postgres"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = "Servlet"
+webserver = "None"
+versus = "servlet"
+
 [resin]
 urls.plaintext = "/plaintext"
 urls.json = "/json"

frameworks/Kotlin/hexagon/hexagon-blackbird.dockerfile

@@ -0,0 +1,26 @@
+#
+# BUILD
+#
+FROM gradle:7.2-jdk11 AS gradle_build
+USER root
+WORKDIR /hexagon
+
+COPY src src
+COPY build.gradle build.gradle
+RUN gradle --quiet
+
+#
+# RUNTIME
+#
+FROM adoptopenjdk:11-jre-hotspot-bionic
+ENV DBSTORE postgresql
+ENV POSTGRESQL_DB_HOST tfb-database
+ENV WEBENGINE jetty
+ENV PROJECT hexagon
+ENV ENABLE_BLACKBIRD true
+
+COPY --from=gradle_build /hexagon/build/install/$PROJECT /opt/$PROJECT
+
+EXPOSE 9090
+
+ENTRYPOINT /opt/$PROJECT/bin/$PROJECT

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

@@ -1,6 +1,7 @@
 package com.hexagonkt
 
 import com.fasterxml.jackson.module.blackbird.BlackbirdModule
+import com.hexagonkt.helpers.Jvm
 import com.hexagonkt.http.server.Server
 import com.hexagonkt.http.server.ServerPort
 import com.hexagonkt.http.server.ServerSettings
@@ -36,7 +37,7 @@ internal val benchmarkServer: Server by lazy {
 }
 
 fun main() {
-    if (System.getenv().containsKey("ENABLE_BLACKBIRD"))
+    if (Jvm.systemFlag("ENABLE_BLACKBIRD"))
         Json.mapper.registerModule(BlackbirdModule())
     SerializationManager.mapper = JacksonMapper
     SerializationManager.formats = linkedSetOf(Json)