Fix Sonar issues in apex-pdp