Address review feedback: remove static import and rename parameter

- Remove static import for rebuilt() method, use qualified CacheResult.rebuilt() instead
- Rename parameter 'orig' to 'original' for clarity in both rebuilt() and rebuilded() methods

Author: cowwoc

src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java

@@ -102,7 +102,6 @@
 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.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 +528,7 @@ public void save(
                     hashFactory.getAlgorithm());
             populateGitInfo(build, session);
             build.getDto().set_final(cacheConfig.isSaveToRemoteFinal());
-            cacheResults.put(getVersionlessProjectKey(project), rebuilt(cacheResult, build));
+            cacheResults.put(getVersionlessProjectKey(project), CacheResult.rebuilt(cacheResult, build));
 
             localCache.beforeSave(context);
 

src/main/java/org/apache/maven/buildcache/CacheResult.java

@@ -70,10 +70,18 @@ public static CacheResult failure(CacheContext context) {
         return new CacheResult(RestoreStatus.FAILURE, null, context);
     }
 
-    public static CacheResult rebuilt(CacheResult orig, Build build) {
-        requireNonNull(orig);
+    public static CacheResult rebuilt(CacheResult original, Build build) {
+        requireNonNull(original);
         requireNonNull(build);
-        return new CacheResult(orig.status, build, orig.context);
+        return new CacheResult(original.status, build, original.context);
+    }
+
+    /**
+     * @deprecated Use {@link #rebuilt(CacheResult, Build)} instead.
+     */
+    @Deprecated
+    public static CacheResult rebuilded(CacheResult original, Build build) {
+        return rebuilt(original, build);
     }
 
     public boolean isSuccess() {