Use diamond operator

[marschall]

Java 7 introduces the "diamond operator" that makes code with generics less verbose. The code base claims to be Java 8 but does not seem to make use of the diamond operator.