Merge pull request quarkusio#17898 from phillip-kruger/catalog-resolv…

…er-enhancements Small changes to Extension Catalog
geoand · Jun 15, 2021 · 74dca07 · 74dca07
2 parents cfb94f3 + 4889784
commit 74dca07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...vtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java b/...vtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java
@@ -16,10 +16,11 @@ public final class ExtensionProcessor {
     public enum CodestartKind {
         CORE,
         EXTENSION_CODESTART,
-        EXAMPLE;
+        EXAMPLE,
+        SINGLETON_EXAMPLE;
 
         public boolean providesCode() {
-            return this == EXTENSION_CODESTART || this == EXAMPLE;
+            return this == EXTENSION_CODESTART || this == EXAMPLE || this == SINGLETON_EXAMPLE;
         }
     }
 

diff --git a/...cts/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/...cts/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
@@ -390,7 +390,7 @@ public ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion) throw
         return appendNonPlatformExtensions(registriesByQuarkusCore, extensionCatalogs);
     }
 
-    public ExtensionCatalog resolveExtensionCatalog(List<ArtifactCoords> platforms)
+    public ExtensionCatalog resolveExtensionCatalog(Collection<ArtifactCoords> platforms)
             throws RegistryResolutionException {
         if (platforms.isEmpty()) {
             return resolveExtensionCatalog();