querydsl related refactoring.