Rafael Winterhalter as for the checkstyle issues, your best bet is to use the formatter we provide at https://github.com/hibernate/hibernate-ide-codestyles.