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, 5 insertions, 5 deletions

diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index 231b8fae5..820910e9b 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -171,7 +171,7 @@ public class SOActorServiceProvider implements Actor {
 
         // Construct SO Request
         SORequest request = new SORequest();
-        request.setRequestId(onset.getRequestID());
+        request.setRequestId(onset.getRequestId());
         request.setRequestDetails(new SORequestDetails());
         request.getRequestDetails().setModelInfo(new SOModelInfo());
         request.getRequestDetails().setCloudConfiguration(new SOCloudConfiguration());
@@ -325,7 +325,7 @@ public class SOActorServiceProvider implements Actor {
         Map<String, Map<String, String>> aaiNqInstanceFilterMap = new HashMap<>();
         Map<String, String> aaiNqInstanceFilterMapItem = new HashMap<>();
         // TO DO: get vserver.vname from dcae onset.AAI.get("vserver.vserver-name")
-        aaiNqInstanceFilterMapItem.put("vserver-name", onset.getAAI().get("vserver.vserver-name"));
+        aaiNqInstanceFilterMapItem.put("vserver-name", onset.getAai().get("vserver.vserver-name"));
         aaiNqInstanceFilterMap.put("vserver", aaiNqInstanceFilterMapItem);
         aaiNqInstanceFilter.getInstanceFilter().add(aaiNqInstanceFilterMap);
         aaiNqRequest.setInstanceFilters(aaiNqInstanceFilter);
@@ -336,7 +336,7 @@ public class SOActorServiceProvider implements Actor {
 
         AaiNqResponse aaiNqResponse = new AaiManager(new RESTManager()).postQuery(getPeManagerEnvProperty("aai.url"),
                 getPeManagerEnvProperty("aai.username"), getPeManagerEnvProperty("aai.password"), aaiNqRequest,
-                onset.getRequestID());
+                onset.getRequestId());
 
         // Check AAI response
         if (aaiNqResponse == null) {
@@ -345,7 +345,7 @@ public class SOActorServiceProvider implements Actor {
         }
 
         // Create AAINQResponseWrapper
-        AaiNqResponseWrapper aaiNqResponseWrapper = new AaiNqResponseWrapper(onset.getRequestID(), aaiNqResponse);
+        AaiNqResponseWrapper aaiNqResponseWrapper = new AaiNqResponseWrapper(onset.getRequestId(), aaiNqResponse);
 
         if (logger.isDebugEnabled()) {
             logger.debug("AAI Named Query Response: ");
diff --git a/controlloop/common/actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/TestSOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/TestSOActorServiceProvider.java
index 108962c22..0ef7c9f32 100644
--- a/controlloop/common/actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/TestSOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/TestSOActorServiceProvider.java
@@ -66,7 +66,7 @@ public class TestSOActorServiceProvider {
         final ControlLoopOperation operation = new ControlLoopOperation();
 
         final UUID requestId = UUID.randomUUID();
-        onset.setRequestID(requestId);
+        onset.setRequestId(requestId);
 
         PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
         PolicyEngine.manager.setEnvironmentProperty("aai.username", "AAI");