Fix issues in xacml-pdp for new sonar rules