refactor query DSL class