spring social refactoring