Merge pull request #624 from hexagonkt/develop

Minor fixes

core/src/main/kotlin/com/hexagonkt/core/Jvm.kt

@@ -11,6 +11,8 @@ import kotlin.reflect.KClass
  * Object with utilities to gather information about the running JVM.
  */
 object Jvm {
+    private val runtime: Runtime by lazy { Runtime.getRuntime() }
+
     /** Default timezone. */
     val timeZone: TimeZone by lazy { TimeZone.getDefault() }
 
@@ -30,22 +32,38 @@ object Jvm {
     val ip: String by lazy { InetAddress.getLocalHost().hostAddress }
 
     /** Name of the JVM running this program. For example: OpenJDK 64-Bit Server VM. */
-    val name: String by lazy { System.getProperty("java.vm.name") }
+    val name: String by lazy { System.getProperty("java.vm.name", "N/A") }
 
     /** Java version aka language level. For example: 11 */
-    val version: String by lazy { System.getProperty("java.vm.specification.version") }
+    val version: String by lazy { System.getProperty("java.vm.specification.version", "N/A") }
 
     /** Number of processors available to the Java virtual machine. */
-    val cpuCount: Int by lazy { Runtime.getRuntime().availableProcessors() }
+    val cpuCount: Int by lazy { runtime.availableProcessors() }
 
     /** User Time Zone property. Can be set with -D user.timezone=<tz> JVM argument. */
-    val timezone: String by lazy { System.getProperty("user.timezone") }
+    val timezone: String by lazy { System.getProperty("user.timezone", "N/A") }
 
     /** User locale consist of 2-letter language code, 2-letter country code and file encoding. */
     val localeCode: String by lazy {
         "%s_%s.%s".format(locale.language, locale.country, charset.name())
     }
 
+    /**
+     * Amount of memory in kilobytes available to the JVM.
+     *
+     * @return Total amount of memory in kilobytes.
+     */
+    fun totalMemory(): String =
+        runtime.totalMemory().let { "%,d".format(it / 1024) }
+
+    /**
+     * Amount of used memory in kilobytes.
+     *
+     * @return Used memory in kilobytes.
+     */
+    fun usedMemory(): String =
+        (runtime.totalMemory() - runtime.freeMemory()).let { "%,d".format(it / 1024) }
+
     /**
      * Retrieve a setting by name by looking in the JVM system properties first and in OS
      * environment variables if not found.
@@ -90,6 +108,6 @@ object Jvm {
 
     private fun systemSettingRaw(name: String): String? {
         require(name.isNotBlank()) { "Setting name can not be blank" }
-        return System.getProperty(name) ?: System.getenv(name)
+        return System.getProperty(name, System.getenv(name))
     }
 }

core/src/test/kotlin/com/hexagonkt/core/JvmTest.kt

@@ -40,6 +40,12 @@ internal class JvmTest {
         assert(Inet4Address.getAllByName(Jvm.ip).isNotEmpty())
     }
 
+    @Test fun `JVM metrics have valid values` () {
+        val numberRegex = Regex("[\\d.,]+")
+        assert(Jvm.totalMemory().matches(numberRegex))
+        assert(Jvm.usedMemory().matches(numberRegex))
+    }
+
     @Test fun `Locale code matches with default locale` () {
         assert(Jvm.localeCode.contains(Jvm.locale.country))
         assert(Jvm.localeCode.contains(Jvm.locale.language))

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.warning.mode=all
 org.gradle.console=plain
 
 # Gradle
-version=2.8.2
+version=2.8.3
 group=com.hexagonkt
 description=The atoms of your platform
 
@@ -39,7 +39,7 @@ mockkVersion=1.13.5
 junitVersion=5.9.3
 gatlingVersion=3.9.3
 jmhVersion=1.36
-mkdocsMaterialVersion=9.1.8
+mkdocsMaterialVersion=9.1.9
 mermaidDokkaVersion=0.4.4
 nativeToolsVersion=0.9.21
 
@@ -48,7 +48,7 @@ servletVersion=5.0.0
 jettyVersion=11.0.15
 
 # http_server_netty
-nettyVersion=4.1.91.Final
+nettyVersion=4.1.92.Final
 nettyTcNativeVersion=2.0.60.Final
 
 # logging
@@ -63,7 +63,7 @@ dslJsonVersion=1.10.0
 freemarkerVersion=2.3.32
 
 # templates_pebble
-pebbleVersion=3.2.0
+pebbleVersion=3.2.1
 
 # templates_rocker
 rockerVersion=1.3.0

http_client_jetty/src/main/kotlin/com/hexagonkt/http/client/jetty/JettyClientAdapter.kt

@@ -170,14 +170,15 @@ open class JettyClientAdapter : HttpClientPort {
         val settings = adapterHttpClient.settings
         val contentType = request.contentType ?: settings.contentType
         val authorization = request.authorization ?: settings.authorization
+        val baseUrl = settings.baseUrl
 
         if (settings.useCookies) {
-            val uri = (adapterHttpClient.settings.baseUrl ?: request.url()).toURI()
+            val uri = (baseUrl ?: request.url()).toURI()
             addCookies(uri, adapterJettyClient.cookieStore, request.cookies)
         }
 
         val jettyRequest = adapterJettyClient
-            .newRequest(URI(settings.baseUrl.toString() + request.path))
+            .newRequest(URI((baseUrl?.toString() ?: "") + request.path))
             .method(HttpMethod.valueOf(request.method.toString()))
             .headers {
                 it.remove("accept-encoding") // Don't send encoding by default

http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt

@@ -20,6 +20,8 @@ import com.hexagonkt.core.Ansi.DEFAULT
 import com.hexagonkt.core.Ansi.MAGENTA
 import com.hexagonkt.core.Ansi.RESET
 import com.hexagonkt.core.Ansi.UNDERLINE
+import com.hexagonkt.core.Jvm.totalMemory
+import com.hexagonkt.core.Jvm.usedMemory
 import com.hexagonkt.core.prependIndent
 import com.hexagonkt.http.server.HttpServerFeature.ZIP
 import com.hexagonkt.http.handlers.HttpHandler
@@ -127,7 +129,7 @@ data class HttpServer(
         )
 
         adapter.startUp(this)
-        logger.info { "Server started\n${createBanner(nanoTime() - startTimestamp)}" }
+        logger.info { "Server started${createBanner(nanoTime() - startTimestamp)}" }
     }
 
     /**
@@ -146,7 +148,10 @@ data class HttpServer(
         val hostName = if (bindAddress.isAnyLocalAddress) ip else bindAddress.canonicalHostName
         val scheme = if (protocol == HTTP) "http" else "https"
         val binding = "$scheme://$hostName:$runtimePort"
+        val banner = settings.banner ?: return " at $binding ($startUpTime ms)"
 
+        val jvmMemoryValue = "$BLUE${totalMemory()} KB$RESET"
+        val usedMemoryValue = "$BOLD$MAGENTA${usedMemory()} KB$RESET"
         val serverAdapterValue = "$BOLD$CYAN$portName$RESET"
 
         val protocols = adapter.supportedProtocols()
@@ -180,16 +185,16 @@ data class HttpServer(
             Supported Features: $features
             Configuration Options: $options
 
-            🖥️️ Running in '$hostnameValue' with $cpuCountValue CPUs
+            🖥️️ Running in '$hostnameValue' with $cpuCountValue CPUs $jvmMemoryValue of memory
             🛠 Using $javaVersionValue
             🌍 Locale: $localeValue Timezone: $timezoneValue Charset: $charsetValue
 
-            ⏱️ Started in $startUpTimeValue (excluding VM)
+            ⏱️ Started in $startUpTimeValue (excluding VM) using $usedMemoryValue
             🚀 Served at $bindingValue${if (protocol == HTTP2) " (HTTP/2)" else "" }
 
             """
 
-        val banner = (settings.banner?.let { "$it\n" } ?: banner) + information.trimIndent()
-        return banner.prependIndent()
+        val fullBanner = banner + information.trimIndent()
+        return "\n" + fullBanner.prependIndent()
     }
 }

http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServerSettings.kt

@@ -22,6 +22,6 @@ data class HttpServerSettings(
     val contextPath: String = "",
     val protocol: HttpProtocol = HTTP,
     val sslSettings: SslSettings? = null,
-    val banner: String? = null,
+    val banner: String? = HttpServer.banner,
     val zip: Boolean = false,
 )

http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerSettingsTest.kt

@@ -14,7 +14,7 @@ internal class HttpServerSettingsTest {
             assertEquals(2010, it.bindPort)
             assertEquals(HTTP, it.protocol)
             assertNull(it.sslSettings)
-            assertNull(it.banner)
+            assertEquals(HttpServer.banner, it.banner)
             assertEquals(false, it.zip)
         }
     }
@@ -25,7 +25,7 @@ internal class HttpServerSettingsTest {
             assertEquals(2010, it.bindPort)
             assertEquals(HTTP, it.protocol)
             assertNull(it.sslSettings)
-            assertNull(it.banner)
+            assertEquals(HttpServer.banner, it.banner)
             assertEquals(true, it.zip)
         }
     }

http_server/src/test/kotlin/com/hexagonkt/http/server/HttpServerTest.kt

@@ -39,6 +39,23 @@ internal class HttpServerTest {
         assertEquals(12345, server.runtimePort)
     }
 
+    @Test fun `Server without banner creation`() {
+        val serverSettings = HttpServerSettings(
+            address("localhost"),
+            12345,
+            banner = null,
+        )
+
+        val s = serve(VoidAdapter, serverSettings) {}
+        s.createBanner(System.currentTimeMillis()).let {
+            assert(it.startsWith(" at"))
+            assert(it.contains(" ms)"))
+            assert(!it.contains("✅HTTP"))
+            assert(!it.contains("HTTPS"))
+            assert(!it.contains("(excluding VM)"))
+        }
+    }
+
     @Test fun `Banner creation`() {
         val bannerPrefix = "Test Banner"
         val serverSettings = HttpServerSettings(
@@ -47,21 +64,15 @@ internal class HttpServerTest {
             banner = bannerPrefix,
         )
 
-        val banners = listOf(
-            serve(VoidAdapter, serverSettings) {},
-        )
-        .map {
-            it.createBanner(System.currentTimeMillis())
-        }
-        .map {
-            assertEquals(bannerPrefix, it.lines()[0].trimIndent())
+        val s = serve(VoidAdapter, serverSettings) {}
+        s.createBanner(System.currentTimeMillis()).let {
+            assertEquals(bannerPrefix, it.lines()[1].trimIndent())
             assertContains(it, "✅HTTP" )
             assertContains(it, "HTTPS")
             assertFalse(it.contains("ZIP"))
             assertFalse(it.contains("✅HTTPS"))
-            it
+            assertContains(it, "(excluding VM)")
         }
-        assertContains(banners.first(), "(excluding VM)")
     }
 
     @Test fun `Banner creation with enabled features and custom options`() {

http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletFilter.kt

@@ -33,7 +33,6 @@ class ServletFilter(
             """'$filterName' Servlet filter initialized.
               |  * Context path: ${filterConfig.servletContext.contextPath}
               |  * Parameters: $parameterNames
-              |  * Server settings: $serverSettings
             """.trimMargin()
         }
     }

http_test/src/main/kotlin/com/hexagonkt/http/test/examples/BenchmarkSimulation.kt

@@ -16,7 +16,8 @@ class BenchmarkSimulation: Simulation() {
     private val http = HttpDsl.http.baseUrl("$protocol://$host:$port")
     private val population = CoreDsl.rampUsers(users).during(5)
 
-    private val getBooks = CoreDsl.repeat(times).on(CoreDsl.exec(HttpDsl.http("get /a/books").get("/a/books")))
+    private val getBooks =
+        CoreDsl.repeat(times).on(CoreDsl.exec(HttpDsl.http("get /a/books").get("/a/books")))
 
     private val scenario = CoreDsl.scenario("Get Books").exec(getBooks)
 

http_test/src/main/kotlin/com/hexagonkt/http/test/examples/ClientTest.kt

@@ -192,6 +192,12 @@ abstract class ClientTest(
         assertEquals("qp=qpValue", getResponse.headers["query-parameters"]?.value)
         assertEquals("qp=qpValue", response.headers["query-parameters"]?.value)
         checkResponse(response, mapOf("body" to "payload"))
+
+        val base = client.settings.baseUrl?.toString()
+        HttpClient(clientAdapter(), client.settings.copy(baseUrl = null)).request {
+            val secondResponse = get("$base/queryParameters?qp=qpValue")
+            assertEquals("qp=qpValue", secondResponse.headers["query-parameters"]?.value)
+        }
     }
 
     @Test fun `HTTP methods without body work ok`() {

http_test/src/test/kotlin/com/hexagonkt/http/test/HelloWorldTest.kt

@@ -37,7 +37,8 @@ fun main() {
 internal class HelloWorldTest {
 
     private val client: HttpClient by lazy {
-        HttpClient(JettyClientAdapter(), HttpClientSettings(URL("http://localhost:${server.runtimePort}")))
+        val settings = HttpClientSettings(URL("http://localhost:${server.runtimePort}"))
+        HttpClient(JettyClientAdapter(), settings)
     }
 
     @BeforeAll fun initialize() {