CLDIDE-1589: make factory validation refactoring