Merge pull request #40947 from aloubyansky/resolver-error-formatting

Better error reporting and formattering in WorkspaceLoader and incubating dependency resolver
quarkusio · Jun 4, 2024 · 5f37921 · 5f37921
2 parents 3312986 + 1f791ea
commit 5f37921
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ModelResolutionTaskRunner.java b/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/ModelResolutionTaskRunner.java
@@ -58,8 +58,17 @@ private void assertNoErrors() {
                 log.error(prefix, error);
                 sb.append(System.lineSeparator()).append(prefix).append(" ").append(error.getLocalizedMessage());
                 for (var e : error.getStackTrace()) {
-                    sb.append(System.lineSeparator()).append(e);
+                    sb.append(System.lineSeparator());
+                    for (int j = 0; j < prefix.length(); ++j) {
+                        sb.append(" ");
+                    }
+                    sb.append("at ").append(e);
                     if (e.getClassName().contains("io.quarkus")) {
+                        sb.append(System.lineSeparator());
+                        for (int j = 0; j < prefix.length(); ++j) {
+                            sb.append(" ");
+                        }
+                        sb.append("...");
                         break;
                     }
                 }

diff --git a/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java b/...resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/WorkspaceLoader.java
@@ -159,6 +159,7 @@ LocalProject load() throws BootstrapMavenException {
             };
         }
 
+        final ConcurrentLinkedDeque<Exception> errors = new ConcurrentLinkedDeque<>();
         while (!moduleQueue.isEmpty()) {
             ConcurrentLinkedDeque<RawModule> newModules = new ConcurrentLinkedDeque<>();
             while (!moduleQueue.isEmpty()) {
@@ -169,12 +170,15 @@ LocalProject load() throws BootstrapMavenException {
                     CompletableFuture.runAsync(() -> {
                         try {
                             loadModule(module, newModules);
+                        } catch (Exception e) {
+                            errors.add(e);
                         } finally {
                             phaser.arriveAndDeregister();
                         }
                     });
                 }
                 phaser.arriveAndAwaitAdvance();
+                assertNoErrors(errors);
             }
             for (var newModule : newModules) {
                 newModule.process(processor);
@@ -280,6 +284,35 @@ public List<String> findVersions(Artifact artifact) {
         return model == null ? List.of() : List.of(ModelUtils.getVersion(model));
     }
 
+    private void assertNoErrors(Collection<Exception> errors) throws BootstrapMavenException {
+        if (!errors.isEmpty()) {
+            var sb = new StringBuilder("The following errors were encountered while loading the workspace:");
+            log.error(sb);
+            var i = 1;
+            for (var error : errors) {
+                var prefix = i++ + ")";
+                log.error(prefix, error);
+                sb.append(System.lineSeparator()).append(prefix).append(" ").append(error.getLocalizedMessage());
+                for (var e : error.getStackTrace()) {
+                    sb.append(System.lineSeparator());
+                    for (int j = 0; j < prefix.length(); ++j) {
+                        sb.append(" ");
+                    }
+                    sb.append("at ").append(e);
+                    if (e.getClassName().contains("io.quarkus")) {
+                        sb.append(System.lineSeparator());
+                        for (int j = 0; j < prefix.length(); ++j) {
+                            sb.append(" ");
+                        }
+                        sb.append("...");
+                        break;
+                    }
+                }
+            }
+            throw new BootstrapMavenException(sb.toString());
+        }
+    }
+
     private static Model readModel(Path pom) {
         try {
             final Model model = ModelUtils.readModel(pom);

diff --git a/...jects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml b/...jects/bootstrap/maven-resolver/src/test/resources/workspace-multiple/root/module1/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>root-module1</artifactId>
-    
+
     <build>
         <resources>
             <resource>