LPS-51555 don't use deprecated methods
LPS-51555 don't use raw type
LPS-51555 remove unused method
LPS-51555 use Java 7 multiple catch and diamond
hugo is going to apply new syntax all at once with SF, revert "LPS-51555 use Java 7 multiple catch and diamond"

This reverts commit afc2139288a24ed0eb8f61a9bf41c280fbb3b054.