Fix remaining checkstyle

Lots of formatting, missing javadoc, distance from use,
imports must be explicit, ordering of methods.

Fixed some abbreviation problems in classes and renamed
JUnit tests to fix this.

Issue-ID: POLICY-883
Change-Id: I8494f63d88d63c0232aca97f7bcc848816228fb1
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

2 files changed, 16 insertions, 16 deletions

diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributes.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributes.java
index 5e69d6435..ab1d04efa 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributes.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlRequestAttributes.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * guard
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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.
@@ -31,20 +31,20 @@ public class PolicyGuardXacmlRequestAttributes {
     /**
      * Construct an instance.
      * 
-     * @param clnameID the control loop Id
-     * @param actorID the actor Id
-     * @param operationID the operation Id
-     * @param targetID the target Id
-     * @param requestID the request Id
+     * @param clnameId the control loop Id
+     * @param actorId the actor Id
+     * @param operationId the operation Id
+     * @param targetId the target Id
+     * @param requestId the request Id
      */
-    public PolicyGuardXacmlRequestAttributes(String clnameID, String actorID, String operationID, String targetID,
-            String requestID) {
+    public PolicyGuardXacmlRequestAttributes(String clnameId, String actorId, String operationId, String targetId,
+            String requestId) {
         super();
-        this.clnameID = clnameID;
-        this.actorID = actorID;
-        this.operationID = operationID;
-        this.targetID = targetID;
-        this.requestID = requestID;
+        this.clnameID = clnameId;
+        this.actorID = actorId;
+        this.operationID = operationId;
+        this.targetID = targetId;
+        this.requestID = requestId;
     }
 
     @Override
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PNFTargetLock.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PNFTargetLock.java
index 06bd9fb89..904448591 100644
--- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PNFTargetLock.java
+++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/impl/PNFTargetLock.java
@@ -42,14 +42,14 @@ public class PNFTargetLock implements TargetLock, Serializable {
      * 
      * @param type the target type
      * @param target the target
-     * @param requestID the request Id
+     * @param requestId the request Id
      * @param callback the callback
      */
-    public PNFTargetLock(TargetType type, String target, UUID requestID, LockCallback callback) {
+    public PNFTargetLock(TargetType type, String target, UUID requestId, LockCallback callback) {
         this.lockId = UUID.randomUUID();
         this.targetType = type;
         this.target = target;
-        this.requestId = requestID;
+        this.requestId = requestId;
         this.callback = callback;
     }