From 4889784e367359f9fb0e2209aede666ec74c1318 Mon Sep 17 00:00:00 2001 From: Phillip Kruger Date: Mon, 14 Jun 2021 21:37:35 +0200 Subject: [PATCH] Small changes to Extension Catalog Signed-off-by:Phillip Kruger --- .../platform/catalog/processor/ExtensionProcessor.java | 5 +++-- .../java/io/quarkus/registry/ExtensionCatalogResolver.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java index 4885f24a01025..82bbea16c3129 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/platform/catalog/processor/ExtensionProcessor.java +++ b/independent-projects/tools/devtools-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/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java index 45bb385a7daf1..c0212bcdfe101 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java +++ b/independent-projects/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 platforms) + public ExtensionCatalog resolveExtensionCatalog(Collection platforms) throws RegistryResolutionException { if (platforms.isEmpty()) { return resolveExtensionCatalog();