Remove unused imports. Use more explicit lambda parameter naming. Also, adopt tests to changed Spring Data Relational SQL generation. Original pull request: #690. See #689