Refactor Page wrapper for Spring Data JPA