Merge pull request #50558 from aloubyansky/maven-extension-cache-refresh

Add refresh parameter to create and add extension Maven plugin goals

Author: gsmet

devtools/cli-common/src/main/java/io/quarkus/cli/common/registry/RegistryClientMixin.java

@@ -24,7 +24,7 @@
 public class RegistryClientMixin {
     static final boolean VALIDATE = !Boolean.parseBoolean(System.getenv("REGISTRY_CLIENT_TEST"));
 
-    /** @see io.quarkus.cli.registry.ToggleRegistryClientMixin#setRegistryClient */
+    /** @see io.quarkus.cli.common.registry.ToggleRegistryClientMixin#setRegistryClient */
     public final String getRegistryClientProperty() {
         return "-DquarkusRegistryClient=" + enabled();
     }

devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java

@@ -194,6 +194,12 @@ public class CreateProjectMojo extends AbstractMojo {
     @Parameter(property = "data")
     private String data;
 
+    /**
+     * Whether to refresh the local extension catalog cache before searching for the recommended Quarkus extension versions
+     */
+    @Parameter(property = "refresh", defaultValue = "false")
+    boolean refresh;
+
     @Component
     QuarkusWorkspaceProvider workspaceProvider;
 
@@ -223,15 +229,7 @@ public void execute() throws MojoExecutionException {
         }
 
         final MojoMessageWriter log = new MojoMessageWriter(getLog());
-        ExtensionCatalogResolver catalogResolver;
-        try {
-            catalogResolver = QuarkusProjectHelper.isRegistryClientEnabled()
-                    ? QuarkusProjectHelper.getCatalogResolver(mvn, log)
-                    : ExtensionCatalogResolver.empty();
-        } catch (RegistryResolutionException e) {
-            // fall back to the default platform
-            catalogResolver = ExtensionCatalogResolver.empty();
-        }
+        ExtensionCatalogResolver catalogResolver = getExtensionCatalogResolver(mvn, log);
         ExtensionCatalog catalog = resolveExtensionsCatalog(this, bomGroupId, bomArtifactId, bomVersion, catalogResolver,
                 mvn, log);
 
@@ -345,6 +343,24 @@ public void execute() throws MojoExecutionException {
         }
     }
 
+    private ExtensionCatalogResolver getExtensionCatalogResolver(MavenArtifactResolver mvn, MojoMessageWriter log) {
+        if (!QuarkusProjectHelper.isRegistryClientEnabled()) {
+            return ExtensionCatalogResolver.empty();
+        }
+        ExtensionCatalogResolver catalogResolver;
+        try {
+            catalogResolver = QuarkusProjectHelper.getCatalogResolver(mvn, log);
+            if (refresh) {
+                getLog().debug("Clearing local extension catalog cache");
+                catalogResolver.clearRegistryCache();
+            }
+        } catch (RegistryResolutionException e) {
+            // fall back to the default platform
+            catalogResolver = ExtensionCatalogResolver.empty();
+        }
+        return catalogResolver;
+    }
+
     static ExtensionCatalog resolveExtensionsCatalog(AbstractMojo mojo, String groupId, String artifactId, String version,
             ExtensionCatalogResolver catalogResolver, MavenArtifactResolver artifactResolver, MessageWriter log)
             throws MojoExecutionException {

devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java

@@ -66,6 +66,12 @@ public abstract class QuarkusProjectMojoBase extends AbstractMojo {
     @Parameter(property = "bomVersion", required = false)
     String bomVersion;
 
+    /**
+     * Whether to refresh the local extension catalog cache before searching for the recommended Quarkus extension versions
+     */
+    @Parameter(property = "refresh", defaultValue = "false")
+    boolean refresh;
+
     @Component
     QuarkusWorkspaceProvider workspaceProvider;
 
@@ -136,14 +142,21 @@ private ExtensionCatalog resolveExtensionCatalog() throws MojoExecutionException
     }
 
     protected ExtensionCatalogResolver getExtensionCatalogResolver() throws MojoExecutionException {
-        if (catalogResolver == null) {
-            try {
-                catalogResolver = QuarkusProjectHelper.isRegistryClientEnabled()
-                        ? QuarkusProjectHelper.getCatalogResolver(catalogArtifactResolver(), getMessageWriter())
-                        : ExtensionCatalogResolver.empty();
-            } catch (RegistryResolutionException e) {
-                throw new MojoExecutionException("Failed to initialize Quarkus extension resolver", e);
+        return catalogResolver == null ? catalogResolver = initExtensionCatalogResolver() : catalogResolver;
+    }
+
+    private ExtensionCatalogResolver initExtensionCatalogResolver() throws MojoExecutionException {
+        if (!QuarkusProjectHelper.isRegistryClientEnabled()) {
+            return ExtensionCatalogResolver.empty();
+        }
+        final ExtensionCatalogResolver catalogResolver;
+        try {
+            catalogResolver = QuarkusProjectHelper.getCatalogResolver(catalogArtifactResolver(), getMessageWriter());
+            if (refresh) {
+                catalogResolver.clearRegistryCache();
             }
+        } catch (RegistryResolutionException e) {
+            throw new MojoExecutionException("Failed to initialize Quarkus extension resolver", e);
         }
         return catalogResolver;
     }