aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-11-01 06:55:23 +0000
committerliamfallon <liam.fallon@est.tech>2019-11-01 07:01:20 +0000
commit0d4259eba2c747b2657ea9755f0f39827c8cb437 (patch)
tree2da25fda7a874f1c769796ba26e533ff7704727e
parentdc1773e466f12dab993d1241a1a0b7ce36695713 (diff)
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>
-rw-r--r--models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopTargetTypeTest.java1
-rw-r--r--models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/compiler/ControlLoopCompiler.java5
-rw-r--r--models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/ControlLoopPolicyBuilder.java4
-rw-r--r--models-interactions/model-yaml/src/main/java/org/onap/policy/controlloop/policy/builder/impl/ControlLoopPolicyBuilderImpl.java6
-rw-r--r--models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java2
-rw-r--r--models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java12
6 files changed, 11 insertions, 19 deletions
diff --git a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopTargetTypeTest.java b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopTargetTypeTest.java
index 3434a591b..daf6bb814 100644
--- a/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopTargetTypeTest.java
+++ b/models-interactions/model-impl/events/src/test/java/org/onap/policy/controlloop/ControlLoopTargetTypeTest.java
@@ -22,7 +22,6 @@
package org.onap.policy.controlloop;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
import org.junit.Test;
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");
}
diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
index f68b9d39e..6fc3e1acb 100644
--- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
+++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/compiler/ControlLoopCompilerTest.java
@@ -37,8 +37,6 @@ import org.onap.policy.controlloop.policy.ControlLoopPolicy;
import org.onap.policy.controlloop.policy.FinalResult;
public class ControlLoopCompilerTest {
-
- private static final String POLICY_RECIPE_IS_INVALID = "Policy recipe is invalid";
private static final String RESTART_UNKNOWN_POLICY =
"Operation Policy unique-policy-id-1-restart is connected to unknown policy unknown-policy";
@Rule
diff --git a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
index 5182da560..3236bca3f 100644
--- a/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
+++ b/models-interactions/model-yaml/src/test/java/org/onap/policy/controlloop/policy/ControlLoopPolicyBuilderTest.java
@@ -244,7 +244,7 @@ public class ControlLoopPolicyBuilderTest {
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400, pnf);
assertEquals(pnf, builder.getControlLoop().getPnf());
- builder.removePNF();
+ builder.removePnf();
assertNull(builder.getControlLoop().getPnf());
}
@@ -258,10 +258,10 @@ public class ControlLoopPolicyBuilderTest {
Pnf pnf = new Pnf();
pnf.setPnfType(PnfType.ENODEB);
- builder.setPNF(pnf);
+ builder.setPnf(pnf);
assertEquals(pnf, builder.getControlLoop().getPnf());
- builder.removePNF();
+ builder.removePnf();
assertNull(builder.getControlLoop().getPnf());
}
@@ -271,7 +271,7 @@ public class ControlLoopPolicyBuilderTest {
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
expectedException.expect(BuilderException.class);
expectedException.expectMessage("PNF must not be null");
- builder.setPNF(null);
+ builder.setPnf(null);
}
@Test
@@ -280,7 +280,7 @@ public class ControlLoopPolicyBuilderTest {
ControlLoopPolicyBuilder.Factory.buildControlLoop(UUID.randomUUID().toString(), 2400);
expectedException.expect(BuilderException.class);
expectedException.expectMessage("Invalid PNF - need either pnfName or pnfType");
- builder.setPNF(new Pnf());
+ builder.setPnf(new Pnf());
}
@Test
@@ -862,7 +862,7 @@ public class ControlLoopPolicyBuilderTest {
// Set pnf
//
if (policyTobuild.getControlLoop().getPnf() != null) {
- builder = builder.setPNF(policyTobuild.getControlLoop().getPnf());
+ builder = builder.setPnf(policyTobuild.getControlLoop().getPnf());
}
//
// Add the policies and be sure to set the trigger policy