replacing jdto with mapstruct