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, 24 insertions, 18 deletions

diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
index 584b3845..bd97ddb1 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicyContainer.java
@@ -448,24 +448,30 @@ public class PolicyContainer implements Startable {
      */
     public synchronized void startScanner(ReleaseId releaseId) {
         String version = releaseId.getVersion();
-        if (!scannerStarted && scanner == null && version != null
-                && ("LATEST".equals(version) || "RELEASE".equals(version) || version.endsWith("-SNAPSHOT"))) {
-            // create the scanner, and poll at 60 second intervals
-            try {
-                scannerStarted = true;
-
-                // start this in a separate thread -- it can block for a long time
-                new Thread("Scanner Starter " + getName()) {
-                    @Override
-                    public void run() {
-                        scanner = kieServices.newKieScanner(kieContainer);
-                        scanner.start(60000L);
-                    }
-                }.start();
-            } catch (Exception e) {
-                // sometimes the scanner initialization fails for some reason
-                logger.error("startScanner error", e);
-            }
+
+        if (scannerStarted || scanner != null || version == null) {
+            return;
+        }
+
+        if (!("LATEST".equals(version) || "RELEASE".equals(version) || version.endsWith("-SNAPSHOT"))) {
+            return;
+        }
+
+        // create the scanner, and poll at 60 second intervals
+        try {
+            scannerStarted = true;
+
+            // start this in a separate thread -- it can block for a long time
+            new Thread("Scanner Starter " + getName()) {
+                @Override
+                public void run() {
+                    scanner = kieServices.newKieScanner(kieContainer);
+                    scanner.start(60000L);
+                }
+            }.start();
+        } catch (Exception e) {
+            // sometimes the scanner initialization fails for some reason
+            logger.error("startScanner error", e);
         }
     }