Replace ad-hoc Validator class with Java Predicate (#1034)

4 files changed