Refactoring and spring data integration, incomplete