convert to spring 4.0