Dependency injection refactoring for InvoiceMapper and Invoice2PdfBox