- use lib.xml

Lib.Driver/DriverLoader.cs

@@ -2,11 +2,10 @@
 // Created: 2021-04-09
 // Copyright(c) 2021 SimonG. All Rights Reserved.
 
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
 using Lib.Driver.Interfaces;
 using Lib.Driver.Xml;
+using Lib.Xml;
+using Lib.Xml.Interfaces;
 
 namespace Lib.Driver
 {
@@ -14,12 +13,10 @@ namespace Lib.Driver
     {
         public const string DRIVER_FILE_EXTENSION = "myd";
 
-        public IDriver? Load(string driverPath)
-        {
-            XmlReader xmlReader = XmlReader.Create(File.OpenRead(driverPath));
-            XmlSerializer xmlSerializer = new(typeof(XmlDriver));
+        private readonly IXmlReader<XmlDriver> _xmlReader;
 
-            return (XmlDriver?) xmlSerializer.Deserialize(xmlReader);
-        }
+        public DriverLoader() => _xmlReader = new XmlReader<XmlDriver>();
+
+        public IDriver Load(string driverPath) => _xmlReader.Read(driverPath);
     }
 }

Lib.Driver/Interfaces/IDriverLoader.cs

@@ -6,6 +6,6 @@ namespace Lib.Driver.Interfaces
 {
     public interface IDriverLoader
     {
-        IDriver? Load(string driverPath);
+        IDriver Load(string driverPath);
     }
 }

Lib.Driver/Lib.Driver.csproj

@@ -7,6 +7,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Lib.Logging\Lib.Logging.csproj" />
+      <ProjectReference Include="..\Lib.Xml\Lib.Xml.csproj" />
     </ItemGroup>
 
 </Project>