[JAVA7 Upgrade] Replace explicit type with <>