Bug 8175: Improve SFT TestBundleDiag under Karaf 4

[odlparent.git] / bundles4-test / src / main / java / org / opendaylight / odlparent / bundles4test / BundleDiagInfos.java

diff --git a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java
index 28e73819cfae2be2ebde31b4b162381e66fa9587..be25ba6ab270ffa9bfca021c749f33a40ff9ef1a 100644 (file)
--- a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java
+++ b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/BundleDiagInfos.java
@@ -10,11 +10,10 @@ package org.opendaylight.odlparent.bundles4test;
 import static org.apache.karaf.bundle.core.BundleState.Active;
 import static org.apache.karaf.bundle.core.BundleState.Installed;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.karaf.bundle.core.BundleInfo;
@@ -30,20 +29,24 @@ import org.osgi.framework.BundleContext;
  */
 public final class BundleDiagInfos {
 
+    private static final Map<String, BundleState> WHITELISTED_BUNDLES;
+
+    static {
+        WHITELISTED_BUNDLES = new HashMap<>();
+        WHITELISTED_BUNDLES.put("slf4j.log4j12", Installed);
+    }
+
     private final List<String> okBundleStateInfoTexts;
     private final List<String> nokBundleStateInfoTexts;
     private final List<String> whitelistedBundleStateInfoTexts;
     private final Map<BundleState, Integer> bundleStatesCounters;
 
-    private static final Map<String, BundleState> WHITELISTED_BUNDLES = ImmutableMap.of(
-            "slf4j.log4j12", Installed);
-
     private BundleDiagInfos(List<String> okBundleStateInfoTexts, List<String> nokBundleStateInfoTexts,
             List<String> whitelistedBundleStateInfoTexts, Map<BundleState, Integer> bundleStatesCounters) {
-        this.okBundleStateInfoTexts = ImmutableList.copyOf(okBundleStateInfoTexts);
-        this.nokBundleStateInfoTexts = ImmutableList.copyOf(nokBundleStateInfoTexts);
-        this.whitelistedBundleStateInfoTexts = ImmutableList.copyOf(whitelistedBundleStateInfoTexts);
-        this.bundleStatesCounters = ImmutableMap.copyOf(bundleStatesCounters);
+        this.okBundleStateInfoTexts = immutableCopyOf(okBundleStateInfoTexts);
+        this.nokBundleStateInfoTexts = immutableCopyOf(nokBundleStateInfoTexts);
+        this.whitelistedBundleStateInfoTexts = immutableCopyOf(whitelistedBundleStateInfoTexts);
+        this.bundleStatesCounters = immutableCopyOf(bundleStatesCounters);
     }
 
     public static BundleDiagInfos forContext(BundleContext bundleContext, BundleService bundleService) {
@@ -63,7 +66,7 @@ public final class BundleDiagInfos {
             String bundleStateDiagText = "OSGi state = " + bundleStatetoText(bundle.getState())
                 + ", Karaf bundleState = " + karafBundleState;
             String diagText = bundleService.getDiag(bundle);
-            if (!Strings.isNullOrEmpty(diagText)) {
+            if (!diagText.isEmpty()) {
                 bundleStateDiagText += ", due to: " + diagText;
             }
 
@@ -151,19 +154,28 @@ public final class BundleDiagInfos {
     }
 
     public List<String> getNokBundleStateInfoTexts() {
-        return ImmutableList.copyOf(nokBundleStateInfoTexts);
+        return immutableCopyOf(nokBundleStateInfoTexts);
     }
 
     public List<String> getOkBundleStateInfoTexts() {
-        return ImmutableList.copyOf(okBundleStateInfoTexts);
+        return immutableCopyOf(okBundleStateInfoTexts);
     }
 
     public List<String> getWhitelistedBundleStateInfoTexts() {
-        return ImmutableList.copyOf(whitelistedBundleStateInfoTexts);
+        return immutableCopyOf(whitelistedBundleStateInfoTexts);
     }
 
     @Override
     public String toString() {
         return getFullDiagnosticText();
     }
+
+    private List<String> immutableCopyOf(List<String> stringList) {
+        return Collections.unmodifiableList(new ArrayList<>(stringList));
+    }
+
+    private Map<BundleState, Integer> immutableCopyOf(Map<BundleState, Integer> map) {
+        return Collections.unmodifiableMap(new HashMap<>(map));
+    }
+
 }