Remove model-impl/vfc checkstyle suppressions

Entails renaming VFCxxx classes and updated drl files, as well.

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

4 files changed, 24 insertions, 24 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 be399d9f7..160b75c61 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,9 +45,9 @@ import org.onap.policy.sdnr.PciRequestWrapper;
 import org.onap.policy.sdnr.PciResponseWrapper;
 import org.onap.policy.sdnr.PciRequest;
 import org.onap.policy.sdnr.PciResponse;
-import org.onap.policy.vfc.VFCRequest;
-import org.onap.policy.vfc.VFCResponse;
-import org.onap.policy.vfc.VFCManager;
+import org.onap.policy.vfc.VfcRequest;
+import org.onap.policy.vfc.VfcResponse;
+import org.onap.policy.vfc.VfcManager;
 import org.onap.policy.so.SOManager;
 import org.onap.policy.so.SORequest;
 import org.onap.policy.so.SORequestStatus;
@@ -594,9 +594,9 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   }
                   break;
               case "VFC":
-                  if (request instanceof VFCRequest) {
+                  if (request instanceof VfcRequest) {
                       // Start VFC thread
-                      Thread t = new Thread(new VFCManager(drools.getWorkingMemory(), (VFCRequest)request));
+                      Thread t = new Thread(new VfcManager(drools.getWorkingMemory(), (VfcRequest)request));
                       t.start();
                   }          
                   break;
@@ -1252,7 +1252,7 @@ rule "${policyName}.VFC.RESPONSE"
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : VFCResponse( requestId.toString() == $event.getRequestId().toString() )    
+        $response : VfcResponse( requestId.toString() == $event.getRequestId().toString() )    
     then
         Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
         logger.info("{}: {}", $params.getClosedLoopControlName(), drools.getRule().getName());
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index dc585261c..d8e34313e 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,9 +46,9 @@ import org.onap.policy.sdnr.PciRequestWrapper;
 import org.onap.policy.sdnr.PciResponseWrapper;
 import org.onap.policy.sdnr.PciRequest;
 import org.onap.policy.sdnr.PciResponse;
-import org.onap.policy.vfc.VFCRequest;
-import org.onap.policy.vfc.VFCResponse;
-import org.onap.policy.vfc.VFCManager;
+import org.onap.policy.vfc.VfcRequest;
+import org.onap.policy.vfc.VfcResponse;
+import org.onap.policy.vfc.VfcManager;
 import org.onap.policy.so.SOManager;
 import org.onap.policy.so.SORequest;
 import org.onap.policy.so.SORequestStatus;
@@ -543,9 +543,9 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   }
                   break;
               case "VFC":
-                  if (request instanceof VFCRequest) {
+                  if (request instanceof VfcRequest) {
                       // Start VFC thread
-                      Thread t = new Thread(new VFCManager(drools.getWorkingMemory(), (VFCRequest)request));
+                      Thread t = new Thread(new VfcManager(drools.getWorkingMemory(), (VfcRequest)request));
                       t.start();
                   }
                   break;
@@ -1093,7 +1093,7 @@ rule "VFC.RESPONSE"
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : VFCResponse( requestId.toString() == $event.getRequestId().toString() )
+        $response : VfcResponse( requestId.toString() == $event.getRequestId().toString() )
     then
         Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
         logger.info("{}: {}", $clName, $params.getPolicyName() + "." + drools.getRule().getName());
diff --git a/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
index f7f04af81..feb5bf499 100644
--- a/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,9 @@ import org.onap.policy.appclcm.LcmResponseWrapper;
 import org.onap.policy.appclcm.LcmRequest;
 import org.onap.policy.appclcm.LcmResponse;
 import org.onap.policy.appclcm.LcmCommonHeader;
-import org.onap.policy.vfc.VFCRequest;
-import org.onap.policy.vfc.VFCResponse;
-import org.onap.policy.vfc.VFCManager;
+import org.onap.policy.vfc.VfcRequest;
+import org.onap.policy.vfc.VfcResponse;
+import org.onap.policy.vfc.VfcManager;
 import org.onap.policy.so.SOManager;
 import org.onap.policy.so.SORequest;
 import org.onap.policy.so.SORequestStatus;
@@ -599,9 +599,9 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   }
                   break;
               case "VFC":
-                  if (request instanceof VFCRequest) {
+                  if (request instanceof VfcRequest) {
                       // Start VFC thread
-                      Thread t = new Thread(new VFCManager(drools.getWorkingMemory(), (VFCRequest)request));
+                      Thread t = new Thread(new VfcManager(drools.getWorkingMemory(), (VfcRequest)request));
                       t.start();
                   }          
                   break;
@@ -1103,7 +1103,7 @@ rule "${policyName}.VFC.RESPONSE"
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), onset.getRequestId() == $event.getRequestId() )
         $opTimer : OperationTimer( closedLoopControlName == $event.getClosedLoopControlName(), requestID == $event.getRequestId().toString() )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : VFCResponse( requestId.toString() == $event.getRequestId().toString() ) 
+        $response : VfcResponse( requestId.toString() == $event.getRequestId().toString() ) 
     then
         Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
         logger.info("{}: {}", $params.getClosedLoopControlName(), drools.getRule().getName());
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java
index aa4c108c5..57ed52ad7 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VfcControlLoopTest.java
@@ -3,7 +3,7 @@
  * demo
  * ================================================================================
  * Copyright (C) 2017-2018 Intel Corp. All rights reserved.
- * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
 import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.vfc.VFCRequest;
+import org.onap.policy.vfc.VfcRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -340,7 +340,7 @@ public class VfcControlLoopTest implements TopicListener {
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        } else if (obj instanceof VFCRequest) {
+        } else if (obj instanceof VfcRequest) {
             logger.debug("\n============ VFC received the request!!! ===========\n");
         }
     }