Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor

# Conflicts:
#	Build/MQTTnet.nuspec
#	Source/MQTTnet/Server/Internal/MqttClientSessionsManager.cs

Source/MQTTnet.AspnetCore/Client/MqttClientConnectionContextFactory.cs

@@ -1,15 +1,16 @@
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
-using MQTTnet.Client.Options;
 using MQTTnet.Formatter;
 using System;
 using System.Net;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.AspNetCore.Client
 {
     public class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
     {
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
 

Source/MQTTnet.AspnetCore/Extensions/ServiceCollectionExtensions.cs

@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
-using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Implementations;
 using MQTTnet.Server;
 

Source/MQTTnet.AspnetCore/MqttConnectionHandler.cs

@@ -4,6 +4,7 @@ using MQTTnet.Adapter;
 using MQTTnet.Server;
 using System;
 using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 
 namespace MQTTnet.AspNetCore
@@ -33,7 +34,7 @@ namespace MQTTnet.AspNetCore
             }
         }
 
-        public Task StartAsync(MqttServerOptions options)
+        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
         {
             return Task.CompletedTask;
         }

Source/MQTTnet.AspnetCore/MqttHostedServer.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
 using MQTTnet.Server;
 
 namespace MQTTnet.AspNetCore

Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -6,23 +6,19 @@ using MQTTnet.Server;
 using System;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.AspNetCore
 {
     public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
     {
-        readonly IMqttNetLogger _rootLogger;
-
-        public MqttWebSocketServerAdapter(IMqttNetLogger logger)
-        {
-            _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
+        IMqttNetLogger _logger = new MqttNetNullLogger();
+        
         public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
 
-        public Task StartAsync(MqttServerOptions options)
+        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
         {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             return Task.CompletedTask;
         }
 
@@ -49,7 +45,7 @@ namespace MQTTnet.AspNetCore
                     var formatter = new MqttPacketFormatterAdapter(writer);
                     var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection, clientCertificate);
 
-                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _rootLogger))
+                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _logger))
                     {
                         await clientHandler(channelAdapter).ConfigureAwait(false);
                     }

Source/MQTTnet.Extensions.ManagedClient/IManagedMqttClient.cs

@@ -1,10 +1,9 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client;
+using MQTTnet.Packets;
 
 namespace MQTTnet.Extensions.ManagedClient
 {

Source/MQTTnet.Extensions.ManagedClient/IManagedMqttClientOptions.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;
 
 namespace MQTTnet.Extensions.ManagedClient

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs

@@ -1,9 +1,4 @@
 using MQTTnet.Client;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
@@ -13,7 +8,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
+using MQTTnet.Packets;
 
 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -72,13 +68,7 @@ namespace MQTTnet.Extensions.ManagedClient
             get => InternalClient.DisconnectedHandler;
             set => InternalClient.DisconnectedHandler = value;
         }
-
-        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler
-        {
-            get => InternalClient.ApplicationMessageReceivedHandler;
-            set => InternalClient.ApplicationMessageReceivedHandler = value;
-        }
-
+        
         public event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync
         {
             add => InternalClient.ApplicationMessageReceivedAsync += value;

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientExtensions.cs

@@ -1,12 +1,10 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Protocol;
+using MQTTnet.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Client;
+using MQTTnet.Packets;
 
 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -75,42 +73,7 @@ namespace MQTTnet.Extensions.ManagedClient
             client.DisconnectedHandler = handler;
             return client;
         }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-            where TReceiver : IMqttApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            if (handler == null)
-            {
-                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Action<MqttApplicationMessageReceivedEventArgs> handler)
-            where TReceiver : IMqttApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            if (handler == null)
-            {
-                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, IMqttApplicationMessageReceivedHandler handler)
-            where TReceiver : IMqttApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            receiver.ApplicationMessageReceivedHandler = handler;
-            return receiver;
-        }
-
+        
         public static Task SubscribeAsync(this IManagedMqttClient client, params MqttTopicFilter[] topicFilters)
         {
             if (client == null) throw new ArgumentNullException(nameof(client));

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientOptions.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;
 
 namespace MQTTnet.Extensions.ManagedClient

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientOptionsBuilder.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;
 
 namespace MQTTnet.Extensions.ManagedClient

Source/MQTTnet.Extensions.ManagedClient/MqttFactoryExtensions.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.Extensions.ManagedClient
 {

Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs

@@ -7,7 +7,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client.Subscribing;
 using MQTTnet.Implementations;
 
 namespace MQTTnet.Extensions.Rpc
@@ -17,23 +16,13 @@ namespace MQTTnet.Extensions.Rpc
         readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
         readonly IMqttClient _mqttClient;
         readonly IMqttRpcClientOptions _options;
-        readonly RpcAwareApplicationMessageReceivedHandler _applicationMessageReceivedHandler;
-
-        [Obsolete("Use MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options).")]
-        public MqttRpcClient(IMqttClient mqttClient) : this(mqttClient, new MqttRpcClientOptions())
-        {
-        }
-
+        
         public MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options)
         {
             _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
             _options = options ?? throw new ArgumentNullException(nameof(options));
 
-            _applicationMessageReceivedHandler = new RpcAwareApplicationMessageReceivedHandler(
-                mqttClient.ApplicationMessageReceivedHandler,
-                HandleApplicationMessageReceivedAsync);
-
-            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler;
+            _mqttClient.ApplicationMessageReceivedAsync += HandleApplicationMessageReceivedAsync;
         }
 
         public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
@@ -59,12 +48,7 @@ namespace MQTTnet.Extensions.Rpc
         public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken)
         {
             if (methodName == null) throw new ArgumentNullException(nameof(methodName));
-
-            if (!(_mqttClient.ApplicationMessageReceivedHandler is RpcAwareApplicationMessageReceivedHandler))
-            {
-                throw new InvalidOperationException("The application message received handler was modified.");
-            }
-
+            
             var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(new TopicGenerationContext
             {
                 MethodName = methodName,
@@ -146,7 +130,7 @@ namespace MQTTnet.Extensions.Rpc
 
         public void Dispose()
         {
-            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler.OriginalHandler;
+            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;
 
             foreach (var tcs in _waitingCalls)
             {

Source/MQTTnet.Extensions.Rpc/RpcAwareApplicationMessageReceivedHandler.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MQTTnet.Client.Receiving;
-
-namespace MQTTnet.Extensions.Rpc
-{
-    public sealed class RpcAwareApplicationMessageReceivedHandler : IMqttApplicationMessageReceivedHandler
-    {
-        readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handleReceivedApplicationMessageAsync;
-
-        public RpcAwareApplicationMessageReceivedHandler(
-            IMqttApplicationMessageReceivedHandler originalHandler,
-            Func<MqttApplicationMessageReceivedEventArgs, Task> handleReceivedApplicationMessageAsync)
-        {
-            OriginalHandler = originalHandler;
-            _handleReceivedApplicationMessageAsync = handleReceivedApplicationMessageAsync ?? throw new ArgumentNullException(nameof(handleReceivedApplicationMessageAsync));
-        }
-
-        public IMqttApplicationMessageReceivedHandler OriginalHandler { get; }
-
-        public async Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
-        {
-            // First try to check if there is a pending RPC call! 
-            await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
-            
-            if (OriginalHandler != null)
-            {
-                await OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
-            }
-        }
-    }
-}

Source/MQTTnet.Extensions.WebSocket4Net/MqttFactoryExtensions.cs

@@ -8,7 +8,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
         {
             if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));
 
-            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory(mqttFactory.DefaultLogger));
+            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory());
         }
     }
 }

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs

@@ -8,9 +8,8 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Channel;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Exceptions;
-using MQTTnet.Internal;
 using SuperSocket.ClientEngine;
 using WebSocket4Net;
 

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttClientAdapterFactory.cs

@@ -1,23 +1,15 @@
 using MQTTnet.Adapter;
-using MQTTnet.Client.Options;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
 using System;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.Extensions.WebSocket4Net
 {
     public sealed class WebSocket4NetMqttClientAdapterFactory : IMqttClientAdapterFactory
     {
-        readonly IMqttNetLogger _logger;
-
-        public WebSocket4NetMqttClientAdapterFactory(IMqttNetLogger logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
 
@@ -29,7 +21,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
                         new MqttTcpChannel(options),
                         new MqttPacketFormatterAdapter(options.ProtocolVersion),
                         options.PacketInspector,
-                        _logger);
+                        logger);
                 }
 
                 case MqttClientWebSocketOptions webSocketOptions:
@@ -38,7 +30,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
                         new WebSocket4NetMqttChannel(options, webSocketOptions),
                         new MqttPacketFormatterAdapter(options.ProtocolVersion), 
                         options.PacketInspector,
-                        _logger);
+                        logger);
                 }
 
                 default:

Source/MQTTnet/Adapter/IMqttClientAdapterFactory.cs

@@ -1,9 +1,10 @@
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.Adapter
 {
     public interface IMqttClientAdapterFactory
     {
-        IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options);
+        IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger);
     }
 }

Source/MQTTnet/Adapter/IMqttServerAdapter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
 using MQTTnet.Server;
 
 namespace MQTTnet.Adapter
@@ -8,7 +9,7 @@ namespace MQTTnet.Adapter
     {
         Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
 
-        Task StartAsync(MqttServerOptions options);
+        Task StartAsync(MqttServerOptions options, IMqttNetLogger logger);
         Task StopAsync();
     }
 }

Source/MQTTnet/Adapter/MqttChannelAdapter.cs

@@ -11,8 +11,6 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
-using MQTTnet.Diagnostics.PacketInspection;
 
 namespace MQTTnet.Adapter
 {

Source/MQTTnet/Adapter/MqttConnectingFailedException.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Connecting;
+using MQTTnet.Client;
 using MQTTnet.Exceptions;
 
 namespace MQTTnet.Adapter

Source/MQTTnet/Adapter/MqttPacketInspectorHandler.cs

@@ -2,8 +2,6 @@ using System;
 using System.IO;
 using System.Linq;
 using MQTTnet.Diagnostics;
-using MQTTnet.Diagnostics.Logger;
-using MQTTnet.Diagnostics.PacketInspection;
 using MQTTnet.Formatter;
 
 namespace MQTTnet.Adapter

Source/MQTTnet/Client/Connecting/IMqttClientConnectedHandler.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public interface IMqttClientConnectedHandler
     {

Source/MQTTnet/Client/Connecting/MqttClientConnectResult.cs

@@ -2,7 +2,7 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public sealed class MqttClientConnectResult
     {

Source/MQTTnet/Client/Connecting/MqttClientConnectResultCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public enum MqttClientConnectResultCode
     {

Source/MQTTnet/Client/Connecting/MqttClientConnectResultFactory.cs

@@ -4,7 +4,7 @@ using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public sealed class MqttClientConnectResultFactory
     {

Source/MQTTnet/Client/Connecting/MqttClientConnectedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public class MqttClientConnectedEventArgs : EventArgs
     {

Source/MQTTnet/Client/Connecting/MqttClientConnectedHandlerDelegate.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
     public class MqttClientConnectedHandlerDelegate : IMqttClientConnectedHandler
     {

Source/MQTTnet/Client/Disconnecting/IMqttClientDisconnectedHandler.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public interface IMqttClientDisconnectedHandler
     {

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectOptions.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public sealed class MqttClientDisconnectOptions
     {

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectOptionsBuilder.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public sealed class MqttClientDisconnectOptionsBuilder
     {

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectReason.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public enum MqttClientDisconnectReason
     {

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectedEventArgs.cs

@@ -1,7 +1,6 @@
 using System;
-using MQTTnet.Client.Connecting;
 
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public sealed class MqttClientDisconnectedEventArgs : EventArgs
     {

Source/MQTTnet/Client/Disconnecting/MqttClientDisconnectedHandlerDelegate.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
     public class MqttClientDisconnectedHandlerDelegate : IMqttClientDisconnectedHandler
     {

Source/MQTTnet/Client/ExtendedAuthenticationExchange/IMqttExtendedAuthenticationExchangeHandler.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
     public interface IMqttExtendedAuthenticationExchangeHandler
     {

Source/MQTTnet/Client/ExtendedAuthenticationExchange/MqttExtendedAuthenticationExchangeContext.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
     public class MqttExtendedAuthenticationExchangeContext
     {

Source/MQTTnet/Client/ExtendedAuthenticationExchange/MqttExtendedAuthenticationExchangeData.cs

@@ -2,7 +2,7 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
     public class MqttExtendedAuthenticationExchangeData
     {

Source/MQTTnet/Client/IMqttClient.cs

@@ -1,10 +1,4 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

Source/MQTTnet/Client/MqttClient.cs

@@ -1,12 +1,4 @@
 using MQTTnet.Adapter;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.PacketDispatcher;
@@ -15,7 +7,7 @@ using MQTTnet.Protocol;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
 
@@ -33,6 +25,7 @@ namespace MQTTnet.Client
         readonly AsyncEvent<MqttApplicationMessageReceivedEventArgs> _applicationMessageReceivedEvent = new AsyncEvent<MqttApplicationMessageReceivedEventArgs>();
 
         readonly IMqttClientAdapterFactory _adapterFactory;
+        readonly IMqttNetLogger _rootLogger;
         readonly MqttNetSourceLogger _logger;
 
         CancellationTokenSource _backgroundCancellationTokenSource;
@@ -49,12 +42,11 @@ namespace MQTTnet.Client
         MqttClientDisconnectReason _disconnectReason;
 
         DateTime _lastPacketSentTimestamp;
-
+        
         public MqttClient(IMqttClientAdapterFactory channelFactory, IMqttNetLogger logger)
         {
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-
             _adapterFactory = channelFactory ?? throw new ArgumentNullException(nameof(channelFactory));
+            _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
             _logger = logger.WithSource(nameof(MqttClient));
         }
 
@@ -74,8 +66,6 @@ namespace MQTTnet.Client
             remove => _disconnectedEvent.RemoveHandler(value);
         }
         
-        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler { get; set; }
-
         public event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync
         {
             add => _applicationMessageReceivedEvent.AddHandler(value);
@@ -112,7 +102,7 @@ namespace MQTTnet.Client
                 _backgroundCancellationTokenSource = new CancellationTokenSource();
                 var backgroundCancellationToken = _backgroundCancellationTokenSource.Token;
 
-                var adapter = _adapterFactory.CreateClientAdapter(options);
+                var adapter = _adapterFactory.CreateClientAdapter(options, _rootLogger);
                 _adapter = adapter;
 
                 using (var effectiveCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(backgroundCancellationToken, cancellationToken))
@@ -813,13 +803,7 @@ namespace MQTTnet.Client
             var applicationMessageFactory = new MqttApplicationMessageFactory();
             var applicationMessage = applicationMessageFactory.Create(publishPacket);
             var eventArgs = new MqttApplicationMessageReceivedEventArgs(Options.ClientId, applicationMessage, publishPacket, AcknowledgeReceivedPublishPacket);
-
-            var handler = ApplicationMessageReceivedHandler;
-            if (handler != null)
-            {
-                await handler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
-            }
-
+            
             await _applicationMessageReceivedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
 
             return eventArgs;

Source/MQTTnet/Client/MqttClientExtensions.cs

@@ -1,16 +1,9 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Packets;
 
 namespace MQTTnet.Client
 {
@@ -79,39 +72,7 @@ namespace MQTTnet.Client
             client.DisconnectedHandler = handler;
             return client;
         }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            if (handler == null)
-            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Action<MqttApplicationMessageReceivedEventArgs> handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            if (handler == null)
-            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, IMqttApplicationMessageReceivedHandler handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            client.ApplicationMessageReceivedHandler = handler;
-            return client;
-        }
-
+        
         public static Task<MqttClientConnectResult> ReconnectAsync(this IMqttClient client)
         {
             if (client == null) throw new ArgumentNullException(nameof(client));

Source/MQTTnet/Client/Options/IMqttClientChannelOptions.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public interface IMqttClientChannelOptions
     {

Source/MQTTnet/Client/Options/IMqttClientCredentials.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public interface IMqttClientCredentials
     {

Source/MQTTnet/Client/Options/IMqttClientOptions.cs

@@ -1,11 +1,10 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
+using System;
+using System.Collections.Generic;
+using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
-using System;
-using System.Collections.Generic;
-using MQTTnet.Diagnostics.PacketInspection;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public interface IMqttClientOptions
     {

Source/MQTTnet/Client/Options/MqttClientCertificateValidationCallbackContext.cs

@@ -1,7 +1,7 @@
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientCertificateValidationCallbackContext
     {

Source/MQTTnet/Client/Options/MqttClientCredentials.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientCredentials : IMqttClientCredentials
     {

Source/MQTTnet/Client/Options/MqttClientOptions.cs

@@ -1,11 +1,10 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
+using System;
+using System.Collections.Generic;
+using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
-using System;
-using System.Collections.Generic;
-using MQTTnet.Diagnostics.PacketInspection;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientOptions : IMqttClientOptions
     {

Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs

@@ -1,13 +1,12 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MQTTnet.Diagnostics.PacketInspection;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientOptionsBuilder
     {

Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs

@@ -4,7 +4,7 @@ using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientOptionsBuilderTlsParameters
     {

Source/MQTTnet/Client/Options/MqttClientOptionsBuilderWebSocketParameters.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientOptionsBuilderWebSocketParameters
     {

Source/MQTTnet/Client/Options/MqttClientTcpOptions.cs

@@ -1,6 +1,6 @@
 using System.Net.Sockets;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientTcpOptions : IMqttClientChannelOptions
     {

Source/MQTTnet/Client/Options/MqttClientTcpOptionsExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public static class MqttClientTcpOptionsExtensions
     {

Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs

@@ -4,7 +4,7 @@ using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientTlsOptions
     {

Source/MQTTnet/Client/Options/MqttClientWebSocketOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;
 
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientWebSocketOptions : IMqttClientChannelOptions
     {

Source/MQTTnet/Client/Options/MqttClientWebSocketProxyOptions.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
     public class MqttClientWebSocketProxyOptions
     {

Source/MQTTnet/Client/Publishing/MqttClientPublishReasonCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Publishing
+namespace MQTTnet.Client
 {
     public enum MqttClientPublishReasonCode
     {

Source/MQTTnet/Client/Publishing/MqttClientPublishResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Publishing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientPublishResult
     {

Source/MQTTnet/Client/Publishing/MqttClientPublishResultFactory.cs

@@ -1,7 +1,7 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.Publishing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientPublishResultFactory
     {

Source/MQTTnet/Client/Receiving/IMqttApplicationMessageReceivedHandler.cs

@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MQTTnet.Client.Receiving
-{
-    public interface IMqttApplicationMessageReceivedHandler
-    {
-        Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs);
-    }
-}

Source/MQTTnet/Client/Receiving/MqttApplicationMessageReceivedEventArgs.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Packets;
 
-namespace MQTTnet
+namespace MQTTnet.Client
 {
     public sealed class MqttApplicationMessageReceivedEventArgs : EventArgs
     {

Source/MQTTnet/Client/Receiving/MqttApplicationMessageReceivedHandlerDelegate.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MQTTnet.Implementations;
-
-namespace MQTTnet.Client.Receiving
-{
-    public sealed class MqttApplicationMessageReceivedHandlerDelegate : IMqttApplicationMessageReceivedHandler
-    {
-        readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handler;
-
-        public MqttApplicationMessageReceivedHandlerDelegate(Action<MqttApplicationMessageReceivedEventArgs> handler)
-        {
-            if (handler == null) throw new ArgumentNullException(nameof(handler));
-
-            _handler = context =>
-            {
-                handler(context);
-                return PlatformAbstractionLayer.CompletedTask;
-            };
-        }
-
-        public MqttApplicationMessageReceivedHandlerDelegate(Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-        {
-            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
-        }
-
-        public Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs context)
-        {
-            return _handler(context);
-        }
-    }
-}

Source/MQTTnet/Client/Receiving/MqttApplicationMessageReceivedReasonCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet
+namespace MQTTnet.Client
 {
     public enum MqttApplicationMessageReceivedReasonCode
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientSubscribeOptions
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeOptionsBuilder.cs

@@ -1,10 +1,10 @@
-using MQTTnet.Packets;
-using MQTTnet.Protocol;
-using System;
+using System;
 using System.Collections.Generic;
 using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
 
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientSubscribeOptionsBuilder
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientSubscribeResult
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeResultCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
     public enum MqttClientSubscribeResultCode
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeResultFactory.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientSubscribeResultFactory
     {

Source/MQTTnet/Client/Subscribing/MqttClientSubscribeResultItem.cs

@@ -1,4 +1,6 @@
-namespace MQTTnet.Client.Subscribing
+using MQTTnet.Packets;
+
+namespace MQTTnet.Client
 {
     public sealed class MqttClientSubscribeResultItem
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientUnsubscribeOptions
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptionsBuilder.cs

@@ -1,8 +1,8 @@
-using MQTTnet.Packets;
-using System;
+using System;
 using System.Collections.Generic;
+using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public class MqttClientUnsubscribeOptionsBuilder
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeResult.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientUnsubscribeResult
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeResultCode.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public enum MqttClientUnsubscribeResultCode
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeResultFactory.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
 
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientUnsubscribeResultFactory
     {

Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeResultItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
     public sealed class MqttClientUnsubscribeResultItem
     {

Source/MQTTnet/Diagnostics/Logger/IMqttNetLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public interface IMqttNetLogger
     {

Source/MQTTnet/Diagnostics/Logger/MqttNetEventLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     /// <summary>
     /// This logger fires an event when a new message was published.

Source/MQTTnet/Diagnostics/Logger/MqttNetLogLevel.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public enum MqttNetLogLevel
     {

Source/MQTTnet/Diagnostics/Logger/MqttNetLogMessage.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public sealed class MqttNetLogMessage
     {

Source/MQTTnet/Diagnostics/Logger/MqttNetLogMessagePublishedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public sealed class MqttNetLogMessagePublishedEventArgs : EventArgs
     {

Source/MQTTnet/Diagnostics/Logger/MqttNetNullLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     /// <summary>
     /// This logger does nothing with the messages.

Source/MQTTnet/Diagnostics/Logger/MqttNetSourceLogger.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public sealed class MqttNetSourceLogger
     {

Source/MQTTnet/Diagnostics/Logger/MqttNetSourceLoggerExtensions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MQTTnet.Diagnostics.Logger
+namespace MQTTnet.Diagnostics
 {
     public static class MqttNetSourceLoggerExtensions
     {

Source/MQTTnet/Diagnostics/PacketInspection/IMqttPacketInspector.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Diagnostics.PacketInspection
+namespace MQTTnet.Diagnostics
 {
     public interface IMqttPacketInspector
     {

Source/MQTTnet/Diagnostics/PacketInspection/MqttPacketFlowDirection.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Diagnostics.PacketInspection
+namespace MQTTnet.Diagnostics
 {
     public enum MqttPacketFlowDirection
     {

Source/MQTTnet/Diagnostics/PacketInspection/ProcessMqttPacketContext.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Diagnostics.PacketInspection
+namespace MQTTnet.Diagnostics
 {
     public sealed class ProcessMqttPacketContext
     {

Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs

@@ -1,4 +1,4 @@
-namespace MQTTnet.Diagnostics.Runtime
+namespace MQTTnet.Diagnostics
 {
     public static class TargetFrameworkProvider
     {

Source/MQTTnet/Extensions/MqttClientOptionsBuilderExtension.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 
 namespace MQTTnet.Extensions
 {

Source/MQTTnet/Formatter/MqttConnectPacketFactory.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 
 namespace MQTTnet.Formatter

Source/MQTTnet/Formatter/MqttDisconnectPacketFactory.cs

@@ -1,4 +1,4 @@
-using MQTTnet.Client.Disconnecting;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 

Source/MQTTnet/Formatter/MqttPubAckPacketFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 using MQTTnet.Server;

Source/MQTTnet/Formatter/MqttPubCompPacketFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 

Source/MQTTnet/Formatter/MqttPubRecPacketFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 using MQTTnet.Server;

Source/MQTTnet/Formatter/MqttPubRelPacketFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 

Source/MQTTnet/Formatter/MqttPublishPacketFactory.cs

@@ -58,7 +58,6 @@ namespace MQTTnet.Formatter
                 Payload = connectPacket.WillMessage,
                 QualityOfServiceLevel = connectPacket.WillQoS,
                 Retain = connectPacket.WillRetain,
-                Dup = false,
                 Properties =
                 {
                     ContentType = connectPacket.WillProperties.ContentType,

Source/MQTTnet/Formatter/MqttSubAckPacketFactory.cs

@@ -1,6 +1,6 @@
 using System;
 using MQTTnet.Packets;
-using MQTTnet.Server.Internal;
+using MQTTnet.Server;
 
 namespace MQTTnet.Formatter
 {

Source/MQTTnet/Formatter/MqttSubscribePacketFactory.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Subscribing;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 
 namespace MQTTnet.Formatter

Source/MQTTnet/Formatter/MqttUnsubAckPacketFactory.cs

@@ -1,6 +1,6 @@
 using System;
 using MQTTnet.Packets;
-using MQTTnet.Server.Internal;
+using MQTTnet.Server;
 
 namespace MQTTnet.Formatter
 {

Source/MQTTnet/Formatter/MqttUnsubscribePacketFactory.cs

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Unsubscribing;
+using MQTTnet.Client;
 using MQTTnet.Packets;
 
 namespace MQTTnet.Formatter

Source/MQTTnet/IMqttApplicationMessagePublisher.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client.Publishing;
+using MQTTnet.Client;
 
 namespace MQTTnet
 {

Source/MQTTnet/IMqttApplicationMessageReceiver.cs

@@ -1,17 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using MQTTnet.Client.Receiving;
+using MQTTnet.Client;
 
 namespace MQTTnet
 {
     public interface IMqttApplicationMessageReceiver
     {
-        /// <summary>
-        /// Gets or sets the application message received handler that is fired every time a new message is received on the client's subscriptions.
-        /// Hint: Initialize handlers before you connect the client to avoid issues.
-        /// </summary>
-        IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler { get; set; }
-
         /// <summary>
         /// Fired when an application message was received.
         /// </summary>

Source/MQTTnet/Implementations/MqttClientAdapterFactory.cs

@@ -1,23 +1,15 @@
 using MQTTnet.Adapter;
-using MQTTnet.Client.Options;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using System;
 using MQTTnet.Channel;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Client;
 
 namespace MQTTnet.Implementations
 {
-    public class MqttClientAdapterFactory : IMqttClientAdapterFactory
+    public sealed class MqttClientAdapterFactory : IMqttClientAdapterFactory
     {
-        readonly IMqttNetLogger _logger;
-
-        public MqttClientAdapterFactory(IMqttNetLogger logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger)
         {
             if (options == null) throw new ArgumentNullException(nameof(options));
 
@@ -43,7 +35,7 @@ namespace MQTTnet.Implementations
             }
 
             var packetFormatterAdapter = new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttPacketWriter());
-            return new MqttChannelAdapter(channel, packetFormatterAdapter, options.PacketInspector, _logger);
+            return new MqttChannelAdapter(channel, packetFormatterAdapter, options.PacketInspector, logger);
         }
     }
 }