before code merge

(controller, xml mapper)