Refactor beanUtil