[MBUILDCACHE-86] Adapt restoration logic to MBUILDCACHE-80 developments

Author: kbuntrock

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

@@ -51,10 +51,9 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
@@ -306,14 +305,15 @@ private boolean canIgnoreMissingSegment(MavenProject project, Build info, List<M
         return true;
     }
 
-    private Consumer<File> createRestorationToDiskConsumer(final MavenProject project, final Artifact artifact) {
+    private Function<File, File> createRestorationToDiskConsumer(final MavenProject project, final Artifact artifact) {
+
         if (cacheConfig.isRestoreOnDiskArtifacts() && MavenProjectInput.isRestoreOnDiskArtifacts(project)) {
 
+            Path restorationPath = project.getBasedir().toPath().resolve(artifact.getFilePath());
             final AtomicBoolean restored = new AtomicBoolean(false);
             return file -> {
                 // Set to restored even if it fails later, we don't want multiple try
                 if (restored.compareAndSet(false, true)) {
-                    Path restorationPath = project.getBasedir().toPath().resolve(artifact.getFilePath());
                     verifyRestorationInsideProject(project, restorationPath);
                     try {
                         Files.createDirectories(restorationPath.getParent());
@@ -324,10 +324,11 @@ private Consumer<File> createRestorationToDiskConsumer(final MavenProject projec
                     }
                     LOGGER.debug("Restored file on disk ({} to {})", artifact.getFileName(), restorationPath);
                 }
+                return restorationPath.toFile();
             };
         }
         // Return a consumer doing nothing
-        return file -> {};
+        return file -> file;
     }
 
     private boolean isPathInsideProject(final MavenProject project, Path path) {
@@ -434,7 +435,7 @@ private RestoredArtifact restoredArtifact(
             String artifactType,
             String artifactClassifier,
             Future<File> artifactFile,
-            Consumer<File> restoreToDiskConsumer) {
+            Function<File, File> restoreToDiskConsumer) {
         ArtifactHandler handler = null;
 
         if (artifactType != null) {
@@ -462,24 +463,14 @@ private Future<File> createDownloadTask(
         final FutureTask<File> downloadTask = new FutureTask<>(() -> {
             LOGGER.debug("Downloading artifact {}", artifact.getArtifactId());
             final Path artifactFile = localCache.getArtifactFile(context, cacheResult.getSource(), artifact);
-            final Path targetDir = Paths.get(project.getBuild().getDirectory());
-            final Path targetArtifact = targetDir.resolve(project.getBuild().getFinalName()
-                    + (artifact.getClassifier() != null ? "-".concat(artifact.getClassifier()) : "")
-                    + ".".concat(FilenameUtils.getExtension(artifact.getFileName())));
 
             if (!Files.exists(artifactFile)) {
                 throw new FileNotFoundException("Missing file for cached build, cannot restore. File: " + artifactFile);
             }
             LOGGER.debug("Downloaded artifact " + artifact.getArtifactId() + " to: " + artifactFile);
-
-            File downloadFile = restoreArtifactHandler
+            return restoreArtifactHandler
                     .adjustArchiveArtifactVersion(project, originalVersion, artifactFile)
                     .toFile();
-            // Need to restore artifact to project build directory, so it can be saved into cached incremental build
-            FileUtils.copyFile(downloadFile, targetArtifact.toFile());
-            LOGGER.debug("Restored artifact " + artifact.getArtifactId() + " to: " + targetArtifact);
-
-            return targetArtifact.toFile();
         });
         if (!cacheConfig.isLazyRestore()) {
             downloadTask.run();

src/main/java/org/apache/maven/buildcache/artifact/RestoredArtifact.java

@@ -23,8 +23,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
@@ -48,17 +47,15 @@ public class RestoredArtifact extends DefaultArtifact {
 
     private volatile Future<File> fileFuture;
 
-    private AtomicBoolean restoredToDisk = new AtomicBoolean(false);
-
-    private Consumer<File> restoreToDiskConsumer;
+    private Function<File, File> restoreToDiskConsumer;
 
     public RestoredArtifact(
             Artifact parent,
             Future<File> fileFuture,
             String type,
             String classifier,
             ArtifactHandler handler,
-            Consumer<File> restoreToDiskConsumer) {
+            Function<File, File> restoreToDiskConsumer) {
         super(
                 parent.getGroupId(),
                 parent.getArtifactId(),
@@ -102,8 +99,7 @@ public File getFile() {
 
         try {
             File file = fileFuture.get();
-            restoreToDiskConsumer.accept(file);
-            return file;
+            return restoreToDiskConsumer.apply(file);
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw new InvalidArtifactRTException(