JBIDE-16324 - Refactor Arquillian validator