Rest annotation refactoring