ArC: use ApplicationArchive.getResolvedDependency() to improve error …

…messages
quarkusio · Mar 15, 2024 · b755b61 · b755b61
1 parent 50edfeb
commit b755b61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java
@@ -229,7 +229,8 @@ private boolean possiblyBeanArchive(ApplicationArchive archive,
                                 LOGGER.warnf("Detected bean archive with bean discovery mode of 'all', "
                                         + "this is not portable in CDI Lite and is treated as 'annotated' in Quarkus! "
                                         + "Path to beans.xml: %s",
-                                        archive.getKey() != null ? archive.getKey().toGacString() + ":" + pathVisit.getPath()
+                                        archive.getResolvedDependency() != null
+                                                ? archive.getResolvedDependency().toCompactCoords() + ":" + pathVisit.getPath()
                                                 : pathVisit.getPath());
                             }
                         }

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SplitPackageProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/SplitPackageProcessor.java
@@ -21,7 +21,7 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
-import io.quarkus.maven.dependency.ArtifactKey;
+import io.quarkus.maven.dependency.ResolvedDependency;
 
 /**
  * Split package (same package coming from multiple app archives) is considered a bad practice and
@@ -105,9 +105,9 @@ void splitPackageDetection(ApplicationArchivesBuildItem archivesBuildItem,
                 Set<String> splitPackages = new TreeSet<>();
                 while (iterator.hasNext()) {
                     final ApplicationArchive next = iterator.next();
-                    final ArtifactKey a = next.getKey();
+                    ResolvedDependency dep = next.getResolvedDependency();
                     // can be null for instance in test mode where all application classes go under target/classes
-                    if (a == null) {
+                    if (dep == null) {
                         if (archivesBuildItem.getRootArchive().equals(next)) {
                             // the archive we found is a root archive, e.g. application classes
                             splitPackages.add("application classes");
@@ -122,8 +122,8 @@ void splitPackageDetection(ApplicationArchivesBuildItem archivesBuildItem,
                             }
                         }
                     } else {
-                        // Generates an app archive information in form of groupId:artifactId:classifier:type
-                        splitPackages.add(a.toString());
+                        // Generates an app archive information in form of groupId:artifactId[:classifier][:type]:version
+                        splitPackages.add(dep.toCompactCoords());
                     }
                 }
                 splitPackagesWarning.append(splitPackages.stream().collect(Collectors.joining(", ", "[", "]")));