GH-2275 Fix plugin loader after recent changes in file api (Fix #2275)

dzikoysk · Nov 22, 2024 · 2bf2753 · 2bf2753
1 parent 3f97269
commit 2bf2753
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/reposilite-backend/build.gradle.kts b/reposilite-backend/build.gradle.kts
@@ -115,12 +115,12 @@ dependencies {
     val httpClient = "1.45.1"
     implementation("com.google.http-client:google-http-client:$httpClient") {
         exclude(group = "commons-codec", module = "commons-codec")
+        exclude(group = "com.google.guava", module = "guava")
     }
+    api("commons-codec:commons-codec:1.17.1")
+    api("com.google.guava:guava:33.3.1-android")
     testImplementation("com.google.http-client:google-http-client-jackson2:$httpClient")
 
-    val commonsCoded = "1.17.1"
-    api("commons-codec:commons-codec:$commonsCoded")
-
     val jansi = "2.4.1"
     implementation("org.fusesource.jansi:jansi:$jansi")
 
@@ -135,12 +135,15 @@ dependencies {
     implementation("org.tinylog:tinylog-impl:$tinylog")
 
     val testcontainers = "1.20.4"
-    testImplementation("org.testcontainers:postgresql:$testcontainers")
     testImplementation("org.testcontainers:mariadb:$testcontainers")
     testImplementation("org.testcontainers:testcontainers:$testcontainers")
     testImplementation("org.testcontainers:junit-jupiter:$testcontainers")
     testImplementation("org.testcontainers:localstack:$testcontainers")
     testImplementation("org.testcontainers:mysql:$testcontainers")
+    testImplementation("org.testcontainers:postgresql:$testcontainers") {
+        exclude(group = "org.apache.commons", module = "commons-compress")
+    }
+    testImplementation("org.apache.commons:commons-compress:1.27.1")
 
     val ldap = "7.0.1"
     testImplementation("com.unboundid:unboundid-ldapsdk:$ldap")

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/plugin/Extensions.kt b/reposilite-backend/src/main/kotlin/com/reposilite/plugin/Extensions.kt
@@ -72,7 +72,9 @@ class Extensions(private val journalist: Journalist) : Journalist {
 
     @Suppress("UNCHECKED_CAST")
     fun <F : Facade> facade(type: Class<F>): F =
-        getFacades().find { type.isInstance(it) }!! as F
+        getFacades()
+            .find { type.isInstance(it) } as? F
+            ?: throw IllegalStateException("Facade ${type.name} not found")
 
     fun getFacades(): Collection<Facade> =
         facades.toList()

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/plugin/PluginLoader.kt b/reposilite-backend/src/main/kotlin/com/reposilite/plugin/PluginLoader.kt
@@ -71,7 +71,8 @@ class PluginLoader(
         extensions.logger.debug("Plugins directory: ${pluginsDirectory.absolute()}")
 
         pluginsDirectory.useDirectoryEntries { pluginDirectoryStream ->
-            pluginDirectoryStream.filter { it.extension == ".jar" }
+            pluginDirectoryStream
+                .filter { it.extension == "jar" }
                 .filter { isValidJarFile(it.toFile()) }
                 .map { it.toUri().toURL() }
                 .toList()