Merge pull request #625 from hexagonkt/develop

Develop
hexagontk · May 4, 2023 · b52ac89 · b52ac89
2 parents c9a2820 + f968ec3
commit b52ac89
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 11 deletions.
diff --git a/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt b/core/src/main/kotlin/com/hexagonkt/core/Jvm.kt
@@ -40,9 +40,6 @@ object Jvm {
     /** Number of processors available to the Java virtual machine. */
     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", "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())

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.warning.mode=all
 org.gradle.console=plain
 
 # Gradle
-version=2.8.3
+version=2.8.4
 group=com.hexagonkt
 description=The atoms of your platform
 

diff --git a/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt b/http/src/main/kotlin/com/hexagonkt/http/model/Cookie.kt
@@ -2,7 +2,6 @@ package com.hexagonkt.http.model
 
 import java.time.Instant
 
-// TODO Handle 'path', 'httpOnly', 'sameSite' and 'expires'
 data class Cookie(
     val name: String,
     val value: String,

diff --git a/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt b/http/src/main/kotlin/com/hexagonkt/http/model/HttpField.kt
@@ -1,8 +1,7 @@
 package com.hexagonkt.http.model
 
 /**
- * TODO
- * Used in headers, query parameters and form parameters
+ * HTTP multi-value field. Used in headers, query parameters and form parameters.
  */
 interface HttpField {
     val name: String

diff --git a/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt b/http_server/src/main/kotlin/com/hexagonkt/http/server/HttpServer.kt
@@ -8,7 +8,6 @@ import com.hexagonkt.core.Jvm.ip
 import com.hexagonkt.core.Jvm.name
 import com.hexagonkt.core.Jvm.version
 import com.hexagonkt.core.Jvm.localeCode
-import com.hexagonkt.core.Jvm.timezone
 import com.hexagonkt.http.model.HttpProtocol.HTTP2
 import com.hexagonkt.http.model.HttpProtocol.HTTP
 
@@ -20,6 +19,7 @@ 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.timeZone
 import com.hexagonkt.core.Jvm.totalMemory
 import com.hexagonkt.core.Jvm.usedMemory
 import com.hexagonkt.core.prependIndent
@@ -172,7 +172,7 @@ data class HttpServer(
         val javaVersionValue = "$BOLD${BLUE}Java $version$RESET [$BLUE$name$RESET]"
 
         val localeValue = "$BLUE$localeCode$RESET"
-        val timezoneValue = "$BLUE$timezone$RESET"
+        val timezoneValue = "$BLUE${timeZone.id}$RESET"
         val charsetValue = "$BLUE$charset$RESET"
 
         val startUpTimeValue = "$BOLD$MAGENTA$startUpTime ms$RESET"

diff --git a/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt b/http_server_servlet/src/main/kotlin/com/hexagonkt/http/server/servlet/ServletServer.kt
@@ -81,7 +81,7 @@ abstract class ServletServer(
         val javaVersionValue = "$BOLD${BLUE}Java ${Jvm.version}$RESET [$BLUE${Jvm.name}$RESET]"
 
         val localeValue = "$BLUE${Jvm.localeCode}$RESET"
-        val timezoneValue = "$BLUE${Jvm.timezone}$RESET"
+        val timezoneValue = "$BLUE${Jvm.timeZone.id}$RESET"
         val charsetValue = "$BLUE${Jvm.charset}$RESET"
 
         val bootTimeValue = "$BOLD$MAGENTA$bootTime s$RESET"

diff --git a/site/build.gradle.kts b/site/build.gradle.kts
@@ -35,7 +35,6 @@ val footer = file("footer.txt").readLines().joinToString(" ") { it.trim() }
 val dokkaConfiguration =
     mapOf("org.jetbrains.dokka.base.DokkaBase" to """{ "footerMessage": "$footer" }""")
 
-// TODO Make this task depend on 'assets' directory to update it upon changes on those CSS files
 rootProject.tasks.named<DokkaMultiModuleTask>("dokkaHtmlMultiModule") {
     outputDirectory.set(rootProject.file("site/build/content/api"))
     pluginsMapConfiguration.set(dokkaConfiguration)