From 1b46e561fba5bac14c510c5f6cf74690197f8022 Mon Sep 17 00:00:00 2001
From: Fati Iseni <fati.iseni@pozitrongroup.com>
Date: Sun, 21 Feb 2021 02:25:03 +0100
Subject: [PATCH 1/2] Added factory builder.

---
 src/Device.Net/FactoryBuilder.cs              | 35 +++++++++
 src/Device.Net/IFactoryBuilder.cs             | 12 ++++
 .../WindowsHidDeviceFactoryExtensions.cs      | 72 +++++++++++++++++++
 3 files changed, 119 insertions(+)
 create mode 100644 src/Device.Net/FactoryBuilder.cs
 create mode 100644 src/Device.Net/IFactoryBuilder.cs

diff --git a/src/Device.Net/FactoryBuilder.cs b/src/Device.Net/FactoryBuilder.cs
new file mode 100644
index 00000000..a6845f4b
--- /dev/null
+++ b/src/Device.Net/FactoryBuilder.cs
@@ -0,0 +1,35 @@
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Device.Net
+{
+    public class FactoryBuilder : IFactoryBuilder
+    {
+        public ILoggerFactory LoggerFactory { get; }
+        public ReadOnlyCollection<IDeviceFactory> Factories { get; }
+
+        public FactoryBuilder(ILoggerFactory loggerFactory = null) => LoggerFactory = loggerFactory;
+
+        public FactoryBuilder(IDeviceFactory deviceFactory, ILoggerFactory loggerFactory = null)
+            : this(loggerFactory)
+        {
+            if (deviceFactory != null)
+            {
+                Factories = new ReadOnlyCollection<IDeviceFactory>(new IDeviceFactory[] { deviceFactory });
+            }
+        }
+
+        public FactoryBuilder(IList<IDeviceFactory> deviceFactories, ILoggerFactory loggerFactory = null)
+            : this(loggerFactory)
+        {
+            if (deviceFactories != null)
+            {
+                Factories = new ReadOnlyCollection<IDeviceFactory>(deviceFactories);
+            }
+        }
+
+        public IDeviceFactory Build() => Factories.Aggregate();
+
+    }
+}
diff --git a/src/Device.Net/IFactoryBuilder.cs b/src/Device.Net/IFactoryBuilder.cs
new file mode 100644
index 00000000..fdc25ede
--- /dev/null
+++ b/src/Device.Net/IFactoryBuilder.cs
@@ -0,0 +1,12 @@
+using Microsoft.Extensions.Logging;
+using System.Collections.ObjectModel;
+
+namespace Device.Net
+{
+    public interface IFactoryBuilder
+    {
+        ILoggerFactory LoggerFactory { get; }
+        ReadOnlyCollection<IDeviceFactory> Factories { get; }
+        IDeviceFactory Build();
+    }
+}
diff --git a/src/Hid.Net/Windows/WindowsHidDeviceFactoryExtensions.cs b/src/Hid.Net/Windows/WindowsHidDeviceFactoryExtensions.cs
index 1d1a294e..6a9a5094 100644
--- a/src/Hid.Net/Windows/WindowsHidDeviceFactoryExtensions.cs
+++ b/src/Hid.Net/Windows/WindowsHidDeviceFactoryExtensions.cs
@@ -18,6 +18,78 @@ public static class WindowsHidDeviceFactoryExtensions
     {
         #region Public Methods
 
+        public static IFactoryBuilder CreateWindowsHidDeviceFactory(
+        this IFactoryBuilder builder,
+        FilterDeviceDefinition filterDeviceDefinition,
+        IHidApiService hidApiService = null,
+        Guid? classGuid = null,
+        ushort? readBufferSize = null,
+        ushort? writeBufferSize = null,
+        GetConnectedDeviceDefinitionsAsync getConnectedDeviceDefinitionsAsync = null,
+        Func<Report, TransferResult> readReportTransform = null,
+        Func<TransferResult, Report> readTransferTransform = null,
+        Func<byte[], byte, byte[]> writeTransferTransform = null,
+        WriteReportTransform writeReportTransform = null)
+        {
+            _ = builder ?? throw new ArgumentNullException(nameof(builder));
+
+            var factories = new List<IDeviceFactory>(builder.Factories)
+            {
+                CreateWindowsHidDeviceFactory
+                (
+                new ReadOnlyCollection<FilterDeviceDefinition>(new List<FilterDeviceDefinition> { filterDeviceDefinition }),
+                builder.LoggerFactory,
+                hidApiService,
+                classGuid,
+                readBufferSize,
+                writeBufferSize,
+                getConnectedDeviceDefinitionsAsync,
+                readReportTransform,
+                readTransferTransform,
+                writeTransferTransform,
+                writeReportTransform
+                )
+            };
+
+            return new FactoryBuilder(factories, builder.LoggerFactory);
+        }
+
+        public static IFactoryBuilder CreateWindowsHidDeviceFactory(
+        this IFactoryBuilder builder,
+        FilterDeviceDefinition[] filterDeviceDefinitions,
+        IHidApiService hidApiService = null,
+        Guid? classGuid = null,
+        ushort? readBufferSize = null,
+        ushort? writeBufferSize = null,
+        GetConnectedDeviceDefinitionsAsync getConnectedDeviceDefinitionsAsync = null,
+        Func<Report, TransferResult> readReportTransform = null,
+        Func<TransferResult, Report> readTransferTransform = null,
+        Func<byte[], byte, byte[]> writeTransferTransform = null,
+        WriteReportTransform writeReportTransform = null)
+        {
+            _ = builder ?? throw new ArgumentNullException(nameof(builder));
+
+            var factories = new List<IDeviceFactory>(builder.Factories)
+            {
+                CreateWindowsHidDeviceFactory
+                (
+                new ReadOnlyCollection<FilterDeviceDefinition>(filterDeviceDefinitions),
+                builder.LoggerFactory,
+                hidApiService,
+                classGuid,
+                readBufferSize,
+                writeBufferSize,
+                getConnectedDeviceDefinitionsAsync,
+                readReportTransform,
+                readTransferTransform,
+                writeTransferTransform,
+                writeReportTransform
+                )
+            };
+
+            return new FactoryBuilder(factories, builder.LoggerFactory);
+        }
+
         /// <summary>
         /// Creates a <see cref="IDeviceFactory"/> for Windows Hid devices
         /// </summary>

From 95f9b16f89e9236b40cc4b74843cd36d46a30b66 Mon Sep 17 00:00:00 2001
From: Fati Iseni <fati.iseni@pozitrongroup.com>
Date: Sun, 21 Feb 2021 03:03:44 +0100
Subject: [PATCH 2/2] Updated FactoryBuilder.

---
 src/Device.Net/FactoryBuilder.cs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Device.Net/FactoryBuilder.cs b/src/Device.Net/FactoryBuilder.cs
index a6845f4b..de4db2a2 100644
--- a/src/Device.Net/FactoryBuilder.cs
+++ b/src/Device.Net/FactoryBuilder.cs
@@ -9,27 +9,28 @@ public class FactoryBuilder : IFactoryBuilder
         public ILoggerFactory LoggerFactory { get; }
         public ReadOnlyCollection<IDeviceFactory> Factories { get; }
 
-        public FactoryBuilder(ILoggerFactory loggerFactory = null) => LoggerFactory = loggerFactory;
+        public FactoryBuilder(ILoggerFactory loggerFactory = null)
+        {
+            LoggerFactory = loggerFactory;
+            Factories = new List<IDeviceFactory>().AsReadOnly();
+        }
 
         public FactoryBuilder(IDeviceFactory deviceFactory, ILoggerFactory loggerFactory = null)
-            : this(loggerFactory)
         {
-            if (deviceFactory != null)
-            {
-                Factories = new ReadOnlyCollection<IDeviceFactory>(new IDeviceFactory[] { deviceFactory });
-            }
+            LoggerFactory = loggerFactory;
+            Factories = deviceFactory == null
+                ? new List<IDeviceFactory>().AsReadOnly()
+                : new ReadOnlyCollection<IDeviceFactory>(new IDeviceFactory[] { deviceFactory });
         }
 
         public FactoryBuilder(IList<IDeviceFactory> deviceFactories, ILoggerFactory loggerFactory = null)
-            : this(loggerFactory)
         {
-            if (deviceFactories != null)
-            {
-                Factories = new ReadOnlyCollection<IDeviceFactory>(deviceFactories);
-            }
+            LoggerFactory = loggerFactory;
+            Factories = deviceFactories == null
+                ? new List<IDeviceFactory>().AsReadOnly()
+                : new ReadOnlyCollection<IDeviceFactory>(deviceFactories);
         }
 
         public IDeviceFactory Build() => Factories.Aggregate();
-
     }
 }