Merge pull request #47795 from gsmet/better-handle-failing-codestarts

gsmet · web-flow · commit bbb5e59dc9eb · 2025-05-12T15:32:20.000+02:00
Better handle registry referencing non-existing codestarts
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateJBangMojo.java
@@ -113,7 +113,7 @@ public void execute() throws MojoExecutionException {
             throw new MojoExecutionException("Failed to resolve Quarkus extension catalog", e);
         }
 
-        final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder()
+        final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder(log)
                 .catalog(catalog)
                 .artifactResolver(mvn)
                 .build();
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java
@@ -296,7 +296,7 @@ public void execute() throws MojoExecutionException {
             catalog = CreateProjectHelper.completeCatalog(catalog, extensions, mvn);
             sanitizeOptions();
 
-            final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder()
+            final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder(log)
                     .catalog(catalog)
                     .artifactResolver(mvn)
                     .build();
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java
@@ -103,7 +103,7 @@ public void execute() throws MojoExecutionException {
         } else {
             final ExtensionCatalog extensionCatalog = resolveExtensionCatalog();
             final List<ResourceLoader> codestartsResourceLoader = CodestartResourceLoadersBuilder
-                    .codestartLoadersBuilder()
+                    .codestartLoadersBuilder(log)
                     .artifactResolver(artifactResolver())
                     .catalog(extensionCatalog)
                     .build();
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartCatalog.java
@@ -12,6 +12,7 @@
 import io.quarkus.devtools.codestarts.Codestart;
 import io.quarkus.devtools.codestarts.DataKey;
 import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 
 public final class QuarkusExtensionCodestartCatalog extends GenericCodestartCatalog<QuarkusExtensionCodestartProjectInput> {
 
@@ -78,9 +79,9 @@ public enum Tooling implements DataKey {
         GIT
     }
 
-    public static QuarkusExtensionCodestartCatalog fromBaseCodestartsResources()
+    public static QuarkusExtensionCodestartCatalog fromBaseCodestartsResources(MessageWriter log)
             throws IOException {
-        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(),
+        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(log),
                 QUARKUS_EXTENSION_CODESTARTS_DIR);
         return new QuarkusExtensionCodestartCatalog(codestarts.values());
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartCatalog.java
@@ -12,6 +12,7 @@
 import io.quarkus.devtools.codestarts.Codestart;
 import io.quarkus.devtools.codestarts.DataKey;
 import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
 
 public final class QuarkusJBangCodestartCatalog extends GenericCodestartCatalog<QuarkusJBangCodestartProjectInput> {
@@ -48,9 +49,9 @@ private QuarkusJBangCodestartCatalog(Collection<Codestart> codestarts) {
         super(codestarts);
     }
 
-    public static QuarkusJBangCodestartCatalog fromBaseCodestartsResources()
+    public static QuarkusJBangCodestartCatalog fromBaseCodestartsResources(MessageWriter log)
             throws IOException {
-        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(),
+        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(log),
                 QUARKUS_JBANG_CODESTARTS_DIR);
         return new QuarkusJBangCodestartCatalog(codestarts.values());
     }
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java
@@ -10,7 +10,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +27,7 @@
 import io.quarkus.devtools.codestarts.CodestartType;
 import io.quarkus.devtools.codestarts.DataKey;
 import io.quarkus.devtools.codestarts.core.GenericCodestartCatalog;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.extensions.Extensions;
 import io.quarkus.maven.dependency.ArtifactCoords;
 import io.quarkus.platform.catalog.processor.ExtensionProcessor;
@@ -86,22 +86,23 @@ private QuarkusCodestartCatalog(Collection<Codestart> codestarts,
         this.extensionsMapping = extensionsMapping;
     }
 
-    public static QuarkusCodestartCatalog fromBaseCodestartsResources(Map<String, Extension> extensionsMapping)
+    public static QuarkusCodestartCatalog fromBaseCodestartsResources(MessageWriter log,
+            Map<String, Extension> extensionsMapping)
             throws IOException {
-        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(),
+        final Map<String, Codestart> codestarts = loadCodestartsFromResources(getCodestartResourceLoaders(log),
                 QUARKUS_CODESTARTS_DIR);
         return new QuarkusCodestartCatalog(codestarts.values(), extensionsMapping);
     }
 
-    public static QuarkusCodestartCatalog fromBaseCodestartsResources()
+    public static QuarkusCodestartCatalog fromBaseCodestartsResources(MessageWriter log)
             throws IOException {
-        return fromBaseCodestartsResources(Collections.emptyMap());
+        return fromBaseCodestartsResources(log, Map.of());
     }
 
     public static QuarkusCodestartCatalog fromExtensionsCatalogAndDirectories(
-            ExtensionCatalog catalog, Collection<Path> directories)
+            MessageWriter log, ExtensionCatalog catalog, Collection<Path> directories)
             throws IOException {
-        final List<ResourceLoader> loaders = getCodestartResourceLoaders(catalog);
+        final List<ResourceLoader> loaders = getCodestartResourceLoaders(log, catalog);
         final Map<String, Codestart> codestarts = loadCodestartsFromResources(loaders,
                 QUARKUS_CODESTARTS_DIR);
         for (Path directory : directories) {
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateExtensionCommandHandler.java
@@ -63,7 +63,7 @@ public QuarkusCommandOutcome execute(MessageWriter log)
             throws QuarkusCommandException {
         try {
             final QuarkusExtensionCodestartCatalog catalog = QuarkusExtensionCodestartCatalog
-                    .fromBaseCodestartsResources();
+                    .fromBaseCodestartsResources(log);
             catalog.createProject(input).generate(newExtensionDir);
 
             final String extensionDirName = newExtensionDir.getFileName().toString();
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/CodestartResourceLoadersBuilder.java
@@ -19,6 +19,7 @@
 
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.bootstrap.util.DependencyUtils;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
 import io.quarkus.registry.catalog.Extension;
 import io.quarkus.registry.catalog.ExtensionCatalog;
@@ -33,6 +34,7 @@ public final class CodestartResourceLoadersBuilder {
     private MavenArtifactResolver artifactResolver;
     private String baseCodestartsArtifactCoords = BASE_CODESTARTS_ARTIFACT_COORDS;
     private Collection<String> extraCodestartsArtifactCoords = new ArrayList<>();
+    private MessageWriter log;
 
     private static String retrieveBaseCodestartsArtifactCoords() {
         final String artifact = PropertiesUtil.getProperty(BASE_CODESTARTS_ARTIFACT_PROPERTY);
@@ -52,19 +54,20 @@ private static String retrieveBaseCodestartsArtifactCoords() {
         }
     }
 
-    private CodestartResourceLoadersBuilder() {
+    private CodestartResourceLoadersBuilder(MessageWriter log) {
+        this.log = log;
     }
 
-    public static CodestartResourceLoadersBuilder codestartLoadersBuilder() {
-        return new CodestartResourceLoadersBuilder();
+    public static CodestartResourceLoadersBuilder codestartLoadersBuilder(MessageWriter log) {
+        return new CodestartResourceLoadersBuilder(log);
     }
 
-    public static List<ResourceLoader> getCodestartResourceLoaders() {
-        return codestartLoadersBuilder().build();
+    public static List<ResourceLoader> getCodestartResourceLoaders(MessageWriter log) {
+        return codestartLoadersBuilder(log).build();
     }
 
-    public static List<ResourceLoader> getCodestartResourceLoaders(ExtensionCatalog catalog) {
-        return codestartLoadersBuilder().catalog(catalog).build();
+    public static List<ResourceLoader> getCodestartResourceLoaders(MessageWriter log, ExtensionCatalog catalog) {
+        return codestartLoadersBuilder(log).catalog(catalog).build();
     }
 
     public CodestartResourceLoadersBuilder catalog(ExtensionCatalog catalog) {
@@ -94,13 +97,14 @@ public CodestartResourceLoadersBuilder addExtraCodestartsArtifactCoords(Collecti
 
     public List<ResourceLoader> build() {
         return getCodestartResourceLoaders(baseCodestartsArtifactCoords, extraCodestartsArtifactCoords, catalog,
-                artifactResolver == null ? QuarkusProjectHelper.artifactResolver() : artifactResolver);
+                artifactResolver == null ? QuarkusProjectHelper.artifactResolver() : artifactResolver, log);
     }
 
     private static List<ResourceLoader> getCodestartResourceLoaders(String baseCodestartsArtifactCoords,
             Collection<String> extraCodestartsArtifactCoords,
             ExtensionCatalog catalog,
-            MavenArtifactResolver mvn) {
+            MavenArtifactResolver mavenArtifactResolver,
+            MessageWriter log) {
 
         final Map<String, Artifact> codestartsArtifacts = new LinkedHashMap<>();
 
@@ -146,10 +150,11 @@ private static List<ResourceLoader> getCodestartResourceLoaders(String baseCodes
         final List<ResourceLoader> codestartResourceLoaders = new ArrayList<>(codestartsArtifacts.size());
         for (Artifact a : codestartsArtifacts.values()) {
             try {
-                final File artifactFile = mvn.resolve(a).getArtifact().getFile();
+                final File artifactFile = mavenArtifactResolver.resolve(a).getArtifact().getFile();
                 codestartResourceLoaders.add(resolveFileResourceLoader(artifactFile));
             } catch (Exception e) {
-                throw new RuntimeException("Failed to resolve codestart artifact " + a, e);
+                log.warn("Unable to resolve codestart artifact for %s: %s", a, e.getMessage());
+                continue;
             }
         }
         return codestartResourceLoaders;
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/QuarkusProjectHelper.java
@@ -146,7 +146,7 @@ public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalo
     public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalog, BuildTool buildTool,
             JavaVersion javaVersion,
             MessageWriter log) {
-        return QuarkusProject.of(projectDir, catalog, getCodestartResourceLoaders(catalog),
+        return QuarkusProject.of(projectDir, catalog, getCodestartResourceLoaders(log, catalog),
                 log, buildTool, javaVersion);
     }
 
@@ -161,7 +161,7 @@ public static ExtensionCatalog resolveExtensionCatalog() throws RegistryResoluti
     public static QuarkusProject getProject(Path projectDir, ExtensionCatalog catalog, ExtensionManager extManager,
             JavaVersion javaVersion,
             MessageWriter log) {
-        return QuarkusProject.of(projectDir, catalog, getCodestartResourceLoaders(catalog),
+        return QuarkusProject.of(projectDir, catalog, getCodestartResourceLoaders(log, catalog),
                 log, extManager, javaVersion);
     }
 
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/project/buildfile/MavenProjectBuildFile.java
@@ -121,7 +121,7 @@ public static QuarkusProject getProject(Artifact projectPom, Model projectModel,
         }
         final MavenProjectBuildFile extensionManager = new MavenProjectBuildFile(projectDir, extensionCatalog,
                 projectModel, deps, managedDeps, projectProps, projectPom == null ? null : artifactResolver);
-        final List<ResourceLoader> codestartResourceLoaders = codestartLoadersBuilder().catalog(extensionCatalog)
+        final List<ResourceLoader> codestartResourceLoaders = codestartLoadersBuilder(log).catalog(extensionCatalog)
                 .artifactResolver(artifactResolver).build();
         final JavaVersion javaVersion = resolveJavaVersion(projectProps);
         return QuarkusProject.of(projectDir, extensionCatalog,
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/FakeExtensionCatalog.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.registry.catalog.ExtensionCatalog;
 
 public final class FakeExtensionCatalog {
@@ -20,6 +21,7 @@ private FakeExtensionCatalog() {
     private static QuarkusCodestartCatalog getQuarkusCodestartCatalog() {
         try {
             return QuarkusCodestartCatalog.fromBaseCodestartsResources(
+                    MessageWriter.info(),
                     QuarkusCodestartCatalog.buildExtensionsMapping(FAKE_EXTENSION_CATALOG.getExtensions()));
         } catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/PlatformAwareTestBase.java
@@ -7,6 +7,7 @@
 
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.platform.descriptor.loader.json.ResourceLoader;
 import io.quarkus.platform.tools.ToolsUtils;
@@ -21,7 +22,7 @@ public class PlatformAwareTestBase {
     private Properties quarkusProps;
 
     protected List<ResourceLoader> getCodestartsResourceLoaders() {
-        return getCodestartResourceLoaders(getExtensionsCatalog());
+        return getCodestartResourceLoaders(MessageWriter.info(), getExtensionsCatalog());
     }
 
     protected ExtensionCatalog getExtensionsCatalog() {
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/codestarts/QuarkusCodestartTest.java
@@ -39,6 +39,7 @@
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog;
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language;
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartProjectInput;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.BuildTool;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.testing.SnapshotTesting;
@@ -354,7 +355,7 @@ public void afterAll(ExtensionContext extensionContext) throws Exception {
     }
 
     protected List<ResourceLoader> getCodestartsResourceLoaders() {
-        return codestartLoadersBuilder()
+        return codestartLoadersBuilder(MessageWriter.info())
                 .catalog(getExtensionsCatalog())
                 .addExtraCodestartsArtifactCoords(artifacts)
                 .build();
diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/extension/QuarkusExtensionCodestartGenerationTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.TestInfo;
 
 import io.quarkus.devtools.codestarts.extension.QuarkusExtensionCodestartCatalog.QuarkusExtensionData;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.testing.SnapshotTesting;
 
 class QuarkusExtensionCodestartGenerationTest {
@@ -57,7 +58,7 @@ void generateProjectWithoutTests(TestInfo testInfo) throws Throwable {
     }
 
     private QuarkusExtensionCodestartCatalog getCatalog() throws IOException {
-        return QuarkusExtensionCodestartCatalog.fromBaseCodestartsResources();
+        return QuarkusExtensionCodestartCatalog.fromBaseCodestartsResources(MessageWriter.info());
     }
 
 }
diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/codestarts/jbang/QuarkusJBangCodestartGenerationTest.java
@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.TestInfo;
 
 import io.quarkus.devtools.codestarts.utils.NestedMaps;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.testing.SnapshotTesting;
 
 class QuarkusJBangCodestartGenerationTest {
@@ -61,7 +62,7 @@ void generatePicocliProject(TestInfo testInfo) throws Throwable {
     }
 
     private QuarkusJBangCodestartCatalog getCatalog() throws IOException {
-        return QuarkusJBangCodestartCatalog.fromBaseCodestartsResources();
+        return QuarkusJBangCodestartCatalog.fromBaseCodestartsResources(MessageWriter.info());
     }
 
 }
diff --git a/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogCompatibilityTest.java b/integration-tests/devtools/src/test/java/io/quarkus/platform/catalog/CatalogCompatibilityTest.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog;
+import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.devtools.project.CodestartResourceLoadersBuilder;
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.testing.PlatformAwareTestBase;
@@ -65,7 +66,7 @@ private static void checkPlatformRelease(ExtensionCatalogResolver catalogResolve
 
     private static void checkCodestarts(ExtensionCatalog extensionCatalog, CatalogProcessor processed) throws IOException {
         final List<ResourceLoader> codestartResourceLoaders = CodestartResourceLoadersBuilder
-                .getCodestartResourceLoaders(extensionCatalog);
+                .getCodestartResourceLoaders(MessageWriter.info(), extensionCatalog);
         final QuarkusCodestartCatalog quarkusCodestartCatalog = QuarkusCodestartCatalog
                 .fromExtensionsCatalog(extensionCatalog, codestartResourceLoaders);
         assertThat(quarkusCodestartCatalog.getCodestarts()).isNotNull();

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void execute() throws MojoExecutionException {`
`113`	`113`	`throw new MojoExecutionException("Failed to resolve Quarkus extension catalog", e);`
`114`	`114`	`}`
`115`	`115`
`116`		`- final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder()`
	`116`	`+ final List<ResourceLoader> codestartsResourceLoader = codestartLoadersBuilder(log)`
`117`	`117`	`.catalog(catalog)`
`118`	`118`	`.artifactResolver(mvn)`
`119`	`119`	`.build();`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static QuarkusProject getProject(Artifact projectPom, Model projectModel,`
`121`	`121`	`}`
`122`	`122`	`final MavenProjectBuildFile extensionManager = new MavenProjectBuildFile(projectDir, extensionCatalog,`
`123`	`123`	`projectModel, deps, managedDeps, projectProps, projectPom == null ? null : artifactResolver);`
`124`		`- final List<ResourceLoader> codestartResourceLoaders = codestartLoadersBuilder().catalog(extensionCatalog)`
	`124`	`+ final List<ResourceLoader> codestartResourceLoaders = codestartLoadersBuilder(log).catalog(extensionCatalog)`
`125`	`125`	`.artifactResolver(artifactResolver).build();`
`126`	`126`	`final JavaVersion javaVersion = resolveJavaVersion(projectProps);`
`127`	`127`	`return QuarkusProject.of(projectDir, extensionCatalog,`