Clean up sonar issues identified for apex-pdp
https://sonarcloud.io/dashboard?id=onap_policy-apex-pdp