Fixing sonar issues in xacml-pdp