Bug 8415 related: Make TestBundleDiag a lib

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

diff --git a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java
index 2e9377c6052d420e7adf121694412bfe22674e5d..f1c25cd28b5376f89baebe80a8e2ec022f3c7fe5 100644 (file)
--- a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java
+++ b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/SystemStateFailureException.java
@@ -7,41 +7,24 @@
  */
 package org.opendaylight.odlparent.bundles4test;
 
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.opendaylight.odlparent.bundlestest.lib.BundleDiagInfos;
 
-/**
- * Exception thrown (only) by
- * {@link TestBundleDiag#checkBundleDiagInfos(org.osgi.framework.BundleContext, long, java.util.concurrent.TimeUnit)}
- * if there are any OSGi bundles that failed to start.  This is based on not only {@link Bundle#getState()}'s
- * {@link Bundle#ACTIVE}, but also DI wiring systems such as blueprint containers.  The Exceptions' message
- * will likely contain a longer multi-line String with extensive technical details including all failed
- * bundles' states, detailed technical information related to OSGi bundle and blueprint resolution,
- * and possibly exceptions incl. stack traces thrown by {@link BundleActivator} start() methods and
- * dependency injection object wiring {@literal @}PostConstruct "init" type methods.
- *
- * @author Michael Vorburger.ch
- */
-public class SystemStateFailureException extends Exception {
-    private static final long serialVersionUID = 1L;
+@Deprecated
+@SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS")
+public class SystemStateFailureException
+        extends org.opendaylight.odlparent.bundlestest.lib.SystemStateFailureException {
 
-    private final BundleDiagInfos bundleDiagInfos;
+    // TODO remove along with @Deprecated TestBundleDiag
 
-    public SystemStateFailureException(String message, BundleDiagInfos bundleDiagInfos, Throwable cause) {
-        super(getExtendedMessage(message, bundleDiagInfos), cause);
-        this.bundleDiagInfos = bundleDiagInfos;
-    }
+    private static final long serialVersionUID = 1L;
 
     public SystemStateFailureException(String message, BundleDiagInfos bundleDiagInfos) {
-        super(getExtendedMessage(message, bundleDiagInfos));
-        this.bundleDiagInfos = bundleDiagInfos;
+        super(message, bundleDiagInfos);
     }
 
-    private static String getExtendedMessage(String message, BundleDiagInfos bundleDiagInfos) {
-        return message + "\n" + bundleDiagInfos.getFullDiagnosticText();
+    public SystemStateFailureException(String message, BundleDiagInfos bundleDiagInfos, Throwable cause) {
+        super(message, bundleDiagInfos, cause);
     }
 
-    public BundleDiagInfos getBundleDiagInfos() {
-        return bundleDiagInfos;
-    }
 }