Feature/update (#23)

* Update libraries * Update Plugins * Update Kotlin * Refactoring * Increase version * Update READMEs
Scogun · Dec 14, 2024 · f7a51d8 · f7a51d8
1 parent 9539af0
commit f7a51d8
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 32 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ allprojects {
 
     group = "com.ucasoft.ktor"
 
-    version = "0.50.7"
+    version = "0.51.2"
 
     repositories {
         mavenCentral()

diff --git a/buildSrc/src/main/kotlin/Dependensies.kt b/buildSrc/src/main/kotlin/Dependensies.kt
@@ -1,6 +1,6 @@
 import org.gradle.api.Project
 
-const val ktorVersion = "3.0.1"
+const val ktorVersion = "3.0.2"
 const val kotestVersion = "5.9.1"
 
 fun Project.ktor(module: String) = "io.ktor:ktor-$module:$ktorVersion"

diff --git a/ktor-simple-cache/README.md b/ktor-simple-cache/README.md
@@ -1,15 +1,15 @@
 # Ktor Simple Cache
 Base solution which provides the plugin implementation and abstract class for cache providers.
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.50.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.50.7/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-cache/0.51.2?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-cache/0.51.2/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-cache:0.50.7")
+implementation("com.ucasoft.ktor:ktor-simple-cache:0.51.2")
 ```
 ## Usage
 ```kotlin

diff --git a/ktor-simple-cache/src/main/kotlin/com/ucasoft/ktor/simpleCache/SimpleCache.kt b/ktor-simple-cache/src/main/kotlin/com/ucasoft/ktor/simpleCache/SimpleCache.kt
@@ -26,11 +26,14 @@ abstract class SimpleCacheProvider(config: Config) {
 
     val invalidateAt = config.invalidateAt
 
-    fun badResponse() {
+    private val mutex = Mutex()
+
+    abstract suspend fun getCache(key: String): Any?
+    abstract suspend fun setCache(key: String, content: Any, invalidateAt: Duration?)
+
+    fun handleBadResponse() {
         mutex.unlock()
     }
-
-    private val mutex = Mutex()
 
     suspend fun loadCache(key: String): Any? {
         var cache = getCache(key)
@@ -53,10 +56,6 @@ abstract class SimpleCacheProvider(config: Config) {
         mutex.unlock()
     }
 
-    abstract suspend fun getCache(key: String): Any?
-
-    abstract suspend fun setCache(key: String, content: Any, invalidateAt: Duration?)
-
     open class Config protected constructor() {
 
          var invalidateAt: Duration = 5.minutes

diff --git a/ktor-simple-cache/src/main/kotlin/com/ucasoft/ktor/simpleCache/SimpleCachePlugin.kt b/ktor-simple-cache/src/main/kotlin/com/ucasoft/ktor/simpleCache/SimpleCachePlugin.kt
@@ -26,12 +26,12 @@ val SimpleCachePlugin = createRouteScopedPlugin(name = "SimpleCachePlugin", ::Si
         }
     }
     on(CallFailed) { _, e ->
-        provider.badResponse()
+        provider.handleBadResponse()
         throw e
     }
     onCallRespond { call, body ->
         if ((call.response.status() ?: HttpStatusCode.OK) >= HttpStatusCode.BadRequest) {
-            provider.badResponse()
+            provider.handleBadResponse()
         }
         else if (!call.attributes.contains(isResponseFromCacheKey)) {
             provider.saveCache(buildKey(call.request, pluginConfig.queryKeys), body, pluginConfig.invalidateAt)

diff --git a/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt b/ktor-simple-cache/src/test/kotlin/com/ucasoft/ktor/simpleCache/SimpleCacheTests.kt
@@ -37,7 +37,7 @@ internal class SimpleCacheTests {
             application(Application::badTestApplication)
 
             val exception = shouldThrow<IllegalStateException> {
-                client.get("/check")
+                client.get(CHECK_ENDPOINT)
             }
 
             exception.message.shouldBe("Add one cache provider!")
@@ -47,18 +47,20 @@ internal class SimpleCacheTests {
     @Test
     fun `check cache call no set`() {
         testApplication {
-            val provider = buildProvider(mutableMapOf("/check" to TextContent("Test", ContentType.Any)))
+            val provider = buildProvider(mutableMapOf(CHECK_ENDPOINT to TextContent("Test", ContentType.Any)))
 
             install(SimpleCache) {
                 testCache(provider)
             }
 
-            application(Application::testApplication)
+            application {
+                testApplication()
+            }
 
-            val response = client.get("/check")
+            val response = client.get(CHECK_ENDPOINT)
             response.readRawBytes().toString(Charsets.UTF_8).shouldBe("Test")
 
-            verify(provider, times(1)).getCache(eq("/check"))
+            verify(provider, times(1)).getCache(eq(CHECK_ENDPOINT))
             verify(provider, never()).setCache(anyString(), any(), anyOrNull())
         }
     }
@@ -79,7 +81,7 @@ internal class SimpleCacheTests {
                 val response = client.get("/bad")
                 response.shouldHaveStatus(HttpStatusCode.BadRequest)
                 verify(provider, times(2 * i)).getCache(eq("/bad"))
-                verify(provider, times(1 * i)).badResponse()
+                verify(provider, times(1 * i)).handleBadResponse()
                 verify(provider, times(0)).setCache(eq("/bad"), any(), anyOrNull())
                 cache.shouldBeEmpty()
             }
@@ -99,10 +101,10 @@ internal class SimpleCacheTests {
             application(Application::testApplication)
 
             for (i in 0..1) {
-                val response = client.get("/check")
+                val response = client.get(CHECK_ENDPOINT)
                 response.readRawBytes().toString(Charsets.UTF_8).toIntOrNull().shouldNotBeNull()
-                verify(provider, times(2 + i)).getCache(eq("/check"))
-                verify(provider, times(1)).setCache(eq("/check"), any(), anyOrNull())
+                verify(provider, times(2 + i)).getCache(eq(CHECK_ENDPOINT))
+                verify(provider, times(1)).setCache(eq(CHECK_ENDPOINT), any(), anyOrNull())
                 cache.shouldNotBeEmpty()
             }
         }
@@ -126,7 +128,7 @@ internal class SimpleCacheTests {
                         delay(500)
                     }
                     async {
-                        client.get("/check")
+                        client.get(CHECK_ENDPOINT)
                     }
                 }
 
@@ -136,8 +138,8 @@ internal class SimpleCacheTests {
                     it.second.shouldBe(totalThreads)
                 }
 
-                verify(provider, atMost(1100)).getCache(eq("/check"))
-                verify(provider, times(1)).setCache(eq("/check"), any(), anyOrNull())
+                verify(provider, atMost(1100)).getCache(eq(CHECK_ENDPOINT))
+                verify(provider, times(1)).setCache(eq(CHECK_ENDPOINT), any(), anyOrNull())
             }
         }
     }
@@ -311,4 +313,8 @@ internal class SimpleCacheTests {
 
         return provider
     }
+
+    companion object {
+        private const val CHECK_ENDPOINT = "/check"
+    }
 }
diff --git a/ktor-simple-memory-cache/README.md b/ktor-simple-memory-cache/README.md
@@ -1,15 +1,15 @@
 # Ktor Simple Memory Cache
 Memory cache provider for Ktor Simple Cache plugin
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.50.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.50.7/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-memory-cache/0.51.2?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-memory-cache/0.51.2/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.50.7")
+implementation("com.ucasoft.ktor:ktor-simple-memory-cache:0.51.2")
 ```
 ## Usage
 ```kotlin

diff --git a/ktor-simple-redis-cache/README.md b/ktor-simple-redis-cache/README.md
@@ -1,15 +1,15 @@
 # Ktor Simple Redis Cache
 Redis cache provider for Ktor Simple Cache plugin
 
-[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.50.7?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.50.7/jar)
+[![Maven Central with version prefix filter](https://img.shields.io/maven-central/v/com.ucasoft.ktor/ktor-simple-redis-cache/0.51.2?color=blue)](https://search.maven.org/artifact/com.ucasoft.ktor/ktor-simple-redis-cache/0.51.2/jar)
 ## Setup
 ### Gradle
 ```kotlin
 repositories {
     mavenCentral()
 }
 
-implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.50.7")
+implementation("com.ucasoft.ktor:ktor-simple-redis-cache:0.51.2")
 ```
 ## Usage
 ```kotlin

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,16 +1,16 @@
 pluginManagement {
     resolutionStrategy {
         plugins {
-            val kotlinVersion = "2.0.21"
+            val kotlinVersion = "2.1.0"
             kotlin("multiplatform") version kotlinVersion apply false
             kotlin("plugin.serialization") version kotlinVersion apply false
-            id("org.jetbrains.kotlinx.kover") version "0.8.3" apply false
+            id("org.jetbrains.kotlinx.kover") version "0.9.0" apply false
         }
     }
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 
 rootProject.name = "simple-cache"