Remove powermock to increase coverage

[policy/engine.git] / BRMSGateway / src / main / java / org / onap / policy / brms / api / BrmsGateway.java

diff --git a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsGateway.java b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsGateway.java
index e743794..bb62b96 100644 (file)
--- a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsGateway.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsGateway.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

- * 
+ *

  *      http://www.apache.org/licenses/LICENSE-2.0
  *      http://www.apache.org/licenses/LICENSE-2.0

- * 
+ *

  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.


@@ -20,6 +20,7 @@
 
 package org.onap.policy.brms.api;
 
 
 package org.onap.policy.brms.api;
 

+import java.util.concurrent.CountDownLatch;

 import org.onap.policy.api.NotificationScheme;
 import org.onap.policy.api.PolicyEngine;
 import org.onap.policy.api.PolicyException;
 import org.onap.policy.api.NotificationScheme;
 import org.onap.policy.api.PolicyEngine;
 import org.onap.policy.api.PolicyException;


@@ -31,7 +32,7 @@ import org.onap.policy.xacml.api.XACMLErrorConstants;
  * BRMSGateway: This application acts as the Gateway interface between the PDP XACML and PDP Drools.
  * The listens for BRMS based policies and pushes them to the specified Policy Repository, from
  * where the PDP Drools reads the Rule Jar.
  * BRMSGateway: This application acts as the Gateway interface between the PDP XACML and PDP Drools.
  * The listens for BRMS based policies and pushes them to the specified Policy Repository, from
  * where the PDP Drools reads the Rule Jar.

- * 
+ *

  * @version 0.1
  */
 public class BrmsGateway {
  * @version 0.1
  */
 public class BrmsGateway {


@@ -41,6 +42,9 @@ public class BrmsGateway {
 
     private static PolicyEngine policyEngine = null;
 
 
     private static PolicyEngine policyEngine = null;
 

+    // may be overridden by junit tests
+    private static Factory factory = new Factory();
+

     private BrmsGateway() {
         // Default private constructor
     }
     private BrmsGateway() {
         // Default private constructor
     }


@@ -68,7 +72,7 @@ public class BrmsGateway {
         logger.info("Initializing BRMS Handler");
         BrmsHandler brmsHandler = null;
         try {
         logger.info("Initializing BRMS Handler");
         BrmsHandler brmsHandler = null;
         try {

-            brmsHandler = new BrmsHandler(configFile);
+            brmsHandler = factory.makeBrmsHandler(configFile);

         } catch (final PolicyException e) {
             String errorString = "Check your property file: " + e.getMessage();
             logger.error(errorString);
         } catch (final PolicyException e) {
             String errorString = "Check your property file: " + e.getMessage();
             logger.error(errorString);


@@ -85,21 +89,34 @@ public class BrmsGateway {
         }
 
         // Keep Running....
         }
 
         // Keep Running....

+        CountDownLatch latch = new CountDownLatch(1);

         final Runnable runnable = () -> {
         final Runnable runnable = () -> {

-            while (true) {
-                try {
-                    Thread.sleep(30000);
-                } catch (final InterruptedException e) {
-                    logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Thread Exception " + e.getMessage());
-                    Thread.currentThread().interrupt();
-                }
+            try {
+                // wait until interrupted
+                latch.await();
+            } catch (final InterruptedException e) {
+                logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Thread Exception " + e.getMessage());
+                Thread.currentThread().interrupt();

             }
         };
             }
         };

-        final Thread thread = new Thread(runnable);
+        final Thread thread = factory.makeThread(runnable);

         thread.start();
     }
 
     public static PolicyEngine getPolicyEngine() {
         return policyEngine;
     }
         thread.start();
     }
 
     public static PolicyEngine getPolicyEngine() {
         return policyEngine;
     }

+
+    /**
+     * Factory to provide various data.  May be overridden by junit tests.
+     */
+    public static class Factory {
+        public BrmsHandler makeBrmsHandler(String configFile) throws PolicyException {
+            return new BrmsHandler(configFile);
+        }
+
+        public Thread makeThread(Runnable runnable) {
+            return new Thread(runnable);
+        }
+    }

 }
 }