Clean up generics warnings in spring-oxm tests