remove java7 generics
Revert "remove java7 generics"

This reverts commit e3c594b1529994a4236eb5566c5e99a55aeb1570.