Removed checkstyle warnings

Removed checkstyle warnings from:
policy/drools-applications/controlloop/common/model-impl/appc
policy/drools-applications/controlloop/common/model-impl/appclcm
policy/drools-applications/controlloop/common/model-impl/events
including changes to template files due to renamed methods

Issue-ID: POLICY-705
Change-Id: Ieb93baf43268aa608f204eef1a610354f2adec32
Signed-off-by: mmis <michael.morris@ericsson.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
index 83f44a1ed..b8aaf854a 100644
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
@@ -90,7 +90,7 @@ public class VFCActorServiceProvider implements Actor {
 
         // Construct an VFC request
         VFCRequest request = new VFCRequest();
-        String serviceInstance = onset.getAAI().get("service-instance.service-instance-id");
+        String serviceInstance = onset.getAai().get("service-instance.service-instance-id");
         if (serviceInstance == null || "".equals(serviceInstance)) {
             AaiGetVnfResponse tempVnfResp = vnfResponse;
             if (tempVnfResp == null) { // if the response is null, we haven't queried
@@ -103,9 +103,9 @@ public class VFCActorServiceProvider implements Actor {
             serviceInstance = tempVnfResp.getServiceId();
         }
         request.setNSInstanceId(serviceInstance);
-        request.setRequestId(onset.getRequestID());
+        request.setRequestId(onset.getRequestId());
         request.setHealRequest(new VFCHealRequest());
-        request.getHealRequest().setVnfInstanceId(onset.getAAI().get("generic-vnf.vnf-id"));
+        request.getHealRequest().setVnfInstanceId(onset.getAai().get("generic-vnf.vnf-id"));
         request.getHealRequest().setCause(operation.getMessage());
         request.getHealRequest().setAdditionalParams(new VFCHealAdditionalParams());
 
@@ -113,9 +113,9 @@ public class VFCActorServiceProvider implements Actor {
             request.getHealRequest().getAdditionalParams().setAction("restartvm");
             request.getHealRequest().getAdditionalParams().setActionInfo(new VFCHealActionVmInfo());
             request.getHealRequest().getAdditionalParams().getActionInfo()
-                    .setVmid(onset.getAAI().get("vserver.vserver-id"));
+                    .setVmid(onset.getAai().get("vserver.vserver-id"));
             request.getHealRequest().getAdditionalParams().getActionInfo()
-                    .setVmname(onset.getAAI().get("vserver.vserver-name"));
+                    .setVmname(onset.getAai().get("vserver.vserver-name"));
         } else {
             return null;
         }
@@ -124,9 +124,9 @@ public class VFCActorServiceProvider implements Actor {
 
     private static AaiGetVnfResponse getAaiServiceInstance(VirtualControlLoopEvent event) {
         AaiGetVnfResponse response = null;
-        UUID requestId = event.getRequestID();
-        String vnfName = event.getAAI().get("generic-vnf.vnf-name");
-        String vnfId = event.getAAI().get("generic-vnf.vnf-id");
+        UUID requestId = event.getRequestId();
+        String vnfName = event.getAai().get("generic-vnf.vnf-name");
+        String vnfId = event.getAai().get("generic-vnf.vnf-id");
         String aaiUrl = PolicyEngine.manager.getEnvironmentProperty("aai.url");
         String aaiUsername = PolicyEngine.manager.getEnvironmentProperty("aai.username");
         String aaiPassword = PolicyEngine.manager.getEnvironmentProperty("aai.password");
diff --git a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
index 8c0ab22eb..86b0aeef7 100644
--- a/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/test/java/org/onap/policy/controlloop/actor/vfc/TestVFCActorServiceProvider.java
@@ -68,7 +68,7 @@ public class TestVFCActorServiceProvider {
 
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
-        onset.getAAI().put("generic-vnf.vnf-id", "dorothy.gale.1939");
+        onset.getAai().put("generic-vnf.vnf-id", "dorothy.gale.1939");
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
         PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
@@ -77,17 +77,17 @@ public class TestVFCActorServiceProvider {
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
         UUID requestId = UUID.randomUUID();
-        onset.setRequestID(requestId);
+        onset.setRequestId(requestId);
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
-        onset.getAAI().put("generic-vnf.vnf-name", "Dorothy");
+        onset.getAai().put("generic-vnf.vnf-name", "Dorothy");
         PolicyEngine.manager.getEnvironment().remove("aai.password");
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
         PolicyEngine.manager.setEnvironmentProperty("aai.password", "AAI");
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
-        onset.getAAI().put("service-instance.service-instance-id", "");
+        onset.getAai().put("service-instance.service-instance-id", "");
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, null));
 
         assertNull(VFCActorServiceProvider.constructRequest(onset, operation, policy, new AaiGetVnfResponse()));