[CXF-5847]:Refactor the code;Fix typo