SWITCHYARD-1843 - Fix for annotation processing issue in validator