Fix Checkstyle issues in policy-models

Some minor checkstyle issues were introduced into policy-models by
recent reviews.

Issue-ID: POLICY-2088
Change-Id: I84af19926432081d72e2054af788cdc35850a99c
Signed-off-by: liamfallon <liam.fallon@est.tech>

3 files changed, 5 insertions, 10 deletions

diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
index e680969b2..e726576db 100644
--- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
+++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java
@@ -21,14 +21,9 @@
 
 package org.onap.policy.controlloop.compiler;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
 import java.io.InputStream;
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.commons.lang3.StringUtils;
diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
index 9c0188c1f..280c13ec1 100644
--- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
+++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java
@@ -91,7 +91,7 @@ public interface ControlLoopPolicyBuilder {
      * @return builder object
      * @throws BuilderException builder exception
      */
-    public ControlLoopPolicyBuilder setPNF(Pnf pnf) throws BuilderException;
+    public ControlLoopPolicyBuilder setPnf(Pnf pnf) throws BuilderException;
 
     /**
      * Remove PNF.
@@ -99,7 +99,7 @@ public interface ControlLoopPolicyBuilder {
      * @return the object
      * @throws BuilderException builder exception
      */
-    public ControlLoopPolicyBuilder removePNF() throws BuilderException;
+    public ControlLoopPolicyBuilder removePnf() throws BuilderException;
 
     /**
      * Set the abatement.
diff --git a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
index ed6a54c1e..30eaf1bf2 100644
--- a/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
+++ b/models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java
@@ -85,7 +85,7 @@ public class ControlLoopPolicyBuilderImpl implements ControlLoopPolicyBuilder {
 
     public ControlLoopPolicyBuilderImpl(String controlLoopName, Integer timeout, Pnf pnf) throws BuilderException {
         this(controlLoopName, timeout);
-        this.setPNF(pnf);
+        this.setPnf(pnf);
     }
 
     /**
@@ -105,7 +105,7 @@ public class ControlLoopPolicyBuilderImpl implements ControlLoopPolicyBuilder {
     }
 
     @Override
-    public ControlLoopPolicyBuilder removePNF() throws BuilderException {
+    public ControlLoopPolicyBuilder removePnf() throws BuilderException {
         controlLoopPolicy.getControlLoop().setPnf(null);
         return this;
     }
@@ -172,7 +172,7 @@ public class ControlLoopPolicyBuilderImpl implements ControlLoopPolicyBuilder {
     }
 
     @Override
-    public ControlLoopPolicyBuilder setPNF(Pnf pnf) throws BuilderException {
+    public ControlLoopPolicyBuilder setPnf(Pnf pnf) throws BuilderException {
         if (pnf == null) {
             throw new BuilderException("PNF must not be null");
         }