again aligning with latest breaking spring-core api changes