Remove eventmanager checkstyle suppressions

Renamed enum class name and various method names in ControlLoopEventManager.

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

1 files changed, 19 insertions, 19 deletions

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 4172b2d37..3368e9153 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -29,7 +29,7 @@ import org.onap.policy.controlloop.policy.PolicyResult;
 import org.onap.policy.controlloop.policy.ControlLoopPolicy;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager;
-import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager.NEW_EVENT_STATUS;
+import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager.NewEventStatus;
 import org.onap.policy.controlloop.eventmanager.ControlLoopOperationManager;
 import org.onap.policy.controlloop.actor.so.SoActorServiceProvider;
 import org.onap.policy.aai.AaiNqResponseWrapper;
@@ -165,7 +165,7 @@ rule "${policyName}.EVENT"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         not ( ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() ) )
+            requestId == $event.getRequestId() ) )
     then
  
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
@@ -285,7 +285,7 @@ rule "${policyName}.EVENT.MANAGER"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $clTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), timerType == "ClosedLoop", !expired )
     then
@@ -299,11 +299,11 @@ rule "${policyName}.EVENT.MANAGER"
         //
         // Check which event this is.
         //
-        ControlLoopEventManager.NEW_EVENT_STATUS eventStatus = $manager.onNewEvent($event);
+        ControlLoopEventManager.NewEventStatus eventStatus = $manager.onNewEvent($event);
         //
         // Check what kind of event this is
         //
-        if (eventStatus == NEW_EVENT_STATUS.SUBSEQUENT_ONSET) {
+        if (eventStatus == NewEventStatus.SUBSEQUENT_ONSET) {
             //
             // We don't care about subsequent onsets
             //
@@ -312,7 +312,7 @@ rule "${policyName}.EVENT.MANAGER"
             retract($event);
             return;
         }
-        if (eventStatus == NEW_EVENT_STATUS.SYNTAX_ERROR) {
+        if (eventStatus == NewEventStatus.SYNTAX_ERROR) {
             //
             // Ignore any bad syntax events
             //
@@ -326,7 +326,7 @@ rule "${policyName}.EVENT.MANAGER"
         // all the other events need to be retracted to support
         // cleanup and avoid the other rules being fired for this event.
         //
-        if (eventStatus != NEW_EVENT_STATUS.FIRST_ONSET) {
+        if (eventStatus != NewEventStatus.FIRST_ONSET) {
             logger.warn("{}: {}: not first onset", 
                         $params.getClosedLoopControlName(), drools.getRule().getName());
             retract($event);
@@ -526,7 +526,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId(), "Permit".equalsIgnoreCase(getGuardApprovalStatus()) )
         $lock : TargetLock (requestID == $event.getRequestId())
@@ -674,7 +674,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId(), getGuardApprovalStatus() == "NONE" )
         $lock : TargetLock (requestID == $event.getRequestId())
@@ -743,7 +743,7 @@ rule "${policyName}.GUARD.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() ) 
+            requestId == $event.getRequestId() ) 
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $lock : TargetLock (requestID == $event.getRequestId())
@@ -812,7 +812,7 @@ rule "${policyName}.APPC.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET ) 
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -930,7 +930,7 @@ rule "${policyName}.APPC.LCM.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET ) 
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1039,7 +1039,7 @@ rule "${policyName}.SDNR.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET ) 
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1148,7 +1148,7 @@ rule "${policyName}.SO.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1236,7 +1236,7 @@ rule "${policyName}.VFC.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1313,7 +1313,7 @@ rule "${policyName}.SDNC.RESPONSE"
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName(), 
             closedLoopEventStatus == ControlLoopEventStatus.ONSET )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1404,7 +1404,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.TIMEOUT"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), 
             onset.getRequestId() == $event.getRequestId() )
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
@@ -1471,7 +1471,7 @@ rule "${policyName}.EVENT.MANAGER.TIMEOUT"
         $params : Params( getClosedLoopControlName() == "${closedLoopControlName}" )
         $event : VirtualControlLoopEvent( closedLoopControlName == $params.getClosedLoopControlName() )
         $manager : ControlLoopEventManager( closedLoopControlName == $event.getClosedLoopControlName(), 
-            requestID == $event.getRequestId() )
+            requestId == $event.getRequestId() )
         $clTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), expired, timerType == "ClosedLoop" )
     then
@@ -1510,7 +1510,7 @@ end
 */
 rule "${policyName}.EVENT.MANAGER.CLEANUP"
     when
-        $manager : ControlLoopEventManager( $clName : getClosedLoopControlName(), $requestId : getRequestID() )
+        $manager : ControlLoopEventManager( $clName : getClosedLoopControlName(), $requestId : getRequestId() )
         $operations : LinkedList()
                         from collect( ControlLoopOperationManager( onset.closedLoopControlName == $clName, 
                             onset.getRequestId() == $requestId ) )