From 6fac1cd96a6d3a105edce80fde96419150fa01ac Mon Sep 17 00:00:00 2001 From: TekH Date: Thu, 26 Feb 2026 17:24:13 +0100 Subject: [PATCH] Refactor PDFMerger for DI and remove BaseClass inheritance PDFMerger now uses dependency injection for LicenseManager and AnnotationManager, improving modularity and testability. Removed inheritance from BaseClass and cleaned up unused usings. --- .../Jobs/FinalizeDocument/PDFMerger.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs index b2f1556a..bc6cdcd1 100644 --- a/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs +++ b/EnvelopeGenerator.ServiceHost/Jobs/FinalizeDocument/PDFMerger.cs @@ -1,12 +1,10 @@ -using System.IO; -using DigitalData.Modules.Base; -using DigitalData.Modules.Logging; using EnvelopeGenerator.ServiceHost.Exceptions; using GdPicture14; +using Microsoft.Extensions.Options; namespace EnvelopeGenerator.ServiceHost.Jobs.FinalizeDocument; -public class PDFMerger : BaseClass +public class PDFMerger { private readonly AnnotationManager _manager; private readonly LicenseManager _licenseManager; @@ -16,12 +14,10 @@ public class PDFMerger : BaseClass private readonly PdfConversionConformance _pdfaConformanceLevel = PdfConversionConformance.PDF_A_1b; - public PDFMerger(LogConfig logConfig, string gdPictureLicenseKey) : base(logConfig) + public PDFMerger(LicenseManager licenseManager, AnnotationManager annotationManager) { - _licenseManager = new LicenseManager(); - _licenseManager.RegisterKEY(gdPictureLicenseKey); - - _manager = new AnnotationManager(); + _licenseManager = licenseManager; + _manager = annotationManager; } public byte[] MergeDocuments(byte[] document, byte[] report) @@ -62,4 +58,4 @@ public class PDFMerger : BaseClass return finalStream.ToArray(); } -} +} \ No newline at end of file