Refactoring: Moved query validation from Mapper into its own class
Refactoring: Fixed checkstyle
Added tests for QueryValidator - not fully extensive but better than nothing.
Fixed Checkstyle.