From 8672dbc24a711798a9ac3098b24ac135e656f08e Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 18 Jun 2021 13:57:03 -0400 Subject: [PATCH] Fix new checkstyle issues in pap The new version of checkstyle identified new issues. Fixed those. Issue-ID: POLICY-3287 Change-Id: I18a34cbc6197266375981031106acc38385c69b5 Signed-off-by: Jim Hahn --- .../onap/policy/pap/main/rest/PdpGroupCreateOrUpdateProvider.java | 2 +- .../java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java | 5 ++--- .../org/onap/policy/pap/main/rest/TestPdpGroupDeployProvider.java | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupCreateOrUpdateProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupCreateOrUpdateProvider.java index 7fa50484..8be787a0 100644 --- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupCreateOrUpdateProvider.java +++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupCreateOrUpdateProvider.java @@ -424,7 +424,7 @@ public class PdpGroupCreateOrUpdateProvider extends ProviderBase { * * @param data session data * @param subgrp the subgroup to be validated - * @param result the validation result + * @return the validation result * @throws PfModelException if an error occurred */ private ValidationResult validateSupportedTypes(SessionData data, PdpSubGroup subgrp) throws PfModelException { diff --git a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java index 1f97551b..75affaf3 100644 --- a/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java +++ b/main/src/main/java/org/onap/policy/pap/main/rest/PdpGroupDeployProvider.java @@ -311,7 +311,7 @@ public class PdpGroupDeployProvider extends ProviderBase { * @param dbsub subgroup from the DB, or {@code null} if this is a new subgroup * @param subgrp the subgroup whose policies are to be validated, updated to fully * qualified versions upon return - * @param result the validation result + * @return the validation result * @throws PfModelException if an error occurred */ private ValidationResult validatePolicies(SessionData data, PdpSubGroup dbsub, DeploymentSubGroup subgrp) @@ -405,8 +405,7 @@ public class PdpGroupDeployProvider extends ProviderBase { * the actual work. * * @param data session data - * @param extPolicies external PDP policies - * @return a list of requests that should be sent to configure the PDPs + * @param policies external PDP policies * @throws PfModelException if an error occurred */ private void deploySimplePolicies(SessionData data, PdpDeployPolicies policies) throws PfModelException { diff --git a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployProvider.java b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployProvider.java index 0db8e3ce..9edba58b 100644 --- a/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployProvider.java +++ b/main/src/test/java/org/onap/policy/pap/main/rest/TestPdpGroupDeployProvider.java @@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -- 2.16.6