From 0fc5d2280eb261041c0cd38cbf86abd2cb220ae2 Mon Sep 17 00:00:00 2001 From: cowwoc Date: Mon, 1 Dec 2025 14:20:26 -0500 Subject: [PATCH 1/2] Fix typo: rename rebuilded() to rebuilt() Corrects the method name to use proper English grammar. --- .../java/org/apache/maven/buildcache/CacheControllerImpl.java | 4 ++-- src/main/java/org/apache/maven/buildcache/CacheResult.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java index 6dfee156..8b493dd7 100644 --- a/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java +++ b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java @@ -102,7 +102,7 @@ import static org.apache.maven.buildcache.CacheResult.empty; import static org.apache.maven.buildcache.CacheResult.failure; import static org.apache.maven.buildcache.CacheResult.partialSuccess; -import static org.apache.maven.buildcache.CacheResult.rebuilded; +import static org.apache.maven.buildcache.CacheResult.rebuilt; import static org.apache.maven.buildcache.CacheResult.success; import static org.apache.maven.buildcache.RemoteCacheRepository.BUILDINFO_XML; import static org.apache.maven.buildcache.checksum.KeyUtils.getVersionlessProjectKey; @@ -529,7 +529,7 @@ public void save( hashFactory.getAlgorithm()); populateGitInfo(build, session); build.getDto().set_final(cacheConfig.isSaveToRemoteFinal()); - cacheResults.put(getVersionlessProjectKey(project), rebuilded(cacheResult, build)); + cacheResults.put(getVersionlessProjectKey(project), rebuilt(cacheResult, build)); localCache.beforeSave(context); diff --git a/src/main/java/org/apache/maven/buildcache/CacheResult.java b/src/main/java/org/apache/maven/buildcache/CacheResult.java index e2c118b1..e03f80ce 100644 --- a/src/main/java/org/apache/maven/buildcache/CacheResult.java +++ b/src/main/java/org/apache/maven/buildcache/CacheResult.java @@ -70,7 +70,7 @@ public static CacheResult failure(CacheContext context) { return new CacheResult(RestoreStatus.FAILURE, null, context); } - public static CacheResult rebuilded(CacheResult orig, Build build) { + public static CacheResult rebuilt(CacheResult orig, Build build) { requireNonNull(orig); requireNonNull(build); return new CacheResult(orig.status, build, orig.context); From 057d35b51b6443199e959638a6c337afccbf46d7 Mon Sep 17 00:00:00 2001 From: cowwoc Date: Wed, 3 Dec 2025 11:37:54 -0500 Subject: [PATCH 2/2] Keep rebuilded() as deprecated for backward compatibility --- .../java/org/apache/maven/buildcache/CacheResult.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/apache/maven/buildcache/CacheResult.java b/src/main/java/org/apache/maven/buildcache/CacheResult.java index e03f80ce..d1db990d 100644 --- a/src/main/java/org/apache/maven/buildcache/CacheResult.java +++ b/src/main/java/org/apache/maven/buildcache/CacheResult.java @@ -76,6 +76,14 @@ public static CacheResult rebuilt(CacheResult orig, Build build) { return new CacheResult(orig.status, build, orig.context); } + /** + * @deprecated Use {@link #rebuilt(CacheResult, Build)} instead. + */ + @Deprecated + public static CacheResult rebuilded(CacheResult orig, Build build) { + return rebuilt(orig, build); + } + public boolean isSuccess() { return status == RestoreStatus.SUCCESS; }