Merge pull request #24 from TrueNine/dev

0.0.20

Author: TrueNine

gradle/libs.versions.toml

@@ -50,7 +50,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.19"
+project = "0.0.20"
 
 [libraries]
 cn-dev33-sa-token-redis-jackson = { module = "cn.dev33:sa-token-redis-jackson", version.ref = "cn-dev33-sa-token" }

oss/oss-minio/src/main/kotlin/io/github/truenine/composeserver/oss/minio/properties/MinioProperties.kt

@@ -24,15 +24,15 @@ private const val PREFIX = "compose.oss.minio"
  */
 @ConfigurationProperties(prefix = PREFIX)
 data class MinioProperties(
-  val endpoint: String = "127.0.0.1",
-  val port: Int = 9000,
-  val accessKey: String? = null,
-  val secretKey: String? = null,
-  val exposedBaseUrl: String? = null,
-  val enableSsl: Boolean = false,
-  val region: String? = null,
-  val connectionTimeout: Duration = Duration.ofSeconds(30),
-  val writeTimeout: Duration = Duration.ofMinutes(5),
-  val readTimeout: Duration = Duration.ofMinutes(5),
-  val enableLogging: Boolean = false,
+  var endpoint: String = "127.0.0.1",
+  var port: Int = 9000,
+  var accessKey: String? = null,
+  var secretKey: String? = null,
+  var exposedBaseUrl: String? = null,
+  var enableSsl: Boolean = false,
+  var region: String? = null,
+  var connectionTimeout: Duration = Duration.ofSeconds(30),
+  var writeTimeout: Duration = Duration.ofMinutes(5),
+  var readTimeout: Duration = Duration.ofMinutes(5),
+  var enableLogging: Boolean = false,
 )

oss/oss-shared/src/main/kotlin/io/github/truenine/composeserver/oss/properties/OssProperties.kt

@@ -31,49 +31,49 @@ private const val PREFIX = "compose.oss"
 @ConfigurationProperties(prefix = PREFIX)
 data class OssProperties(
   /** OSS provider type (minio, volcengine-tos, aliyun-oss, etc.) */
-  val provider: String? = null,
+  var provider: String? = null,
 
   /** Service endpoint URL */
-  val endpoint: String? = null,
+  var endpoint: String? = null,
 
   /** Service region */
-  val region: String? = null,
+  var region: String? = null,
 
   /** Access key for authentication */
-  val accessKey: String? = null,
+  var accessKey: String? = null,
 
   /** Secret key for authentication */
-  val secretKey: String? = null,
+  var secretKey: String? = null,
 
   /** Public base URL for object access */
-  val exposedBaseUrl: String? = null,
+  var exposedBaseUrl: String? = null,
 
   /** Enable SSL/TLS connection */
-  val enableSsl: Boolean = true,
+  var enableSsl: Boolean = true,
 
   /** Connection timeout */
-  val connectionTimeout: Duration = Duration.ofSeconds(30),
+  var connectionTimeout: Duration = Duration.ofSeconds(30),
 
   /** Read timeout */
-  val readTimeout: Duration = Duration.ofMinutes(5),
+  var readTimeout: Duration = Duration.ofMinutes(5),
 
   /** Write timeout */
-  val writeTimeout: Duration = Duration.ofMinutes(5),
+  var writeTimeout: Duration = Duration.ofMinutes(5),
 
   /** Maximum number of connections */
-  val maxConnections: Int = 100,
+  var maxConnections: Int = 100,
 
   /** Default bucket name */
-  val defaultBucket: String? = null,
+  var defaultBucket: String? = null,
 
   /** Auto create bucket if not exists */
-  val autoCreateBucket: Boolean = false,
+  var autoCreateBucket: Boolean = false,
 
   /** Enable object versioning */
-  val enableVersioning: Boolean = false,
+  var enableVersioning: Boolean = false,
 
   /** Enable request/response logging */
-  val enableLogging: Boolean = false,
+  var enableLogging: Boolean = false,
 ) {
   /**
    * Validate the configuration properties

oss/oss-volcengine-tos/src/main/kotlin/io/github/truenine/composeserver/oss/volcengine/properties/VolcengineTosProperties.kt

@@ -44,94 +44,94 @@ private const val PREFIX = "compose.oss.volcengine-tos"
 @ConfigurationProperties(prefix = PREFIX)
 data class VolcengineTosProperties(
   /** Service endpoint URL */
-  val endpoint: String? = null,
+  var endpoint: String? = null,
 
   /** Service region */
-  val region: String? = null,
+  var region: String? = null,
 
   /** Access key for authentication */
-  val accessKey: String? = null,
+  var accessKey: String? = null,
 
   /** Secret key for authentication */
-  val secretKey: String? = null,
+  var secretKey: String? = null,
 
   /** Session token for temporary credentials (STS) */
-  val sessionToken: String? = null,
+  var sessionToken: String? = null,
 
   /** Public base URL for object access */
-  val exposedBaseUrl: String? = null,
+  var exposedBaseUrl: String? = null,
 
   /** Enable SSL/TLS connection */
-  val enableSsl: Boolean = true,
+  var enableSsl: Boolean = true,
 
   // === Timeout Configuration ===
   /** Connection timeout in milliseconds - optimized for production */
-  val connectTimeoutMills: Int = 10_000,
+  var connectTimeoutMills: Int = 10_000,
 
   /** Read timeout in milliseconds - balanced for large files */
-  val readTimeoutMills: Int = 60_000,
+  var readTimeoutMills: Int = 60_000,
 
   /** Write timeout in milliseconds - balanced for large uploads */
-  val writeTimeoutMills: Int = 60_000,
+  var writeTimeoutMills: Int = 60_000,
 
   /** Idle connection timeout in milliseconds - connection pool optimization */
-  val idleConnectionTimeMills: Int = 60_000,
+  var idleConnectionTimeMills: Int = 60_000,
 
   // === Connection Pool Configuration ===
   /** Maximum number of connections in pool - optimized for high concurrency */
-  val maxConnections: Int = 1024,
+  var maxConnections: Int = 1024,
 
   /** Maximum number of retries on failure - balanced retry strategy */
-  val maxRetryCount: Int = 3,
+  var maxRetryCount: Int = 3,
 
   /** DNS cache time in minutes - 0 means disabled, positive values enable caching */
-  val dnsCacheTimeMinutes: Int = 5,
+  var dnsCacheTimeMinutes: Int = 5,
 
   // === Feature Toggles ===
   /** Enable CRC64 checksum validation for data integrity */
-  val enableCrc: Boolean = true,
+  var enableCrc: Boolean = true,
 
   /** Enable SSL certificate verification */
-  val enableVerifySSL: Boolean = true,
+  var enableVerifySSL: Boolean = true,
 
   /** Auto recognize content type by file extension */
-  val clientAutoRecognizeContentType: Boolean = true,
+  var clientAutoRecognizeContentType: Boolean = true,
 
   /** Enable detailed request/response logging */
-  val enableLogging: Boolean = false,
+  var enableLogging: Boolean = false,
 
   // === Domain Configuration ===
   /** Custom domain for object access */
-  val customDomain: String? = null,
+  var customDomain: String? = null,
 
   /** Whether using custom domain (affects bucket name handling) */
-  val isCustomDomain: Boolean = false,
+  var isCustomDomain: Boolean = false,
 
   // === User-Agent Configuration ===
   /** Product name for User-Agent header */
-  val userAgentProductName: String = "ComposeServer",
+  var userAgentProductName: String = "ComposeServer",
 
   /** Software name for User-Agent header */
-  val userAgentSoftName: String = "TOS-Client",
+  var userAgentSoftName: String = "TOS-Client",
 
   /** Software version for User-Agent header */
-  val userAgentSoftVersion: String = "1.0.0",
+  var userAgentSoftVersion: String = "1.0.0",
 
   /** Custom key-value pairs for User-Agent */
-  val userAgentCustomizedKeyValues: Map<String, String> = emptyMap(),
+  var userAgentCustomizedKeyValues: Map<String, String> = emptyMap(),
 
   // === Proxy Configuration ===
   /** Proxy server host */
-  val proxyHost: String? = null,
+  var proxyHost: String? = null,
 
   /** Proxy server port */
-  val proxyPort: Int = 0,
+  var proxyPort: Int = 0,
 
   /** Proxy authentication username */
-  val proxyUserName: String? = null,
+  var proxyUserName: String? = null,
 
   /** Proxy authentication password */
-  val proxyPassword: String? = null,
+  var proxyPassword: String? = null,
 ) {
 
   /** Validate configuration properties */

shared/src/main/kotlin/io/github/truenine/composeserver/holders/config/ResourceHolderConfiguration.kt

@@ -24,34 +24,34 @@ import org.springframework.validation.annotation.Validated
 data class ResourceHolderConfiguration(
 
   // Basic configuration (backward compatibility)
-  @field:NotBlank(message = "Config location cannot be blank") val configLocation: String = "config",
-  @field:NotBlank(message = "Data location cannot be blank") val location: String = "data",
-  @field:NotEmpty(message = "Match files list cannot be empty") val matchFiles: MutableList<String> = mutableListOf(),
+  @field:NotBlank(message = "Config location cannot be blank") var configLocation: String = "config",
+  @field:NotBlank(message = "Data location cannot be blank") var location: String = "data",
+  @field:NotEmpty(message = "Match files list cannot be empty") var matchFiles: MutableList<String> = mutableListOf(),
 
   // Enhanced configuration
   /** Active profiles for environment-specific resource resolution. Resources with matching profiles take precedence over default resources. */
-  val activeProfiles: List<String> = emptyList(),
+  var activeProfiles: List<String> = emptyList(),
 
   /** Custom resource sources with explicit priorities. These sources are added to the default Spring Boot-like hierarchy. */
-  val customSources: List<CustomResourceSource> = emptyList(),
+  var customSources: List<CustomResourceSource> = emptyList(),
 
   /** Cache configuration for performance optimization. */
-  val cache: CacheConfiguration = CacheConfiguration(),
+  var cache: CacheConfiguration = CacheConfiguration(),
 
   /** Whether to enable strict mode for resource resolution. In strict mode, missing required resources will cause startup failure. */
-  val strictMode: Boolean = false,
+  var strictMode: Boolean = false,
 
   /** Whether to enable resource change detection and automatic cache invalidation. */
-  val enableChangeDetection: Boolean = false,
+  var enableChangeDetection: Boolean = false,
 
   /** Timeout in milliseconds for resource resolution operations. */
-  @field:Min(value = 1000, message = "Resolution timeout must be at least 1000ms") val resolutionTimeoutMs: Long = 30000,
+  @field:Min(value = 1000, message = "Resolution timeout must be at least 1000ms") var resolutionTimeoutMs: Long = 30000,
 
   /** Whether to enable detailed logging for resource resolution debugging. */
-  val enableDebugLogging: Boolean = false,
+  var enableDebugLogging: Boolean = false,
 
   /** Fallback configuration for when resources are not found. */
-  val fallback: FallbackConfiguration = FallbackConfiguration(),
+  var fallback: FallbackConfiguration = FallbackConfiguration(),
 ) {
 
   /** Gets the primary active profile (first in the list). */
@@ -73,11 +73,11 @@ data class ResourceHolderConfiguration(
 
 /** Configuration for custom resource sources. */
 data class CustomResourceSource(
-  @field:NotBlank(message = "Resource source type cannot be blank") val type: String,
-  @field:NotBlank(message = "Resource source path cannot be blank") val path: String,
-  @field:Min(value = 0, message = "Priority must be non-negative") val priority: Int,
-  val profile: String? = null,
-  val description: String = "",
+  @field:NotBlank(message = "Resource source type cannot be blank") var type: String,
+  @field:NotBlank(message = "Resource source path cannot be blank") var path: String,
+  @field:Min(value = 0, message = "Priority must be non-negative") var priority: Int,
+  var profile: String? = null,
+  var description: String = "",
 ) {
 
   /** Converts to ResourceSource. */
@@ -104,47 +104,47 @@ data class CustomResourceSource(
 /** Cache configuration for resource resolution. */
 data class CacheConfiguration(
   /** Whether caching is enabled. */
-  val enabled: Boolean = true,
+  var enabled: Boolean = true,
 
   /** Maximum number of entries in the cache. */
-  @field:Min(value = 10, message = "Cache max size must be at least 10") val maxSize: Int = 1000,
+  @field:Min(value = 10, message = "Cache max size must be at least 10") var maxSize: Int = 1000,
 
   /** Time-to-live for cache entries in milliseconds. */
-  @field:Min(value = 1000, message = "Cache TTL must be at least 1000ms") val ttlMs: Long = 300_000, // 5 minutes
+  @field:Min(value = 1000, message = "Cache TTL must be at least 1000ms") var ttlMs: Long = 300_000, // 5 minutes
 
   /** Whether to enable cache statistics collection. */
-  val enableStats: Boolean = true,
+  var enableStats: Boolean = true,
 
   /** Interval in milliseconds for automatic cleanup of expired entries. */
-  @field:Min(value = 10000, message = "Cleanup interval must be at least 10000ms") val cleanupIntervalMs: Long = 60_000, // 1 minute
+  @field:Min(value = 10000, message = "Cleanup interval must be at least 10000ms") var cleanupIntervalMs: Long = 60_000, // 1 minute
 )
 
 /** Fallback configuration for resource resolution. */
 data class FallbackConfiguration(
   /** Whether to enable fallback to default resources when profile-specific resources are not found. */
-  val enableProfileFallback: Boolean = true,
+  var enableProfileFallback: Boolean = true,
 
   /** Whether to enable fallback to classpath resources when filesystem resources are not found. */
-  val enableClasspathFallback: Boolean = true,
+  var enableClasspathFallback: Boolean = true,
 
   /** Default resource patterns to use as fallbacks. */
-  val defaultPatterns: List<String> = emptyList(),
+  var defaultPatterns: List<String> = emptyList(),
 
   /** Whether to create empty resources when no fallbacks are available. */
-  val createEmptyResources: Boolean = false,
+  var createEmptyResources: Boolean = false,
 )
 
 /** Validation configuration for resource patterns and sources. */
 data class ValidationConfiguration(
   /** Whether to validate resource patterns for security (e.g., prevent path traversal). */
-  val enablePatternValidation: Boolean = true,
+  var enablePatternValidation: Boolean = true,
 
   /** Whether to validate that configured resource sources are accessible at startup. */
-  val enableSourceValidation: Boolean = true,
+  var enableSourceValidation: Boolean = true,
 
   /** List of allowed resource patterns (regex). */
-  val allowedPatterns: List<String> = listOf(".*"),
+  var allowedPatterns: List<String> = listOf(".*"),
 
   /** List of forbidden resource patterns (regex). */
-  val forbiddenPatterns: List<String> = listOf(".*\\.\\./.*"), // Prevent path traversal
+  var forbiddenPatterns: List<String> = listOf(".*\\.\\./.*"), // Prevent path traversal
 )

shared/src/main/kotlin/io/github/truenine/composeserver/holders/config/ResourceSource.kt

@@ -19,7 +19,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver
  * @author TrueNine
  * @since 2024-07-18
  */
-data class ResourceSource(val type: ResourceType, val path: String, val priority: Int, val profile: String? = null, val description: String = "") {
+data class ResourceSource(var type: ResourceType, var path: String, var priority: Int, var profile: String? = null, var description: String = "") {
 
   init {
     if (!path.hasText()) {

shared/src/main/kotlin/io/github/truenine/composeserver/properties/DataLoadProperties.kt

@@ -20,13 +20,13 @@ private const val PREFIX = "compose.shared"
  */
 @ConfigurationProperties(prefix = "$PREFIX.data-load")
 data class DataLoadProperties(
-  val location: String = "data",
-  val matchFiles: MutableList<String> = mutableListOf(),
-  val configLocation: String = "config",
+  var location: String = "data",
+  var matchFiles: MutableList<String> = mutableListOf(),
+  var configLocation: String = "config",
 
   /** Enhanced configuration properties for advanced ResourceHolder features. This provides access to profile-based resolution, caching, custom sources, etc. */
   @NestedConfigurationProperty
-  val enhanced: ResourceHolderConfiguration = ResourceHolderConfiguration(configLocation = configLocation, location = location, matchFiles = matchFiles),
+  var enhanced: ResourceHolderConfiguration = ResourceHolderConfiguration(configLocation = configLocation, location = location, matchFiles = matchFiles),
 ) {
 
   /** Gets the effective configuration location, preferring enhanced config if available. */