Rename method to better reflect its purpose

See gradle/kotlin-dsl-samples#31 +review REVIEW-6356
gradle · Oct 27, 2016 · 712260a · 712260a
1 parent 6e6d3a9
commit 712260a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/hash/HashUtil.java b/subprojects/base-services/src/main/java/org/gradle/internal/hash/HashUtil.java
@@ -80,11 +80,11 @@ public static String createCompactMD5(String scriptText) {
         return createHash(scriptText, "MD5").asCompactString();
     }
 
-    public static String createCompactMD5(HashCode hashCode) {
-        return createCompactMD5FromHash(hashCode.asBytes());
+    public static String compactStringFor(HashCode hashCode) {
+        return compactStringFor(hashCode.asBytes());
     }
 
-    public static String createCompactMD5FromHash(byte[] digest) {
+    public static String compactStringFor(byte[] digest) {
         return new HashValue(digest).asCompactString();
     }
 

diff --git a/subprojects/core/src/main/java/org/gradle/cache/internal/DefaultCacheKeyBuilder.java b/subprojects/core/src/main/java/org/gradle/cache/internal/DefaultCacheKeyBuilder.java
@@ -26,7 +26,7 @@
 
 import java.io.File;
 
-import static org.gradle.internal.hash.HashUtil.createCompactMD5;
+import static org.gradle.internal.hash.HashUtil.compactStringFor;
 
 class DefaultCacheKeyBuilder implements CacheKeyBuilder {
 
@@ -48,9 +48,9 @@ public String build(CacheKeySpec spec) {
             case 0:
                 return prefix;
             case 1:
-                return prefix + "/" + createCompactMD5(hashOf(components[0]));
+                return prefix + "/" + compactStringFor(hashOf(components[0]));
             default:
-                return prefix + "/" + createCompactMD5(combinedHashOf(components));
+                return prefix + "/" + compactStringFor(combinedHashOf(components));
         }
     }
 

diff --git a/.../src/main/java/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompiler.java b/.../src/main/java/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompiler.java
@@ -85,7 +85,7 @@ public <T extends Script, M> CompiledScript<T, M> compile(final ScriptSource sou
         }
 
         HashCode sourceHashCode = hasher.hash(source.getResource());
-        final String sourceHash = HashUtil.createCompactMD5(sourceHashCode);
+        final String sourceHash = HashUtil.compactStringFor(sourceHashCode);
         final String dslId = operation.getId();
         final String classpathHash = dslId + classLoaderHierarchyHasher.getLenientHash(classLoader);
         final RemappingScriptSource remapped = new RemappingScriptSource(source);

diff --git a/.../integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy b/.../integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy
@@ -86,7 +86,7 @@ public class CacheProjectIntegrationTest extends AbstractIntegrationTest {
 
     private void updateCaches() {
         String version = GradleVersion.current().version
-        def hash = HashUtil.createCompactMD5FromHash(fileHasher.hash(buildFile).asBytes())
+        def hash = HashUtil.compactStringFor(fileHasher.hash(buildFile))
         String dirName = userHomeDir.file("caches/$version/scripts/$hash/proj").list()[0]
         String baseDir = "caches/$version/scripts/$hash/proj/$dirName"
         propertiesFile = userHomeDir.file("$baseDir/cache.properties")