Java refactor entitylists