spring checkstyle fixes
enum values per line
added todo for handshake
Merge pull request #2772 from mesutcelik/springfix

spring checkstyle fixes