#18 Integrate CacheSystem inside API-Client

Integrate CacheSystem inside API-Client
JetBrains · Sep 9, 2024 · 1500bff · 1500bff
2 parents cf373e3 + 9926f77
commit 1500bff
Show file tree

Hide file tree

Showing 22 changed files with 15,965 additions and 148 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,23 @@
+name: Test APIClient Cache
+
+on:
+  push:
+    branches:
+      [main, master]
+  pull_request:
+    branches:
+      [main, master]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '17'
+      - name: Run Test APIClient Cache
+        run: ./gradlew :http:client:jvmTest --tests "CacheTests"
diff --git a/build-systems/build.gradle.kts b/build-systems/build.gradle.kts
@@ -36,11 +36,6 @@ kotlin {
                 api(packageSearchApiModelsVersions.ktor.client.js)
             }
         }
-        appleMain {
-            dependencies {
-                api(packageSearchApiModelsVersions.ktor.client.darwin)
-            }
-        }
         jvmTest {
             dependencies {
                 implementation(packageSearchApiModelsVersions.kotlinx.coroutines.test)

diff --git a/...ems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/HttpClientMavenPomProvider.kt b/...ems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/HttpClientMavenPomProvider.kt
@@ -50,23 +50,22 @@ public class HttpClientMavenPomProvider(
         groupId: String,
         artifactId: String,
         version: String,
-    ): ProjectObjectModel {
-        return getPomFromMultipleRepositories(groupId, artifactId, version).first()
-    }
+    ): ProjectObjectModel =
+        getPomFromMultipleRepositories(groupId, artifactId, version).first()
+
 
     override suspend fun getPomFromMultipleRepositories(
         groupId: String,
         artifactId: String,
         version: String,
-    ): Flow<ProjectObjectModel> {
-        return mirrors.asFlow().map {
+    ): Flow<ProjectObjectModel> =
+        mirrors.asFlow().map {
             it.getPom(groupId, artifactId, version)
         }
-    }
 
-    override suspend fun getPomByUrl(url: Url): ProjectObjectModel {
-        return httpClient.get(url).bodyAsPom(xml)
-    }
+    override suspend fun getPomByUrl(url: Url): ProjectObjectModel =
+        httpClient.get(url).bodyAsPom(xml)
+
 
     private suspend fun MavenUrlBuilder.getPom(
         groupId: String,

diff --git a/build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/PomResolver.kt b/build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/PomResolver.kt
@@ -76,7 +76,8 @@ public class PomResolver(
         artifactId: String,
         version: String,
     ): ProjectObjectModel? =
-        pomProvider.getPomFromMultipleRepositories(groupId, artifactId, version)
+        pomProvider
+            .getPomFromMultipleRepositories(groupId, artifactId, version)
             .firstOrNull()
             ?.let { resolve(it) }
 

diff --git a/build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/Utils.kt b/build-systems/src/commonMain/kotlin/org/jetbrains/packagesearch/maven/Utils.kt
@@ -186,7 +186,10 @@ public object GoogleMavenCentralMirror : MavenUrlBuilder {
         )
 }
 
-internal data class DependencyKey(val groupId: String, val artifactId: String)
+internal data class DependencyKey(
+    val groupId: String,
+    val artifactId: String
+)
 
 /**
  * Evaluates the value of the provided project property within the given model accessor.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,11 +10,18 @@ kotlin {
                 api(packageSearchApiModelsVersions.datetime)
                 api(packageSearchApiModelsVersions.kotlinx.serialization.json)
                 api(packageSearchApiModelsVersions.krypto)
+                api(kotlinxDocumentStore.core)
             }
         }
         jsMain {
             dependencies {
                 api(npm(packageSearchApiModelsVersions.date.fns))
+                api(kotlinxDocumentStore.browser)
+            }
+        }
+        jvmMain{
+            dependencies{
+                api(kotlinxDocumentStore.mvstore)
             }
         }
         jvmTest {

diff --git a/buildSrc/src/main/kotlin/build-config.gradle.kts b/buildSrc/src/main/kotlin/build-config.gradle.kts
@@ -13,23 +13,12 @@ plugins {
 
 kotlin {
     explicitApi()
-    jvm {
-        jvmToolchain(11)
-    }
+    jvm()
+    jvmToolchain(17)
     js(IR) {
         browser()
         nodejs()
     }
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
-    macosArm64()
-    macosX64()
-    watchosArm64()
-    watchosX64()
-    tvosArm64()
-    tvosX64()
-    tvosSimulatorArm64()
     targets.all {
         compilations.all {
             kotlinOptions {

diff --git a/http/client/build.gradle.kts b/http/client/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.kotlin
+
 plugins {
     `build-config`
 }
@@ -23,10 +25,26 @@ kotlin {
                 api(packageSearchApiModelsVersions.kotlinx.serialization.json)
             }
         }
+        commonTest {
+            dependencies {
+                api(packageSearchApiModelsVersions.kotlinx.coroutines.test)
+                api(packageSearchApiModelsVersions.ktor.client.mock)
+                api(packageSearchApiModelsVersions.ktor.client.logging)
+                api(packageSearchApiModelsVersions.mvstore)
+            }
+        }
         jvmMain {
             dependencies {
                 api(packageSearchApiModelsVersions.logback.classic)
             }
         }
+        jvmTest {
+            dependencies {
+                api(kotlin("test-junit5"))
+                api(kotlinxDocumentStore.mvstore)
+                api(packageSearchApiModelsVersions.junit.jupiter.engine)
+
+            }
+        }
     }
 }
diff --git a/http/client/src/commonMain/kotlin/cache/CacheEntries.kt b/http/client/src/commonMain/kotlin/cache/CacheEntries.kt
@@ -0,0 +1,23 @@
+package cache
+
+import kotlinx.datetime.Clock
+import kotlinx.datetime.Instant
+import kotlinx.serialization.Serializable
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.hours
+
+
+internal val DEFAULT_EXPIRATION_TIME: Duration = 12.hours
+
+@Serializable
+internal data class CacheEntry<K, V>(
+    val key: K,
+    val value: V,
+    val createdAt: Instant = Clock.System.now()
+) {
+
+    internal fun isExpired(expirationTime: Duration): Boolean =
+        createdAt + expirationTime < Clock.System.now()
+
+
+}