Constify WHITELISTED_BUNDLES

Use Map.of() for a static initialization. Since we know we are storing
non-null Enum entries, use a simple == to compare them.

Change-Id: I3af1cd7a0ad0b2b1400859a0267dca666e07f95a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
index aa3d41980d169761d242e1533a8f7d3c8b47244e..6e0d8800df9f2b7f13f034edbc4dfe1e6447d336 100644 (file)
--- a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
+++ b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/BundleDiagInfosImpl.java
@@ -30,15 +30,13 @@ import org.osgi.framework.BundleContext;
  */
 // intentionally just package-local
 final class BundleDiagInfosImpl implements BundleDiagInfos {
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
-    private static final Map<String, BundleState> WHITELISTED_BUNDLES;
-
-    static {
-        WHITELISTED_BUNDLES = new HashMap<>();
-        WHITELISTED_BUNDLES.put("slf4j.log4j12", Installed);
-        WHITELISTED_BUNDLES.put("org.apache.karaf.scr.management", Waiting); // ODLPARENT-144
-    }
+    private static final Map<String, BundleState> WHITELISTED_BUNDLES = Map.of(
+        "slf4j.log4j12", Installed,
+        // ODLPARENT-144
+        "org.apache.karaf.scr.management", Waiting);
 
     private final List<String> okBundleStateInfoTexts;
     private final List<String> nokBundleStateInfoTexts;
@@ -90,12 +88,10 @@ final class BundleDiagInfosImpl implements BundleDiagInfos {
                 + ", Karaf bundleState = " + karafBundleState
                 + (diagText.isEmpty() ? "" : ", due to: " + diagText);
 
-            if (WHITELISTED_BUNDLES.get(bundleSymbolicName) != null) {
-                if (WHITELISTED_BUNDLES.get(bundleSymbolicName).equals(karafBundleState)) {
-                    String msg = "WHITELISTED " + bundleSymbolicNameWithVersion + ": " + bundleStateDiagText;
-                    whitelistedBundleStateInfoTexts.add(msg);
-                    continue;
-                }
+            if (bundleSymbolicName != null && WHITELISTED_BUNDLES.get(bundleSymbolicName) == karafBundleState) {
+                whitelistedBundleStateInfoTexts.add(
+                    "WHITELISTED " + bundleSymbolicNameWithVersion + ": " + bundleStateDiagText);
+                continue;
             }
 
             bundleStatesCounters.compute(karafBundleState, (key, counter) -> counter + 1);