review

Author: snazy

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformer.kt

@@ -79,7 +79,7 @@ public open class DeduplicatingResourceTransformer(
   override fun modifyOutputStream(os: ZipOutputStream, preserveFileTimestamps: Boolean) {
     val duplicatePaths = duplicateContentViolations()
 
-    if (!duplicatePaths.isEmpty()) {
+    if (duplicatePaths.isNotEmpty()) {
       val message =
         "Found ${duplicatePaths.size} path duplicate(s) with different content in the shadow JAR:" +
           duplicatePaths
@@ -113,13 +113,8 @@ public open class DeduplicatingResourceTransformer(
     fun uniqueContentCount() = filesPerHash.size
 
     fun addFile(hash: String, file: File): Boolean {
-      var filesForHash: MutableList<File>? = filesPerHash[hash]
-      val new = filesForHash == null
-      if (new) {
-        filesForHash = mutableListOf()
-        filesPerHash[hash] = filesForHash
-      }
-      filesForHash.add(file)
+      val new = hash !in filesPerHash
+      filesPerHash.getOrPut(hash) { mutableListOf() }.add(file)
       return new
     }
   }

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/DeduplicatingResourceTransformerTest.kt

@@ -8,7 +8,6 @@ import assertk.assertions.isFalse
 import assertk.assertions.isTrue
 import java.io.File
 import java.nio.file.Path
-import kotlin.io.path.writeText
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.io.TempDir
 import org.junit.jupiter.params.ParameterizedTest
@@ -24,7 +23,6 @@ class DeduplicatingResourceTransformerTest : BaseTransformerTest<DeduplicatingRe
   private lateinit var file3: File
 
   private var hash1 = ""
-  private var hash2 = ""
   private var hash3 = ""
 
   @BeforeEach
@@ -43,7 +41,6 @@ class DeduplicatingResourceTransformerTest : BaseTransformerTest<DeduplicatingRe
     }
 
     hash1 = transformer.hashForFile(file1)
-    hash2 = transformer.hashForFile(file2)
     hash3 = transformer.hashForFile(file3)
   }