Add caching with Caffeine (#57)

Author: mohamead

CHANGELOG.md

@@ -9,8 +9,8 @@
 ### What's Changed
 * Update changelog.md by @mohamead in [PR #51](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/51)
 * Add vertical scrollbar when needed by @mohamead in [PR #52](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/52)
-* Fix exception from invisible JBMenuItem in [PR #53](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/53)
-* Remove unused imports [PR #54](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/54)
+* Fix exception from invisible JBMenuItem by @mohamead in [PR #53](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/53)
+* Remove unused imports by @mohamead in [PR #54](https://github.com/statens-pensjonskasse/fiskeoye-plugin/pull/54)
 
 **Full Changelog**: https://github.com/statens-pensjonskasse/fiskeoye-plugin/compare/v0.0.3...v0.0.4
 

build.gradle.kts

@@ -33,6 +33,7 @@ repositories {
 dependencies {
     implementation("org.jsoup:jsoup:1.21.1")
     implementation("org.http4k:http4k-core:5.47.0.0")
+    implementation("com.github.ben-manes.caffeine:caffeine:3.2.2")
 
     testImplementation("io.kotest:kotest-assertions-core-jvm:5.9.1")
     testImplementation("io.kotest:kotest-runner-junit5-jvm:5.9.1")

gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = no.spk.fiskeoye.plugin
 pluginName = fiskeoye-plugin
 pluginRepositoryUrl = https://github.com/statens-pensjonskasse/fiskeoye-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 0.0.4
+pluginVersion = 0.0.5
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 233

src/main/kotlin/no/spk/fiskeoye/plugin/service/FiskeoyeService.kt

@@ -1,5 +1,7 @@
 package no.spk.fiskeoye.plugin.service
 
+import com.github.benmanes.caffeine.cache.Cache
+import com.github.benmanes.caffeine.cache.Caffeine
 import com.intellij.openapi.diagnostic.Logger
 import no.spk.fiskeoye.plugin.service.api.FileContentRequest
 import no.spk.fiskeoye.plugin.service.api.FilenameRequest
@@ -10,11 +12,18 @@ import org.http4k.core.Request
 import org.http4k.core.Status
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
+import java.time.Duration
 
 internal object FiskeoyeService {
 
     private val logger: Logger = Logger.getInstance(FiskeoyeService::class.java)
     private const val ID = "resultat_linje"
+    private val cache: Cache<String, Pair<String, List<Element>?>> = Caffeine.newBuilder()
+        .maximumSize(300)
+        .expireAfterWrite(Duration.ofMinutes(60))
+        .expireAfterAccess(Duration.ofMinutes(60))
+        .recordStats()
+        .build()
 
     internal fun getFileContent(
         includeText: String,
@@ -23,7 +32,11 @@ internal object FiskeoyeService {
         isCaseSensitive: Boolean
     ): Pair<String, List<Element>?> {
         val request = FileContentRequest(includeText, isExclude, excludeText, isCaseSensitive)
-        return send(request) { it.hasAttr("class") && ID == it.className() && it.children().isNotEmpty() }
+        val cacheKey = generateCacheKey(request, "file_content")
+
+        return cache.get(cacheKey) {
+            send(request) { it.hasAttr("class") && ID == it.className() && it.children().isNotEmpty() }
+        }
     }
 
     internal fun getFilename(
@@ -32,9 +45,15 @@ internal object FiskeoyeService {
         isSearchInFullPath: Boolean
     ): Pair<String, List<Element>?> {
         val request = FilenameRequest(includeText, isCaseSensitive, isSearchInFullPath)
-        return send(request) { it.hasAttr("href") && it.hasParent() && ID == it.parent()!!.className() }
+        val cacheKey = generateCacheKey(request, "filename")
+
+        return cache.get(cacheKey) {
+            send(request) { it.hasAttr("href") && it.hasParent() && ID == it.parent()!!.className() }
+        }
     }
 
+    private fun generateCacheKey(request: FiskeoyeRequest, type: String): String = "${type}_${request.getUrl().hashCode()}"
+
     private fun send(fiskeoyeRequest: FiskeoyeRequest, filterPredicate: (Element) -> Boolean): Pair<String, List<Element>?> {
         val url = fiskeoyeRequest.getUrl()
         logger.info("Request: $url")