diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-09-30 10:47:12 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-09-30 10:59:45 -0400 |
| commit | 61dafe1cb86e4f82b2062d56bbc343df19c31c5f (patch) | |
| tree | 2caa753a7298175f95711a870f56b6befdee1481 /main/src/main | |
| parent | 71555aaa4387098616a404bf193e7bb6936e3f76 (diff) | |
Fix new sonars in policy/pap
Addressed the following sonar issues:
- too many assertions in test method
- extract common test method
- replace this null literal by an "Optional" object
Issue-ID: POLICY-2679
Change-Id: Ie80e5c5fdb94230a2773ea2931758cf54204ae86
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'main/src/main')
| -rw-r--r-- | main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java b/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java index 674a07fd..d7ee15bd 100644 --- a/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java +++ b/main/src/main/java/org/onap/policy/pap/main/comm/PdpStatusMessageHandler.java @@ -158,18 +158,15 @@ public class PdpStatusMessageHandler extends PdpMessageGenerator { private void handlePdpHeartbeat(final PdpStatus message, final PolicyModelsProvider databaseProvider) throws PfModelException { - Optional<PdpSubGroup> pdpSubgroup = null; - Optional<Pdp> pdpInstance = null; - PdpGroup pdpGroup = null; final PdpGroupFilter filter = PdpGroupFilter.builder().name(message.getPdpGroup()).groupState(PdpState.ACTIVE).build(); final List<PdpGroup> pdpGroups = databaseProvider.getFilteredPdpGroups(filter); if (!pdpGroups.isEmpty()) { - pdpGroup = pdpGroups.get(0); - pdpSubgroup = findPdpSubGroup(message, pdpGroup); + PdpGroup pdpGroup = pdpGroups.get(0); + Optional<PdpSubGroup> pdpSubgroup = findPdpSubGroup(message, pdpGroup); if (pdpSubgroup.isPresent()) { - pdpInstance = findPdpInstance(message, pdpSubgroup.get()); + Optional<Pdp> pdpInstance = findPdpInstance(message, pdpSubgroup.get()); if (pdpInstance.isPresent()) { processPdpDetails(message, pdpSubgroup.get(), pdpInstance.get(), pdpGroup, databaseProvider); } else { |