From df51f5f057f813a1f6873c3208bf002e56e22d86 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 29 Apr 2019 12:33:16 -0400 Subject: Address sonar issue in policy-models/pdp Extracted a common constant. Change-Id: I24504109e9c7bbed352fa3e845d7d3f7b07db970 Issue-ID: POLICY-1708 Signed-off-by: Jim Hahn --- .../main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'models-pdp') diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java index 8cad58c13..4e7fc4117 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpGroup.java @@ -46,6 +46,8 @@ import org.onap.policy.models.pdp.enums.PdpState; @Data @NoArgsConstructor public class PdpGroup implements PfNameVersion, Comparable { + private static final String SUBGROUP_FIELD = "pdpSubgroups"; + private String name; private String description; private PdpState pdpGroupState; @@ -88,10 +90,10 @@ public class PdpGroup implements PfNameVersion, Comparable { */ result.validateNotNull("name", name); - result.validateNotNullList("pdpSubgroups", pdpSubgroups, PdpSubGroup::validatePapRest); + result.validateNotNullList(SUBGROUP_FIELD, pdpSubgroups, PdpSubGroup::validatePapRest); if (pdpSubgroups != null && pdpSubgroups.isEmpty()) { - result.addResult(new ObjectValidationResult("pdpSubgroups", pdpSubgroups, ValidationStatus.INVALID, + result.addResult(new ObjectValidationResult(SUBGROUP_FIELD, pdpSubgroups, ValidationStatus.INVALID, "is empty")); } @@ -117,7 +119,7 @@ public class PdpGroup implements PfNameVersion, Comparable { } // different sizes implies duplicates - result.addResult(new ObjectValidationResult("pdpSubgroups", pdpTypes, ValidationStatus.INVALID, + result.addResult(new ObjectValidationResult(SUBGROUP_FIELD, pdpTypes, ValidationStatus.INVALID, "duplicate subgroups")); } -- cgit 1.2.3-korg