[Trinidad-2494] Switch plugin code to use generics
35 files changed