GH-2018 Small refactor

dzikoysk · Jan 10, 2024 · ae25fdb · ae25fdb
1 parent 0c48760
commit ae25fdb
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 24 deletions.
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/MirrorService.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/MirrorService.kt
@@ -18,6 +18,7 @@ package com.reposilite.maven
 
 import com.reposilite.journalist.Journalist
 import com.reposilite.journalist.Logger
+import com.reposilite.maven.StoragePolicy.PRIORITIZE_UPSTREAM_METADATA
 import com.reposilite.maven.api.METADATA_FILE
 import com.reposilite.maven.application.MirroredRepositorySettings
 import com.reposilite.shared.ErrorResponse
@@ -29,29 +30,27 @@ import panda.std.Result
 import panda.std.Result.error
 import panda.std.Result.ok
 import java.io.InputStream
+import java.time.Clock
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 
-internal class MirrorService(private val journalist: Journalist) : Journalist {
+internal class MirrorService(
+    private val journalist: Journalist,
+    private val clock: Clock
+) : Journalist {
 
-    fun shouldPrioritizeMirrorRepository(repository: Repository, gav: Location): Boolean {
-        if (repository.storagePolicy == StoragePolicy.PRIORITIZE_UPSTREAM_METADATA
-            && gav.getSimpleName().contains(METADATA_FILE)
-        ) {
-            if (repository.noRefetchTimeout <= 0L){
-                return true
-            }
-            val lastModifiedTime = repository.storageProvider.getLastModifiedTime(gav)
-            if (lastModifiedTime.isOk
-                && lastModifiedTime.get().toInstant()
-                    .plus(repository.noRefetchTimeout, ChronoUnit.SECONDS)
-                    .isBefore(Instant.now())
-            ) {
-                return true
-            }
+    fun shouldPrioritizeMirrorRepository(repository: Repository, gav: Location): Boolean =
+        when {
+            repository.storagePolicy == PRIORITIZE_UPSTREAM_METADATA && gav.getSimpleName().contains(METADATA_FILE) ->
+                repository.metadataMaxAgeInSeconds <= 0 || !isMetadataFileValid(repository, gav)
+            else ->
+                false
         }
-        return false
-    }
+
+    private fun isMetadataFileValid(repository: Repository, gav: Location): Boolean =
+        repository.storageProvider.getLastModifiedTime(gav)
+            .map { it.toInstant().plus(repository.metadataMaxAgeInSeconds, ChronoUnit.SECONDS) }
+            .matches { it.isBefore(Instant.now(clock)) }
 
     fun findRemoteDetails(repository: Repository, gav: Location): Result<FileDetails, ErrorResponse> =
         searchInRemoteRepositories(repository, gav) { (host, config, client) ->

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/Repository.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/Repository.kt
@@ -35,7 +35,7 @@ class Repository internal constructor(
     val mirrorHosts: List<MirrorHost>,
     val storageProvider: StorageProvider,
     val storagePolicy: StoragePolicy,
-    val noRefetchTimeout: Long
+    val metadataMaxAgeInSeconds: Long
 ) {
 
     init {

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/RepositoryFactory.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/RepositoryFactory.kt
@@ -59,7 +59,7 @@ internal class RepositoryFactory(
                     )
                     ?: throw IllegalArgumentException("Unknown storage provider '${configuration.storageProvider.type}'"),
             storagePolicy = configuration.storagePolicy,
-            noRefetchTimeout = configuration.noRefetchTimeout
+            metadataMaxAgeInSeconds = configuration.metadataMaxAge
         )
 
     private fun createMirroredHostConfiguration(configurationSource: MirroredRepositorySettings): MirrorHost? {

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenComponents.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenComponents.kt
@@ -34,8 +34,10 @@ import com.reposilite.storage.StorageFacade
 import com.reposilite.token.AccessTokenFacade
 import panda.std.reactive.Reference
 import java.nio.file.Path
+import java.time.Clock
 
 internal class MavenComponents(
+    private val clock: Clock,
     private val workingDirectory: Path,
     private val journalist: Journalist,
     private val extensions: Extensions,
@@ -56,7 +58,10 @@ internal class MavenComponents(
         MetadataService(securityProvider())
 
     private fun mirrorService(): MirrorService =
-        MirrorService(journalist)
+        MirrorService(
+            journalist = journalist,
+            clock = clock
+        )
 
     private fun repositoryProvider(
         mirrorService: MirrorService = mirrorService(),

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenPlugin.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenPlugin.kt
@@ -32,6 +32,7 @@ import com.reposilite.plugin.facade
 import com.reposilite.plugin.parameters
 import com.reposilite.shared.http.HttpRemoteClientProvider
 import com.reposilite.web.api.RoutingSetupEvent
+import java.time.Clock
 
 @Plugin(
     name = "maven",
@@ -45,6 +46,7 @@ internal class MavenPlugin : ReposilitePlugin() {
 
         val mavenFacade =
             MavenComponents(
+                clock = Clock.systemDefaultZone(),
                 workingDirectory = parameters().workingDirectory,
                 journalist = this,
                 extensions = extensions(),

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenSettings.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenSettings.kt
@@ -62,11 +62,11 @@ data class RepositorySettings(
         STRICT - prioritize cached version over upstream metadata (full offline mode)
     """)
     val storagePolicy: StoragePolicy = StoragePolicy.PRIORITIZE_UPSTREAM_METADATA,
-    @get:Doc(title = "No Refetch Timeout", description = """
-        Defines the amount of time in seconds how long a re-fetch of maven-metadata.xml is postponed.<br/>
+    @get:Doc(title = "Max age of metadata file", description = """
+        Fetching metadata files with PRIORITIZE_UPSTREAM_METADATA may be slow, so you can use dedicated TTL threshold for them.<br/>
         If set to "0" then a fetch is done always. (Default: 0 seconds)
     """)
-    val noRefetchTimeout: Long = 0L,
+    val metadataMaxAge: Long = 0L,
     @get:Doc(title = "Mirrored repositories", description = "List of mirrored repositories associated with this repository.")
     val proxied: List<MirroredRepositorySettings> = listOf()
 ) : SharedSettings

diff --git a/reposilite-backend/src/test/kotlin/com/reposilite/maven/specification/MavenSpecification.kt b/reposilite-backend/src/test/kotlin/com/reposilite/maven/specification/MavenSpecification.kt
@@ -58,6 +58,7 @@ import panda.std.reactive.reference
 import panda.std.reactive.toReference
 import java.io.File
 import java.nio.file.Files
+import java.time.Clock
 
 internal abstract class MavenSpecification {
 
@@ -73,6 +74,7 @@ internal abstract class MavenSpecification {
     lateinit var workingDirectory: File
     protected lateinit var mavenFacade: MavenFacade
 
+    private val clock = Clock.systemDefaultZone()
     private val logger = InMemoryLogger()
     protected val extensions = Extensions(logger)
 
@@ -122,6 +124,7 @@ internal abstract class MavenSpecification {
         )
 
         this.mavenFacade = MavenComponents(
+            clock = clock,
             workingDirectory = workingDirectory.toPath(),
             journalist = logger,
             extensions = extensions,