refactor: minor improvements

Signed-off-by: Chris Laprun <[email protected]>
quarkiverse · Nov 7, 2024 · dbce5ad · dbce5ad
1 parent 79626c9
commit dbce5ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java b/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java
@@ -118,9 +118,9 @@ private static String getBundleName(AnnotationInstance csvMetadata, String defau
     UnownedCRDInfoBuildItem unownedCRDInfo(BundleGenerationConfiguration bundleConfiguration,
             CurateOutcomeBuildItem appInfoBuildItem) {
         final Optional<List<String>> maybeExternalCRDs = bundleConfiguration.externalCRDLocations();
+        final var crds = new CRDInfos();
         if (maybeExternalCRDs.isPresent()) {
             final var moduleRoot = appInfoBuildItem.getApplicationModel().getApplicationModule().getModuleDir().toPath();
-            final var crds = new CRDInfos();
             maybeExternalCRDs.get().parallelStream()
                     .filter(Predicate.not(String::isBlank))
                     .map(String::trim)
@@ -129,10 +129,8 @@ UnownedCRDInfoBuildItem unownedCRDInfo(BundleGenerationConfiguration bundleConfi
                         final var crd = loadFrom(crdPath);
                         crds.addCRDInfoFor(crd.getCrdName(), crd.getCrdSpecVersion(), crd);
                     });
-            return new UnownedCRDInfoBuildItem(crds);
-        } else {
-            return new UnownedCRDInfoBuildItem(new CRDInfos());
         }
+        return new UnownedCRDInfoBuildItem(crds);
     }
 
     private CRDInfo loadFrom(Path crdPath) {

diff --git a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/CRDGeneration.java
@@ -90,7 +90,7 @@ CRDGenerationInfo generate(OutputTargetBuildItem outputTarget,
                         .forEach((version, crdInfo) -> {
                             final var filePath = crdInfo.getFilePath();
                             log.infov("  - {0} -> {1}", version, filePath);
-                            converted.addCRDInfoFor(crdName, version, new CRDInfo(crdInfo.getCrdName(),
+                            converted.addCRDInfoFor(crdName, version, new CRDInfo(crdName,
                                     version, filePath, crdInfo.getDependentClassNames()));
                         });
             });