JaxB Adapter refactoring