Clean up objects for deleted rules

When rules for a closed loop are deleted, associated working memory
elements may be left around.
Modified the code to retract the various elements.
Re-added code to unlock when retracting TargetLock.
Add junit tests for new methods.
Forgot the junit test for request id.

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

2 files changed, 13 insertions, 1 deletions

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index 4817bec40..fa608ca08 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -101,6 +101,10 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
         this.requestID = requestID;
     }
 
+    public String getClosedLoopControlName() {
+        return closedLoopControlName;
+    }
+
     public String getControlLoopResult() {
         return controlLoopResult;
     }
@@ -145,6 +149,10 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
         return this.processor;
     }
 
+    public UUID getRequestID() {
+        return requestID;
+    }
+
     /**
      * Activate a control loop event.
      * 
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
index 02dda2048..0c626e247 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
@@ -459,7 +459,11 @@ public class ControlLoopEventManagerTest {
 
     @Test
     public void testMethods() {
-        ControlLoopEventManager clem = new ControlLoopEventManager("MyClosedLoopName", UUID.randomUUID());
+        UUID requestId = UUID.randomUUID();
+        ControlLoopEventManager clem = new ControlLoopEventManager("MyClosedLoopName", requestId);
+        
+        assertEquals("MyClosedLoopName", clem.getClosedLoopControlName());
+        assertEquals(requestId, clem.getRequestID());
 
         clem.setActivated(true);
         assertEquals(true, clem.isActivated());