Merge pull request #50705 from aloubyansky/registry-config-complete-quarkus-versions

geoand · web-flow · commit fce1eeb3a081 · 2025-10-25T11:01:39.000+02:00
Make sure local quarkus-versions config are effective when the default registry provides its own
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
@@ -63,9 +63,9 @@ private static String getConfiguredOfferingOrNull(RegistryConfig config) {
      */
     private final String offeringSupportKey;
 
-    RegistryExtensionResolver(RegistryClient extensionResolver, MessageWriter log) throws RegistryResolutionException {
-        this.extensionResolver = Objects.requireNonNull(extensionResolver, "Registry extension resolver is null");
-        this.config = extensionResolver.resolveRegistryConfig();
+    RegistryExtensionResolver(RegistryClient registryClient, MessageWriter log) throws RegistryResolutionException {
+        this.extensionResolver = Objects.requireNonNull(registryClient, "Registry extension resolver is null");
+        this.config = registryClient.resolveRegistryConfig();
 
         final String versionExpr = config.getQuarkusVersions() == null ? null
                 : config.getQuarkusVersions().getRecognizedVersionsExpression();
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
@@ -40,6 +40,7 @@
 import io.quarkus.registry.config.RegistryMavenRepoConfig;
 import io.quarkus.registry.config.RegistryNonPlatformExtensionsConfig;
 import io.quarkus.registry.config.RegistryPlatformsConfig;
+import io.quarkus.registry.config.RegistryQuarkusVersionsConfig;
 
 public class MavenRegistryClientFactory implements RegistryClientFactory {
 
@@ -185,57 +186,88 @@ private static MavenRegistryArtifactResolver defaultResolver(MavenArtifactResolv
         return new MavenRegistryArtifactResolverWithCleanup(resolver, cleanupTimestampedArtifacts);
     }
 
-    static RegistryConfig.Mutable completeRegistryConfig(RegistryConfig original, RegistryConfig descriptor) {
+    /**
+     * Merges remote and local registry client configurations, prioritizing the local configuration values.
+     *
+     * @param local local client configuration
+     * @param remote default configuration provided by the registry itself
+     * @return complete registry client configuration
+     */
+    static RegistryConfig.Mutable completeRegistryConfig(RegistryConfig local, RegistryConfig remote) {
         RegistryConfig.Mutable complete = RegistryConfig.builder();
 
-        complete.setId(original.getId() == null ? descriptor.getId() : original.getId());
+        complete.setId(local.getId() == null ? remote.getId() : local.getId());
 
-        if (original.getDescriptor() == null) {
-            complete.setDescriptor(descriptor.getDescriptor());
+        if (local.getDescriptor() == null) {
+            complete.setDescriptor(remote.getDescriptor());
         } else {
-            complete.setDescriptor(original.getDescriptor());
+            complete.setDescriptor(local.getDescriptor());
         }
-        if (original.getPlatforms() == null) {
-            complete.setPlatforms(descriptor.getPlatforms());
+        if (local.getPlatforms() == null) {
+            complete.setPlatforms(remote.getPlatforms());
         } else {
-            complete.setPlatforms(completeRegistryPlatformConfig(original.getPlatforms(), descriptor.getPlatforms()));
+            complete.setPlatforms(completeRegistryPlatformConfig(local.getPlatforms(), remote.getPlatforms()));
         }
-        if (original.getNonPlatformExtensions() == null) {
-            complete.setNonPlatformExtensions(descriptor.getNonPlatformExtensions());
+        if (local.getNonPlatformExtensions() == null) {
+            complete.setNonPlatformExtensions(remote.getNonPlatformExtensions());
         } else {
-            complete.setNonPlatformExtensions(original.getNonPlatformExtensions());
+            complete.setNonPlatformExtensions(local.getNonPlatformExtensions());
         }
-        if (original.getUpdatePolicy() == null) {
-            complete.setUpdatePolicy(descriptor.getUpdatePolicy());
+        if (local.getUpdatePolicy() == null) {
+            complete.setUpdatePolicy(remote.getUpdatePolicy());
         } else {
-            complete.setUpdatePolicy(original.getUpdatePolicy());
+            complete.setUpdatePolicy(local.getUpdatePolicy());
         }
 
-        if (original.getMaven() == null) {
-            complete.setMaven(descriptor.getMaven());
-        } else if (isComplete(original.getMaven())) {
-            complete.setMaven(original.getMaven());
+        if (local.getMaven() == null) {
+            complete.setMaven(remote.getMaven());
+        } else if (isComplete(local.getMaven())) {
+            complete.setMaven(local.getMaven());
         } else {
             complete.setMaven(RegistryMavenConfig.builder()
-                    .setRepository(completeMavenRepoConfig(original.getMaven(), descriptor.getMaven())));
+                    .setRepository(completeMavenRepoConfig(local.getMaven(), remote.getMaven())));
         }
 
-        if (original.getQuarkusVersions() == null) {
-            complete.setQuarkusVersions(descriptor.getQuarkusVersions());
-        }
+        complete.setQuarkusVersions(complete(local.getQuarkusVersions(), remote.getQuarkusVersions()));
 
-        if (original.getExtra().isEmpty()) {
-            complete.setExtra(descriptor.getExtra());
-        } else if (descriptor.getExtra().isEmpty()) {
-            complete.setExtra(original.getExtra());
+        if (local.getExtra().isEmpty()) {
+            complete.setExtra(remote.getExtra());
+        } else if (remote.getExtra().isEmpty()) {
+            complete.setExtra(local.getExtra());
         } else {
-            var extra = new HashMap<>(descriptor.getExtra());
-            extra.putAll(original.getExtra());
+            var extra = new HashMap<>(remote.getExtra());
+            extra.putAll(local.getExtra());
             complete.setExtra(extra);
         }
         return complete;
     }
 
+    /**
+     * Merges remote and local registry Quarkus versions configuration, prioritizing the local configuration values.
+     *
+     * @param local local configuration
+     * @param remote default configuration provided by the registry
+     * @return final configuration
+     */
+    private static RegistryQuarkusVersionsConfig complete(RegistryQuarkusVersionsConfig local,
+            RegistryQuarkusVersionsConfig remote) {
+        if (local == null) {
+            return remote;
+        }
+        if (remote == null || local.equals(remote)) {
+            return local;
+        }
+        var complete = RegistryQuarkusVersionsConfig.builder();
+        complete.setExclusiveProvider(local.isExclusiveProvider() || remote.isExclusiveProvider());
+        complete.setRecognizedGroupIds(local.getRecognizedGroupIds().isEmpty()
+                ? remote.getRecognizedGroupIds()
+                : local.getRecognizedGroupIds());
+        complete.setRecognizedVersionsExpression(local.getRecognizedVersionsExpression() == null
+                ? remote.getRecognizedVersionsExpression()
+                : local.getRecognizedVersionsExpression());
+        return complete;
+    }
+
     private static RegistryPlatformsConfig completeRegistryPlatformConfig(RegistryPlatformsConfig client,
             RegistryPlatformsConfig descriptor) {
         if (client == null) {
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistryQuarkusVersionsConfigImpl.java
@@ -56,7 +56,10 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(exclusiveProvider, recognizedVersionsExpression);
+        int result = Objects.hashCode(recognizedVersionsExpression);
+        result = 31 * result + Objects.hashCode(recognizedGroupIds);
+        result = 31 * result + Boolean.hashCode(exclusiveProvider);
+        return result;
     }
 
     @Override
@@ -142,19 +145,25 @@ public String toString() {
     }
 
     static boolean quarkusVersionConfigEquals(RegistryQuarkusVersionsConfig v, Object o) {
-        if (v == o)
+        if (v == o) {
             return true;
-        if (!(o instanceof RegistryQuarkusVersionsConfig))
+        }
+        if (!(o instanceof RegistryQuarkusVersionsConfig that)) {
+            return false;
+        }
+        if (v.isExclusiveProvider() != that.isExclusiveProvider()
+                || !Objects.equals(v.getRecognizedVersionsExpression(), that.getRecognizedVersionsExpression())
+                || v.getRecognizedGroupIds().size() != that.getRecognizedGroupIds().size()) {
             return false;
-        RegistryQuarkusVersionsConfig that = (RegistryQuarkusVersionsConfig) o;
-        return v.isExclusiveProvider() == that.isExclusiveProvider()
-                && Objects.equals(v.getRecognizedVersionsExpression(), that.getRecognizedVersionsExpression());
+        }
+        return v.getRecognizedGroupIds().containsAll(that.getRecognizedGroupIds());
     }
 
     static String quarkusVersionConfigToString(RegistryQuarkusVersionsConfig v) {
         return "RegistryQuarkusVersionsConfig{" +
                 "exclusiveProvider=" + v.isExclusiveProvider() +
                 ", recognizedVersionsExpression='" + v.getRecognizedVersionsExpression() + '\'' +
+                ", recognizedGroupIds=" + v.getRecognizedGroupIds() +
                 '}';
     }
 }
diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/client/maven/MavenRegistryClientCompleteConfigTest.java
@@ -11,11 +11,12 @@
 import io.quarkus.registry.config.RegistryConfig;
 import io.quarkus.registry.config.RegistryDescriptorConfig;
 import io.quarkus.registry.config.RegistryPlatformsConfig;
+import io.quarkus.registry.config.RegistryQuarkusVersionsConfig;
 
 public class MavenRegistryClientCompleteConfigTest {
 
     @Test
-    public void testCompletePlatformsConfig() throws Exception {
+    public void testCompletePlatformsConfig() {
 
         final RegistryDescriptorConfig descriptorConfig = RegistryDescriptorConfig.builder()
                 .setArtifact(ArtifactCoords.fromString("org.acme.registry:acme-registry-descriptor::json:1.0-SNAPSHOT"))
@@ -50,4 +51,47 @@ public void testCompletePlatformsConfig() throws Exception {
                 .isEqualTo(ArtifactCoords.fromString("org.acme.registry:acme-platforms::json:1.0-SNAPSHOT"));
         assertThat(completePlatforms.getExtensionCatalogsIncluded()).isTrue();
     }
+
+    @Test
+    public void testRecognizedVersionOverride() {
+
+        final RegistryDescriptorConfig descriptorConfig = RegistryDescriptorConfig.builder()
+                .setArtifact(ArtifactCoords.fromString("org.acme.registry:acme-registry-descriptor::json:1.0-SNAPSHOT"))
+                .build();
+
+        final RegistryConfig.Mutable originalRegistryConfig = RegistryConfig.builder();
+        originalRegistryConfig.setId("acme-registry")
+                .setDescriptor(descriptorConfig)
+                .setPlatforms(RegistryPlatformsConfig.builder()
+                        .setArtifact(ArtifactCoords.fromString("org.acme.registry:acme-platforms::json:1.0-SNAPSHOT"))
+                        .build())
+                .setQuarkusVersions(RegistryQuarkusVersionsConfig.builder()
+                        .setRecognizedVersionsExpression("*acme-acme*")
+                        .setExclusiveProvider(true));
+
+        final RegistryConfig.Mutable registryDescriptor = RegistryConfig.builder();
+        registryDescriptor.setId("acme-registry")
+                .setDescriptor(descriptorConfig)
+                .setPlatforms(RegistryPlatformsConfig.builder()
+                        .setArtifact(ArtifactCoords.fromString("org.acme.registry:acme-platforms::json:1.0-SNAPSHOT"))
+                        .build())
+                .setQuarkusVersions(RegistryQuarkusVersionsConfig.builder()
+                        .setRecognizedGroupIds(List.of("org.acme"))
+                        .setRecognizedVersionsExpression("*acme*"));
+
+        final RegistryConfig.Mutable completeConfig = MavenRegistryClientFactory.completeRegistryConfig(originalRegistryConfig,
+                registryDescriptor);
+        assertThat(completeConfig.getId()).isEqualTo("acme-registry");
+        assertThat(completeConfig.getDescriptor().getArtifact())
+                .isEqualTo(ArtifactCoords.fromString("org.acme.registry:acme-registry-descriptor::json:1.0-SNAPSHOT"));
+        final RegistryPlatformsConfig completePlatforms = completeConfig.getPlatforms();
+        assertThat(completePlatforms).isNotNull();
+        assertThat(completePlatforms.getArtifact())
+                .isEqualTo(ArtifactCoords.fromString("org.acme.registry:acme-platforms::json:1.0-SNAPSHOT"));
+        assertThat(completeConfig.getQuarkusVersions())
+                .isEqualTo(RegistryQuarkusVersionsConfig.builder()
+                        .setRecognizedVersionsExpression("*acme-acme*")
+                        .setExclusiveProvider(true)
+                        .setRecognizedGroupIds(List.of("org.acme")));
+    }
 }
