Merge pull request #28 from TrueNine/dev

0.0.24

Author: TrueNine

build-logic/src/main/kotlin/buildlogic.spotless-sql-conventions.gradle.kts

@@ -9,14 +9,5 @@ spotless {
   sql {
     lineEndings = LineEnding.UNIX
     target("**/**.sql")
-    idea()
-      .codeStyleSettingsPath(
-        rootProject
-          .layout
-          .projectDirectory
-          .file(".idea/codeStyles/Project.xml")
-          .asFile
-          .absolutePath
-      )
   }
 }

gradle/libs.versions.toml

@@ -48,7 +48,7 @@ org-springframework-modulith = "2.0.0-M1"
 org-springframework-security = "6.5.2"
 org-testcontainers = "1.21.3"
 org-testng = "7.11.0"
-project = "0.0.23"
+project = "0.0.24"
 
 [libraries]
 cn-dev33-sa-token-redis-jackson = { module = "cn.dev33:sa-token-redis-jackson", version.ref = "cn-dev33-sa-token" }

testtoolkit/src/main/kotlin/io/github/truenine/composeserver/testtoolkit/SpringBootConfigurationPropertiesPrefixes.kt

@@ -4,4 +4,11 @@ object SpringBootConfigurationPropertiesPrefixes {
   const val ROOT = "compose"
   const val TESTTOOLKIT = "$ROOT.testtoolkit"
   const val TESTTOOLKIT_TESTCONTAINERS = "$TESTTOOLKIT.testcontainers"
+  const val OSS = "$ROOT.oss"
+  const val OSS_MINIO = "$OSS.minio"
+  const val OSS_MINIO_ENDPOINT = "$OSS_MINIO.endpoint"
+  const val OSS_MINIO_PORT = "$OSS_MINIO.port"
+  const val OSS_MINIO_ACCESS_KEY = "$OSS_MINIO.access-key"
+  const val OSS_MINIO_SECRET_KEY = "$OSS_MINIO.secret-key"
+  const val OSS_MINIO_EXPOSED_BASE_URL = "$OSS_MINIO.exposed-base-url"
 }

testtoolkit/src/main/kotlin/io/github/truenine/composeserver/testtoolkit/testcontainers/IOssMinioContainer.kt

@@ -1,5 +1,6 @@
 package io.github.truenine.composeserver.testtoolkit.testcontainers
 
+import io.github.truenine.composeserver.testtoolkit.SpringBootConfigurationPropertiesPrefixes
 import java.time.Duration
 import org.springframework.test.context.DynamicPropertyRegistry
 import org.springframework.test.context.DynamicPropertySource
@@ -155,12 +156,11 @@ interface IOssMinioContainer : ITestContainerBase {
       val host = container.host
       val port = container.getMappedPort(9000)
 
-      registry.add("compose.oss.base-url") { host }
-      registry.add("compose.oss.expose-base-url") { "http://$host:$port" }
-      registry.add("compose.oss.port") { port }
-      registry.add("compose.oss.minio.enable-https") { false }
-      registry.add("compose.oss.minio.access-key") { config.minio.accessKey }
-      registry.add("compose.oss.minio.secret-key") { config.minio.secretKey }
+      registry.add(SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_ENDPOINT) { host }
+      registry.add(SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_EXPOSED_BASE_URL) { "http://$host:$port" }
+      registry.add(SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_PORT) { port }
+      registry.add(SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_ACCESS_KEY) { config.minio.accessKey }
+      registry.add(SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_SECRET_KEY) { config.minio.secretKey }
     }
   }
 

testtoolkit/src/test/kotlin/io/github/truenine/composeserver/testtoolkit/testcontainers/IOssMinioContainerTest.kt

@@ -1,5 +1,6 @@
 package io.github.truenine.composeserver.testtoolkit.testcontainers
 
+import io.github.truenine.composeserver.testtoolkit.SpringBootConfigurationPropertiesPrefixes
 import jakarta.annotation.Resource
 import java.net.InetSocketAddress
 import java.net.Socket
@@ -121,12 +122,11 @@ class IOssMinioContainerTest : IOssMinioContainer {
       minio {
         val expectedProperties =
           mapOf(
-            "compose.oss.base-url" to it.host,
-            "compose.oss.expose-base-url" to "http://${it.host}:${it.getMappedPort(9000)}",
-            "compose.oss.port" to it.getMappedPort(9000).toString(),
-            "compose.oss.minio.enable-https" to "false",
-            "compose.oss.minio.access-key" to "minioadmin",
-            "compose.oss.minio.secret-key" to "minioadmin",
+            SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_ENDPOINT to it.host,
+            SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_EXPOSED_BASE_URL to "http://${it.host}:${it.getMappedPort(9000)}",
+            SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_PORT to it.getMappedPort(9000).toString(),
+            SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_ACCESS_KEY to "minioadmin",
+            SpringBootConfigurationPropertiesPrefixes.OSS_MINIO_SECRET_KEY to "minioadmin",
           )
 
         expectedProperties.forEach { (prop, expectedValue) ->