Make use of improved diamond operator

Java 8 is more liberal in the use of the diamon operator.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Karsten Schwank <karsten.schwank@desy.de>
Patch: https://rb.dcache.org/r/7560/