Get rid of raw types which cause unnecessary warnings
Merge pull request #2679 from soc/topic/java-rawtype-cleanup

Get rid of raw types which cause unnecessary warnings