Replace "diamond" notation to support JDK level 6 also