refactor: switch BundleGenerationConfiguration to ConfigMapping

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleGenerator.java

@@ -93,12 +93,12 @@ private static HashSet<String> addCRDManifestBuilder(Map<String, CRDInfo> crds,
 
     private static SortedMap<String, String> generateBundleLabels(CSVMetadataHolder csvMetadata,
             BundleGenerationConfiguration bundleConfiguration, Version version) {
-        var packageName = bundleConfiguration.packageName.orElse(csvMetadata.bundleName);
+        var packageName = bundleConfiguration.packageName().orElse(csvMetadata.bundleName);
 
         SortedMap<String, String> values = new TreeMap<>();
         values.put(join(BUNDLE_PREFIX, CHANNEL, DEFAULT, ANNOTATIONS_VERSION),
-                bundleConfiguration.defaultChannel.orElse(bundleConfiguration.channels.get(0)));
-        values.put(join(BUNDLE_PREFIX, CHANNELS, ANNOTATIONS_VERSION), String.join(COMMA, bundleConfiguration.channels));
+                bundleConfiguration.defaultChannel().orElse(bundleConfiguration.channels().get(0)));
+        values.put(join(BUNDLE_PREFIX, CHANNELS, ANNOTATIONS_VERSION), String.join(COMMA, bundleConfiguration.channels()));
         values.put(join(BUNDLE_PREFIX, MANIFESTS, ANNOTATIONS_VERSION), MANIFESTS + SLASH);
         values.put(join(BUNDLE_PREFIX, MEDIA_TYPE, ANNOTATIONS_VERSION), REGISTRY_PLUS + ANNOTATIONS_VERSION);
         values.put(join(BUNDLE_PREFIX, METADATA, ANNOTATIONS_VERSION), METADATA + SLASH);

bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java

@@ -63,7 +63,7 @@ private static class IsGenerationEnabled implements BooleanSupplier {
 
         @Override
         public boolean getAsBoolean() {
-            return config.enabled;
+            return config.enabled();
         }
     }
 
@@ -75,16 +75,16 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
             CombinedIndexBuildItem combinedIndexBuildItem,
             JarBuildItem jarBuildItem) {
         final var index = combinedIndexBuildItem.getIndex();
-        final var defaultName = bundleConfiguration.packageName
+        final var defaultName = bundleConfiguration.packageName()
                 .orElse(ResourceNameUtil.getResourceName(kubernetesConfig, appConfiguration));
 
         // note that version, replaces, etc. should probably be settable at the reconciler level
         // use version specified in bundle configuration, if not use the one extracted from the project, if available
         final var version = kubernetesConfig.getVersion().orElse(appConfiguration.getVersion());
-        final var defaultVersion = bundleConfiguration.version
+        final var defaultVersion = bundleConfiguration.version()
                 .orElse(ApplicationInfoBuildItem.UNSET_VALUE.equals(version) ? null : version);
 
-        final var defaultReplaces = bundleConfiguration.replaces.orElse(null);
+        final var defaultReplaces = bundleConfiguration.replaces().orElse(null);
 
         final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index);
         final var csvGroups = new HashMap<CSVMetadataHolder, List<ReconcilerAugmentedClassInfo>>();

bundle-generator/runtime/src/main/java/io/quarkiverse/operatorsdk/bundle/runtime/BundleGenerationConfiguration.java

@@ -4,49 +4,47 @@
 import java.util.Optional;
 
 import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
-@ConfigRoot(name = "operator-sdk.bundle")
-public class BundleGenerationConfiguration {
+@ConfigMapping(prefix = "operator-sdk.bundle")
+@ConfigRoot
+public interface BundleGenerationConfiguration {
     /**
      * Whether the extension should generate the Operator bundle.
      */
-    @ConfigItem(defaultValue = "true")
-    public Boolean enabled;
+    @WithDefault("true")
+    Boolean enabled();
 
     /**
      * The list of channels that bundle belongs to. By default, it's "alpha".
      */
-    @ConfigItem(defaultValue = "alpha")
-    public List<String> channels;
+    @WithDefault("alpha")
+    List<String> channels();
 
     /**
      * The default channel for the bundle.
      */
-    @ConfigItem
-    public Optional<String> defaultChannel;
+    Optional<String> defaultChannel();
 
     /**
      * The name of the package that bundle belongs to.
      *
      * @deprecated Use {@link CSVMetadata#bundleName()} instead
      */
     @Deprecated(forRemoval = true)
-    @ConfigItem
-    public Optional<String> packageName;
+    Optional<String> packageName();
 
     /**
      * The replaces value that should be used in the generated CSV.
      */
-    @ConfigItem
-    public Optional<String> replaces;
+    Optional<String> replaces();
 
     /**
      * The version value that should be used in the generated CSV instead of the automatically detected one extracted from the
      * project information.
      */
-    @ConfigItem
-    public Optional<String> version;
+    Optional<String> version();
 
 }