Fix sonar issues in integrity monitor

Used Eclipse Refactor->Extract Method to reduce cyclomatic
complexity.
Flattened nested FpManager class into IntegrityMonitor class.
Changed some strings to StringBuilder, where lots of concatenation
was being done.
Simplified some things by eliminating some try/catch blocks where
an exception can't actually (except may an out-of-memory exception).
Also addressed some sonar issues in the tests (e.g., use "<>" where
appropriate).
Eliminated some assertException methods, replacing them with assertj
methods.
Did not attempt to increase junit coverage.

Change-Id: I311acaffcd87f0cbbf382c06c7fa26177007abd5
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 29 insertions, 40 deletions

diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java
index 79eeee49..748d79e6 100644
--- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateTransition.java
@@ -97,6 +97,7 @@ public class StateTransition {
         logger.debug("getEndingState");
         logger.debug("adminState=[{}], opState=[{}], availStatus=[{}], standbyStatus=[{}], actionName[{}]",
                         adminState, opState, availStatus, standbyStatus, actionName);
+
         if (availStatus == null) {
             availStatus = StateManagement.NULL_VALUE;
         }
@@ -119,49 +120,37 @@ public class StateTransition {
 
 
         StateElement stateElement = new StateElement();
-        try {
-            // dependency,failed is stored as dependency.failed in StateTable
-            String availStatus2 = availStatus;
-            if (availStatus2 != null) {
-                availStatus2 = availStatus.replace(",", ".");
-            }
-            String key = adminState + "," + opState + "," + availStatus2 + "," + standbyStatus + "," + actionName;
-            if (logger.isDebugEnabled()) {
-                logger.debug("Ending State search key: {}", key);
-            }
-            String value = STATE_TABLE.get(key);
 
-            if (value != null) {
-                try {
-                    String[] parts = value.split(",", 5);
-                    stateElement.setEndingAdminState(parts[0].trim());
-                    stateElement.setEndingOpState(parts[1].trim());
-                    stateElement.setEndingAvailStatus(parts[2].trim().replace(".", ","));
-                    stateElement.setEndingStandbyStatus(parts[3].trim());
-                    stateElement.setException(parts[4].trim());
-                    stateElement.setAdminState(adminState);
-                    stateElement.setOpState(opState);
-                    stateElement.setAvailStatus(availStatus);
-                    stateElement.setStandbyStatus(standbyStatus);
-                    stateElement.setActionName(actionName);
+        // dependency,failed is stored as dependency.failed in StateTable
+        String availStatus2 = availStatus;
+        if (availStatus2 != null) {
+            availStatus2 = availStatus.replace(",", ".");
+        }
+        String key = adminState + "," + opState + "," + availStatus2 + "," + standbyStatus + "," + actionName;
+        logger.debug("Ending State search key: {}", key);
+        String value = STATE_TABLE.get(key);
+
+        if (value != null) {
+            String[] parts = value.split(",", 5);
+            stateElement.setEndingAdminState(parts[0].trim());
+            stateElement.setEndingOpState(parts[1].trim());
+            stateElement.setEndingAvailStatus(parts[2].trim().replace(".", ","));
+            stateElement.setEndingStandbyStatus(parts[3].trim());
+            stateElement.setException(parts[4].trim());
+            stateElement.setAdminState(adminState);
+            stateElement.setOpState(opState);
+            stateElement.setAvailStatus(availStatus);
+            stateElement.setStandbyStatus(standbyStatus);
+            stateElement.setActionName(actionName);
 
-                    stateElement.displayStateElement();
-                } catch (Exception ex) {
-                    logger.error("String split exception: {}", ex.toString(), ex);
-                }
+            stateElement.displayStateElement();
 
-            } else {
-                String msg = "Ending state not found, adminState=[" + adminState + OPSTATE_STRING + opState
-                        + AVAILSTATUS_STRING + availStatus + STANDBY_STRING + standbyStatus + ACTION_STRING
-                        + actionName + "]";
-                logger.error("{}", msg);
-                throw new StateTransitionException(msg);
-            }
-        } catch (Exception ex) {
-            logger.error("StateTransition threw exception.", ex);
-            throw new StateTransitionException("Exception: " + ex.toString() + ", adminState=[" + adminState
-                    + OPSTATE_STRING + opState + AVAILSTATUS_STRING + availStatus + STANDBY_STRING + standbyStatus
-                    + ACTION_STRING + actionName + "]");
+        } else {
+            String msg = "Ending state not found, adminState=[" + adminState + OPSTATE_STRING + opState
+                    + AVAILSTATUS_STRING + availStatus + STANDBY_STRING + standbyStatus + ACTION_STRING
+                    + actionName + "]";
+            logger.error("{}", msg);
+            throw new StateTransitionException(msg);
         }
 
         return stateElement;