Simplify JarBuilder

GradleUp · Dec 20, 2024 · 4b96aa2 · 4b96aa2
1 parent c6006a8
commit 4b96aa2
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/JarBuilder.kt
@@ -5,20 +5,17 @@ import java.util.jar.JarEntry
 import java.util.jar.JarOutputStream
 
 class JarBuilder(os: OutputStream) {
-  private val entries = mutableListOf<String>()
+  private val entries = mutableSetOf<String>()
   private val jos = JarOutputStream(os)
 
   private fun addDirectory(name: String) {
-    if (!entries.contains(name)) {
+    if (entries.add(name)) {
       val parent = name.substringBeforeLast('/', "")
       if (parent.isNotEmpty() && !entries.contains(parent)) {
         addDirectory(parent)
       }
-
       // directory entries must end in "/"
-      val entry = JarEntry("$name/")
-      jos.putNextEntry(entry)
-      entries.add(name)
+      jos.putNextEntry(JarEntry("$name/"))
     }
   }
 
@@ -27,11 +24,9 @@ class JarBuilder(os: OutputStream) {
     if (idx != -1) {
       addDirectory(path.substring(0, idx))
     }
-    if (!entries.contains(path)) {
-      val entry = JarEntry(path)
-      jos.putNextEntry(entry)
-      entries.add(path)
-      data.byteInputStream().use { it.copyTo(jos) }
+    if (entries.add(path)) {
+      jos.putNextEntry(JarEntry(path))
+      data.byteInputStream().copyTo(jos)
     }
     return this
   }