refractor HqlBuilder