spring checkstyle fixes