SONARJAVA-299 Better handle primitive and generics