Spring-Data samples refactoring