[MBUILDCACHE-67] Fix restoration error not starting the normal project build + every restoration was a lazy restore, even if configured otherwise.

Author: kbuntrock

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

@@ -129,7 +129,8 @@ public void execute(
             boolean restored = result.isSuccess(); // if partially restored need to save increment
             if (restorable) {
                 restored &= restoreProject(result, mojoExecutions, mojoExecutionRunner, cacheConfig);
-            } else {
+            }
+            if (!restored) {
                 for (MojoExecution mojoExecution : mojoExecutions) {
                     if (source == Source.CLI
                             || mojoExecution.getLifecyclePhase() == null

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

@@ -44,17 +44,15 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.*;
 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;
 import org.apache.maven.SessionScoped;
+import org.apache.maven.artifact.InvalidArtifactRTException;
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.buildcache.artifact.RestoredArtifact;
@@ -401,6 +399,25 @@ private Future<File> createDownloadTask(
         });
         if (!cacheConfig.isLazyRestore()) {
             downloadTask.run();
+            try {
+                downloadTask.get();
+            } catch (InterruptedException e) {
+                throw new InvalidArtifactRTException(
+                        artifact.getGroupId(),
+                        artifact.getArtifactId(),
+                        artifact.getVersion(),
+                        artifact.getType(),
+                        RestoredArtifact.MSG_INTERRUPTED_WHILE_RETRIEVING_ARTIFACT_FILE,
+                        e);
+            } catch (ExecutionException e) {
+                throw new InvalidArtifactRTException(
+                        artifact.getGroupId(),
+                        artifact.getArtifactId(),
+                        artifact.getVersion(),
+                        artifact.getType(),
+                        RestoredArtifact.MSG_ERROR_RETRIEVING_ARTIFACT_FILE,
+                        e.getCause());
+            }
         }
         return downloadTask;
     }

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

@@ -40,6 +40,9 @@
 public class RestoredArtifact extends DefaultArtifact {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RestoredArtifact.class);
+    public static final String MSG_INTERRUPTED_WHILE_RETRIEVING_ARTIFACT_FILE =
+            "Interrupted while retrieving artifact file";
+    public static final String MSG_ERROR_RETRIEVING_ARTIFACT_FILE = "Error retrieving artifact file";
 
     private volatile Future<File> fileFuture;
 
@@ -75,7 +78,7 @@ public File getFile() {
                             getArtifactId(),
                             getVersion(),
                             getType(),
-                            "Error retrieving artifact file",
+                            MSG_ERROR_RETRIEVING_ARTIFACT_FILE,
                             e);
                 }
             } else {
@@ -94,15 +97,15 @@ public File getFile() {
                     getArtifactId(),
                     getVersion(),
                     getType(),
-                    "Interrupted while retrieving artifact file",
+                    MSG_INTERRUPTED_WHILE_RETRIEVING_ARTIFACT_FILE,
                     e);
         } catch (ExecutionException e) {
             throw new InvalidArtifactRTException(
                     getGroupId(),
                     getArtifactId(),
                     getVersion(),
                     getType(),
-                    "Error retrieving artifact file",
+                    MSG_ERROR_RETRIEVING_ARTIFACT_FILE,
                     e.getCause());
         }
     }