Remove guard checkstyle suppressions

Renamed a number of fields and methods, in the Guard classes,
to conform to camel-case format.
Also updated some toString() methods to return "xxxId=" instead
of "xxxID=", if the corresponding field names were also xxxId.
Updated license data in one changed file.

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

2 files changed, 8 insertions, 8 deletions

diff --git a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/CallGuardTaskEmbedded.java b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/CallGuardTaskEmbedded.java
index c75c8a0b7..1c4cada61 100644
--- a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/CallGuardTaskEmbedded.java
+++ b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/CallGuardTaskEmbedded.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * guard
  * ================================================================================
- * 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.
@@ -153,7 +153,7 @@ public class CallGuardTaskEmbedded implements Runnable {
         //
         if ("Indeterminate".equals(guardResponse.getResult())) {
             guardResponse.setOperation(recipe);
-            guardResponse.setRequestID(UUID.fromString(requestId));
+            guardResponse.setRequestId(UUID.fromString(requestId));
         }
 
         long estimatedTime = System.nanoTime() - startTime;
diff --git a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
index 64fb70bbd..1e9f3371b 100644
--- a/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
+++ b/controlloop/templates/template.demo.clc/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelperEmbedded.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * guard
  * ================================================================================
- * 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.
@@ -107,11 +107,11 @@ public class PolicyGuardXacmlHelperEmbedded {
         // Build the json request
         //
         JSONObject attributes = new JSONObject();
-        attributes.put("actor", xacmlReq.getActorID());
-        attributes.put("recipe", xacmlReq.getOperationID());
-        attributes.put("target", xacmlReq.getTargetID());
-        if (xacmlReq.getClnameID() != null) {
-            attributes.put("clname", xacmlReq.getClnameID());
+        attributes.put("actor", xacmlReq.getActorId());
+        attributes.put("recipe", xacmlReq.getOperationId());
+        attributes.put("target", xacmlReq.getTargetId());
+        if (xacmlReq.getClnameId() != null) {
+            attributes.put("clname", xacmlReq.getClnameId());
         }
         if (xacmlReq.getVfCount() != null) {
             attributes.put("vfCount", xacmlReq.getVfCount());