Fix for GRAILS-9997: replace generics placeholders with parameter types