Fix new sonars in xacml-pdp