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>

2 files changed, 10 insertions, 10 deletions

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index 5abfca47b..36db9fe53 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * controlloop operation manager
  * ================================================================================
- * 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.
@@ -54,7 +54,7 @@ import org.onap.policy.guard.Util;
 import org.onap.policy.sdnc.SdncResponse;
 import org.onap.policy.sdnr.PciResponseWrapper;
 import org.onap.policy.so.SOResponseWrapper;
-import org.onap.policy.vfc.VFCResponse;
+import org.onap.policy.vfc.VfcResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -351,11 +351,11 @@ public class ControlLoopOperationManager implements Serializable {
             // Cast SO response and handle it
             //
             return onResponse((SOResponseWrapper) response);
-        } else if (response instanceof VFCResponse) {
+        } else if (response instanceof VfcResponse) {
             //
             // Cast VFC response and handle it
             //
-            return onResponse((VFCResponse) response);
+            return onResponse((VfcResponse) response);
         } else if (response instanceof SdncResponse) {
             //
             // Cast SDNC response and handle it
@@ -563,7 +563,7 @@ public class ControlLoopOperationManager implements Serializable {
      * @param vfcResponse the VFC response
      * @return The result of the response handling
      */
-    private PolicyResult onResponse(VFCResponse vfcResponse) {
+    private PolicyResult onResponse(VfcResponse vfcResponse) {
         if ("finished".equalsIgnoreCase(vfcResponse.getResponseDescriptor().getStatus())) {
             //
             // Consider it as success
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
index 0afe9d2d3..f761d69b7 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * unit test
  * ================================================================================
- * 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.
@@ -73,8 +73,8 @@ import org.onap.policy.controlloop.processor.ControlLoopProcessor;
 import org.onap.policy.drools.system.PolicyEngine;
 import org.onap.policy.so.SOResponse;
 import org.onap.policy.so.SOResponseWrapper;
-import org.onap.policy.vfc.VFCResponse;
-import org.onap.policy.vfc.VFCResponseDescriptor;
+import org.onap.policy.vfc.VfcResponse;
+import org.onap.policy.vfc.VfcResponseDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -753,8 +753,8 @@ public class ControlLoopOperationManagerTest {
         soResponse.setHttpResponseCode(500);
         assertEquals(PolicyResult.FAILURE, clom.onResponse(soRw));
 
-        VFCResponse vfcResponse = new VFCResponse();
-        VFCResponseDescriptor responseDescriptor = new VFCResponseDescriptor();
+        VfcResponse vfcResponse = new VfcResponse();
+        VfcResponseDescriptor responseDescriptor = new VfcResponseDescriptor();
         vfcResponse.setResponseDescriptor(responseDescriptor);
 
         responseDescriptor.setStatus("finished");