Java diamond operator migration