Following issues are covered with this JIRA:
1. Explicit collection type arguments can be replaced with diamond notation to shorten the code and to make it more readable.
2. Empty collection methods should be refactored using java 11 factory methods where appropriate.
3. Anonymous types should be replaced with lambdas or method references where appropriate.