Add new factory overloads.

Source/MQTTnet/Client/IMqttClientFactory.cs

@@ -1,5 +1,7 @@
-using MQTTnet.Adapter;
+using System;
+using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
+using MQTTnet.LowLevelClient;
 
 namespace MQTTnet.Client
 {
@@ -7,6 +9,14 @@ namespace MQTTnet.Client
     {
         IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory);
 
+        ILowLevelMqttClient CreateLowLevelMqttClient();
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger);
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttClientAdapterFactory clientAdapterFactory);
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory);
+
         IMqttClient CreateMqttClient();
 
         IMqttClient CreateMqttClient(IMqttNetLogger logger);

Source/MQTTnet/IMqttFactory.cs

@@ -1,4 +1,5 @@
-using MQTTnet.Client;
+using System.Collections.Generic;
+using MQTTnet.Client;
 using MQTTnet.Diagnostics;
 using MQTTnet.Server;
 
@@ -7,5 +8,7 @@ namespace MQTTnet
     public interface IMqttFactory : IMqttClientFactory, IMqttServerFactory
     {
         IMqttNetLogger DefaultLogger { get; }
+
+        IDictionary<object, object> Properties { get; }
     }
 }

Source/MQTTnet/Internal/AsyncLock.cs

@@ -5,10 +5,10 @@ using System.Threading.Tasks;
 namespace MQTTnet.Internal
 {
     // From Stephen Toub (https://blogs.msdn.microsoft.com/pfxteam/2012/02/12/building-async-coordination-primitives-part-6-asynclock/)
-    public class AsyncLock : IDisposable
+    public sealed class AsyncLock : IDisposable
     {
-        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private readonly Task<IDisposable> _releaser;
+        readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+        readonly Task<IDisposable> _releaser;
 
         public AsyncLock()
         {
@@ -39,9 +39,9 @@ namespace MQTTnet.Internal
             _semaphore?.Dispose();
         }
 
-        private class Releaser : IDisposable
+        class Releaser : IDisposable
         {
-            private readonly AsyncLock _toRelease;
+            readonly AsyncLock _toRelease;
 
             internal Releaser(AsyncLock toRelease)
             {

Source/MQTTnet/MqttFactory.cs

@@ -6,6 +6,7 @@ using MQTTnet.LowLevelClient;
 using MQTTnet.Server;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MQTTnet
 {
@@ -25,6 +26,13 @@ namespace MQTTnet
 
         public IMqttNetLogger DefaultLogger { get; }
 
+        public IList<Func<IMqttFactory, IMqttServerAdapter>> DefaultServerAdapters { get; } = new List<Func<IMqttFactory, IMqttServerAdapter>>
+        {
+            factory => new MqttTcpServerAdapter(factory.DefaultLogger)
+        };
+
+        public IDictionary<object, object> Properties { get; } = new Dictionary<object, object>();
+
         public IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory)
         {
             _clientAdapterFactory = clientAdapterFactory ?? throw new ArgumentNullException(nameof(clientAdapterFactory));
@@ -50,10 +58,10 @@ namespace MQTTnet
             return new LowLevelMqttClient(_clientAdapterFactory, DefaultLogger);
         }
 
-        public ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactoryy)
+        public ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory)
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
-            if (clientAdapterFactoryy == null) throw new ArgumentNullException(nameof(clientAdapterFactoryy));
+            if (clientAdapterFactory == null) throw new ArgumentNullException(nameof(clientAdapterFactory));
 
             return new LowLevelMqttClient(_clientAdapterFactory, logger);
         }
@@ -94,7 +102,8 @@ namespace MQTTnet
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger) }, logger);
+            var serverAdapters = DefaultServerAdapters.Select(a => a.Invoke(this));
+            return CreateMqttServer(serverAdapters, logger);
         }
 
         public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters, IMqttNetLogger logger)

Source/MQTTnet/Server/IMqttServerFactory.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 
@@ -6,6 +7,8 @@ namespace MQTTnet.Server
 {
     public interface IMqttServerFactory
     {
+        IList<Func<IMqttFactory, IMqttServerAdapter>> DefaultServerAdapters { get; }
+
         IMqttServer CreateMqttServer();
 
         IMqttServer CreateMqttServer(IMqttNetLogger logger);