🐛 fix compilation issue with new commons compress version in kotlin

ryandens · Jan 6, 2024 · daeb0f8 · daeb0f8
1 parent e8a8d3e
commit daeb0f8
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/...n/src/functionalTest/kotlin/com/ryandens/javaagent/JavaagentJibExtensionFunctionalTest.kt b/...n/src/functionalTest/kotlin/com/ryandens/javaagent/JavaagentJibExtensionFunctionalTest.kt
@@ -1,5 +1,6 @@
 package com.ryandens.javaagent
 
+import org.apache.commons.compress.archivers.ArchiveInputStream
 import org.apache.commons.compress.archivers.ArchiveStreamFactory
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry
 import org.gradle.testkit.runner.BuildResult
@@ -45,15 +46,17 @@ class JavaagentJibExtensionFunctionalTest {
 
         // verify the agent was added to entrypoint
         assertTrue(File(functionalTestDir, JIB_IMAGE).exists())
+
         FileInputStream(File(functionalTestDir, JIB_IMAGE)).use { fis ->
-            ArchiveStreamFactory().createArchiveInputStream("tar", fis).use { ais ->
-                var entry = ais.nextEntry as TarArchiveEntry?
+            ArchiveStreamFactory().createArchiveInputStream<ArchiveInputStream<TarArchiveEntry>>(ArchiveStreamFactory.TAR, fis).use {
+                    ais ->
+                var entry = ais.nextEntry
                 while (entry != null) {
-                    if ("config.json".equals(entry.name)) {
+                    if ("config.json" == entry.name) {
                         val json = ais.readBytes().toString(Charsets.UTF_8)
                         assertTrue(json.contains("-javaagent:/opt/jib-agents/simple-agent.jar"))
                     }
-                    entry = ais.nextEntry as TarArchiveEntry?
+                    entry = ais.nextEntry
                 }
             }
         }
@@ -73,14 +76,15 @@ class JavaagentJibExtensionFunctionalTest {
         // verify the agent was added to entrypoint
         assertTrue(File(functionalTestDir, JIB_IMAGE).exists())
         FileInputStream(File(functionalTestDir, JIB_IMAGE)).use { fis ->
-            ArchiveStreamFactory().createArchiveInputStream("tar", fis).use { ais ->
-                var entry = ais.nextEntry as TarArchiveEntry?
+            ArchiveStreamFactory().createArchiveInputStream<ArchiveInputStream<TarArchiveEntry>>(ArchiveStreamFactory.TAR, fis).use {
+                    ais ->
+                var entry = ais.nextEntry
                 while (entry != null) {
-                    if ("config.json".equals(entry.name)) {
+                    if ("config.json" == entry.name) {
                         val json = ais.readBytes().toString(Charsets.UTF_8)
                         assertFalse(json.contains("-javaagent:/opt/jib-agents"))
                     }
-                    entry = ais.nextEntry as TarArchiveEntry?
+                    entry = ais.nextEntry
                 }
             }
         }