Merge pull request #16218 from gradle/wolfs/normalization/fix-missing…

…-inputs Fix issue with file hash cache during runtime classpath normalization (6.8 backport)
gradle · Feb 19, 2021 · 9e26b4a · 9e26b4a
2 parents becaa3a + 35da400
commit 9e26b4a
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 23 deletions.
diff --git a/...ovy/org/gradle/normalization/ConfigureRuntimeClasspathNormalizationIntegrationTest.groovy b/...ovy/org/gradle/normalization/ConfigureRuntimeClasspathNormalizationIntegrationTest.groovy
diff --git a/...a/src/main/java/org/gradle/api/internal/changedetection/state/IgnoringResourceHasher.java b/...a/src/main/java/org/gradle/api/internal/changedetection/state/IgnoringResourceHasher.java
@@ -33,6 +33,8 @@ public IgnoringResourceHasher(ResourceHasher delegate, ResourceFilter resourceFi
 
     @Override
     public void appendConfigurationToHasher(Hasher hasher) {
+        delegate.appendConfigurationToHasher(hasher);
+        hasher.putString(getClass().getName());
         resourceFilter.appendConfigurationToHasher(hasher);
     }
 

diff --git a/...va/org/gradle/api/internal/changedetection/state/MetaInfAwareClasspathResourceHasher.java b/...va/org/gradle/api/internal/changedetection/state/MetaInfAwareClasspathResourceHasher.java
@@ -52,6 +52,7 @@ public MetaInfAwareClasspathResourceHasher(ResourceHasher delegate, ResourceEntr
     @Override
     public void appendConfigurationToHasher(Hasher hasher) {
         delegate.appendConfigurationToHasher(hasher);
+        hasher.putString(getClass().getName());
         attributeResourceFilter.appendConfigurationToHasher(hasher);
     }
 

diff --git a/...gradle/api/internal/changedetection/state/PropertiesFileAwareClasspathResourceHasher.java b/...gradle/api/internal/changedetection/state/PropertiesFileAwareClasspathResourceHasher.java
@@ -58,6 +58,8 @@ public PropertiesFileAwareClasspathResourceHasher(ResourceHasher delegate, Map<S
 
     @Override
     public void appendConfigurationToHasher(Hasher hasher) {
+        delegate.appendConfigurationToHasher(hasher);
+        hasher.putString(getClass().getName());
         propertiesFilePatterns.forEach(hasher::putString);
         propertiesFileFilters.values().forEach(resourceEntryFilter -> resourceEntryFilter.appendConfigurationToHasher(hasher));
     }

diff --git a/...src/main/java/org/gradle/api/internal/changedetection/state/UnionResourceEntryFilter.java b/...src/main/java/org/gradle/api/internal/changedetection/state/UnionResourceEntryFilter.java
@@ -37,6 +37,7 @@ public boolean shouldBeIgnored(String entry) {
 
     @Override
     public void appendConfigurationToHasher(Hasher hasher) {
+        hasher.putString(getClass().getName());
         filters.forEach(resourceEntryFilter -> resourceEntryFilter.appendConfigurationToHasher(hasher));
     }
 }
diff --git a/...st/groovy/org/gradle/api/internal/changedetection/state/IgnoringResourceHasherTest.groovy b/...st/groovy/org/gradle/api/internal/changedetection/state/IgnoringResourceHasherTest.groovy
@@ -19,6 +19,7 @@ package org.gradle.api.internal.changedetection.state
 import org.gradle.internal.file.FileMetadata
 import org.gradle.internal.file.impl.DefaultFileMetadata
 import org.gradle.internal.hash.HashCode
+import org.gradle.internal.hash.Hasher
 import org.gradle.internal.snapshot.RegularFileSnapshot
 import spock.lang.Specification
 
@@ -50,4 +51,14 @@ class IgnoringResourceHasherTest extends Specification {
         and:
         hash == null
     }
+
+    def "delegate configuration is added to hasher"() {
+        def configurationHasher = Mock(Hasher)
+
+        when:
+        hasher.appendConfigurationToHasher(configurationHasher)
+
+        then:
+        1 * delegate.appendConfigurationToHasher(configurationHasher)
+    }
 }
diff --git a/.../gradle/api/internal/changedetection/state/MetaInfAwareClasspathResourceHasherTest.groovy b/.../gradle/api/internal/changedetection/state/MetaInfAwareClasspathResourceHasherTest.groovy
@@ -21,6 +21,7 @@ import org.gradle.api.internal.file.archive.ZipEntry
 import org.gradle.internal.file.FileMetadata
 import org.gradle.internal.file.impl.DefaultFileMetadata
 import org.gradle.internal.hash.HashCode
+import org.gradle.internal.hash.Hasher
 import org.gradle.internal.snapshot.RegularFileSnapshot
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
@@ -389,6 +390,18 @@ class MetaInfAwareClasspathResourceHasherTest extends Specification {
         hash3 == hash4
     }
 
+    def "delegate configuration is added to hasher"() {
+        def configurationHasher = Mock(Hasher)
+        def delegate = Mock(ResourceHasher)
+        useDelegate(delegate)
+
+        when:
+        hasher.appendConfigurationToHasher(configurationHasher)
+
+        then:
+        1 * delegate.appendConfigurationToHasher(configurationHasher)
+    }
+
     void populateAttributes(Attributes attributes, Map<String, Object> attributesMap) {
         attributesMap.each { String name, Object value ->
             if (value instanceof String) {

diff --git a/.../api/internal/changedetection/state/PropertiesFileAwareClasspathResourceHasherTest.groovy b/.../api/internal/changedetection/state/PropertiesFileAwareClasspathResourceHasherTest.groovy
@@ -20,6 +20,7 @@ import com.google.common.collect.ImmutableSet
 import com.google.common.collect.Maps
 import com.google.common.io.ByteStreams
 import org.gradle.api.internal.file.archive.ZipEntry
+import org.gradle.internal.hash.Hasher
 import org.gradle.internal.hash.Hashing
 import org.gradle.internal.hash.HashingOutputStream
 import org.gradle.internal.snapshot.RegularFileSnapshot
@@ -257,6 +258,17 @@ class PropertiesFileAwareClasspathResourceHasherTest extends Specification {
         SnapshotContext.FILE_SNAPSHOT | "key"    | 'keyWithBadEscapeSequence\\uxxxx=some value'
     }
 
+    def "delegate configuration is added to hasher"() {
+        def configurationHasher = Mock(Hasher)
+        delegate = Mock(ResourceHasher)
+
+        when:
+        filteredHasher.appendConfigurationToHasher(configurationHasher)
+
+        then:
+        1 * delegate.appendConfigurationToHasher(configurationHasher)
+    }
+
     enum SnapshotContext {
         ZIP_ENTRY, FILE_SNAPSHOT
     }