Fix more sonar issues in drools-pdp

Addressed issues of cyclomatic complexity and deep nesting by
refactoring code into separate methods.  In some cases, had to
refactor the code into nested classes to avoid passing too many
parameters to the newly extracted methods.
Addressed issue "too many conditionals" by breaking conditionals
apart.
Addressed issue "Remove usage of generic wildcard type" by eliminating
"? extends" from return values.
Addressed issue "Remove this use of 'Thread.sleep()'" in junit tests
by introducing latches or using Awaitility.

Note: this won't build until ApiUtils has been merged.

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

1 files changed, 76 insertions, 61 deletions

diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/GenericEventProtocolCoder.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/GenericEventProtocolCoder.java
index 89a7a420..cb4ce07e 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/GenericEventProtocolCoder.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/GenericEventProtocolCoder.java
@@ -124,40 +124,44 @@ abstract class GenericEventProtocolCoder {
 
             coders.put(key, coderTools);
 
-            if (reverseCoders.containsKey(reverseKey)) {
-                // There is another controller (different group id/artifact id/topic)
-                // that shares the class and the topic.
-
-                List<ProtocolCoderToolset> toolsets =
-                        reverseCoders.get(reverseKey);
-                boolean present = false;
-                for (ProtocolCoderToolset parserSet : toolsets) {
-                    // just doublecheck
-                    present = parserSet.getControllerId().equals(key);
-                    if (present) {
-                        /* anomaly */
-                        logger.error(
-                                "{}: unexpected toolset reverse mapping found for {}:{}: {}",
-                                this,
-                                reverseKey,
-                                key,
-                                parserSet);
-                    }
-                }
+            addReverseCoder(coderTools, key, reverseKey);
+        }
+    }
 
+    private void addReverseCoder(GsonProtocolCoderToolset coderTools, String key, String reverseKey) {
+        if (reverseCoders.containsKey(reverseKey)) {
+            // There is another controller (different group id/artifact id/topic)
+            // that shares the class and the topic.
+
+            List<ProtocolCoderToolset> toolsets =
+                    reverseCoders.get(reverseKey);
+            boolean present = false;
+            for (ProtocolCoderToolset parserSet : toolsets) {
+                // just doublecheck
+                present = parserSet.getControllerId().equals(key);
                 if (present) {
-                    return;
-                } else {
-                    logger.info("{}: adding coder set for {}: {} ", this, reverseKey, coderTools);
-                    toolsets.add(coderTools);
+                    /* anomaly */
+                    logger.error(
+                            "{}: unexpected toolset reverse mapping found for {}:{}: {}",
+                            this,
+                            reverseKey,
+                            key,
+                            parserSet);
                 }
+            }
+
+            if (present) {
+                return;
             } else {
-                List<ProtocolCoderToolset> toolsets = new ArrayList<>();
+                logger.info("{}: adding coder set for {}: {} ", this, reverseKey, coderTools);
                 toolsets.add(coderTools);
-
-                logger.info("{}: adding toolset for reverse key {}: {}", this, reverseKey, toolsets);
-                reverseCoders.put(reverseKey, toolsets);
             }
+        } else {
+            List<ProtocolCoderToolset> toolsets = new ArrayList<>();
+            toolsets.add(coderTools);
+
+            logger.info("{}: adding toolset for reverse key {}: {}", this, reverseKey, toolsets);
+            reverseCoders.put(reverseKey, toolsets);
         }
     }
 
@@ -217,30 +221,36 @@ abstract class GenericEventProtocolCoder {
                 for (CoderFilters codeFilter : coderToolset.getCoders()) {
                     String className = codeFilter.getCodedClass();
                     String reverseKey = this.reverseCodersKey(topic, className);
-                    if (this.reverseCoders.containsKey(reverseKey)) {
-                        List<ProtocolCoderToolset> toolsets =
-                                this.reverseCoders.get(reverseKey);
-                        Iterator<ProtocolCoderToolset> toolsetsIter =
-                                toolsets.iterator();
-                        while (toolsetsIter.hasNext()) {
-                            ProtocolCoderToolset toolset = toolsetsIter.next();
-                            if (toolset.getControllerId().equals(key)) {
-                                logger.info(
-                                        "{}: removed coder from toolset for {} from reverse mapping", this, reverseKey);
-                                toolsetsIter.remove();
-                            }
-                        }
-
-                        if (this.reverseCoders.get(reverseKey).isEmpty()) {
-                            logger.info("{}: removing reverse mapping for {}: ", this, reverseKey);
-                            this.reverseCoders.remove(reverseKey);
-                        }
-                    }
+                    removeReverseCoder(key, reverseKey);
                 }
             }
         }
     }
 
+    private void removeReverseCoder(String key, String reverseKey) {
+        if (!this.reverseCoders.containsKey(reverseKey)) {
+            return;
+        }
+
+        List<ProtocolCoderToolset> toolsets =
+                this.reverseCoders.get(reverseKey);
+        Iterator<ProtocolCoderToolset> toolsetsIter =
+                toolsets.iterator();
+        while (toolsetsIter.hasNext()) {
+            ProtocolCoderToolset toolset = toolsetsIter.next();
+            if (toolset.getControllerId().equals(key)) {
+                logger.info(
+                        "{}: removed coder from toolset for {} from reverse mapping", this, reverseKey);
+                toolsetsIter.remove();
+            }
+        }
+
+        if (this.reverseCoders.get(reverseKey).isEmpty()) {
+            logger.info("{}: removing reverse mapping for {}: ", this, reverseKey);
+            this.reverseCoders.remove(reverseKey);
+        }
+    }
+
     /**
      * does it support coding.
      *
@@ -446,20 +456,7 @@ abstract class GenericEventProtocolCoder {
         }
 
         for (ProtocolCoderToolset encoderSet : toolsets) {
-            // figure out the right toolset
-            String groupId = encoderSet.getGroupId();
-            String artifactId = encoderSet.getArtifactId();
-            List<CoderFilters> coderFilters = encoderSet.getCoders();
-            for (CoderFilters coder : coderFilters) {
-                if (coder.getCodedClass().equals(encodedClass.getClass().getName())) {
-                    DroolsController droolsController =
-                                    DroolsControllerConstants.getFactory().get(groupId, artifactId, "");
-                    if (droolsController.ownsCoder(
-                            encodedClass.getClass(), coder.getModelClassLoaderHash())) {
-                        droolsControllers.add(droolsController);
-                    }
-                }
-            }
+            addToolsetControllers(droolsControllers, encodedClass, encoderSet);
         }
 
         if (droolsControllers.isEmpty()) {
@@ -473,6 +470,24 @@ abstract class GenericEventProtocolCoder {
         return droolsControllers;
     }
 
+    private void addToolsetControllers(List<DroolsController> droolsControllers, Object encodedClass,
+                    ProtocolCoderToolset encoderSet) {
+        // figure out the right toolset
+        String groupId = encoderSet.getGroupId();
+        String artifactId = encoderSet.getArtifactId();
+        List<CoderFilters> coderFilters = encoderSet.getCoders();
+        for (CoderFilters coder : coderFilters) {
+            if (coder.getCodedClass().equals(encodedClass.getClass().getName())) {
+                DroolsController droolsController =
+                                DroolsControllerConstants.getFactory().get(groupId, artifactId, "");
+                if (droolsController.ownsCoder(
+                        encodedClass.getClass(), coder.getModelClassLoaderHash())) {
+                    droolsControllers.add(droolsController);
+                }
+            }
+        }
+    }
+
     /**
      * get all filters by maven coordinates and topic.
      *