Fixing sonar vulnerabilities in apex-pdp