From b93cd5b673585fdc3706dee4cc494ff7a0e958a2 Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Sat, 4 Apr 2020 13:07:10 +0200
Subject: [PATCH] Refactor code.

---
 Source/MQTTnet/Server/IMqttServer.cs |  9 ++++-----
 Source/MQTTnet/Server/MqttServer.cs  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Source/MQTTnet/Server/IMqttServer.cs b/Source/MQTTnet/Server/IMqttServer.cs
index 41c6dc03..aac66c84 100644
--- a/Source/MQTTnet/Server/IMqttServer.cs
+++ b/Source/MQTTnet/Server/IMqttServer.cs
@@ -1,11 +1,12 @@
-using System.Collections.Generic;
+using MQTTnet.Server.Status;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using MQTTnet.Server.Status;
 
 namespace MQTTnet.Server
 {
     public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher
     {
+        bool IsStarted { get; }
         IMqttServerStartedHandler StartedHandler { get; set; }
         IMqttServerStoppedHandler StoppedHandler { get; set; }
 
@@ -13,7 +14,7 @@ namespace MQTTnet.Server
         IMqttServerClientDisconnectedHandler ClientDisconnectedHandler { get; set; }
         IMqttServerClientSubscribedTopicHandler ClientSubscribedTopicHandler { get; set; }
         IMqttServerClientUnsubscribedTopicHandler ClientUnsubscribedTopicHandler { get; set; }
-        
+
         IMqttServerOptions Options { get; }
 
         Task<IList<IMqttClientStatus>> GetClientStatusAsync();
@@ -27,7 +28,5 @@ namespace MQTTnet.Server
 
         Task StartAsync(IMqttServerOptions options);
         Task StopAsync();
-
-        bool IsStarted { get; }
     }
 }
\ No newline at end of file
diff --git a/Source/MQTTnet/Server/MqttServer.cs b/Source/MQTTnet/Server/MqttServer.cs
index a8c4369c..fcbde127 100644
--- a/Source/MQTTnet/Server/MqttServer.cs
+++ b/Source/MQTTnet/Server/MqttServer.cs
@@ -15,13 +15,13 @@ namespace MQTTnet.Server
 {
     public class MqttServer : IMqttServer
     {
-        private readonly MqttServerEventDispatcher _eventDispatcher;
-        private readonly ICollection<IMqttServerAdapter> _adapters;
-        private readonly IMqttNetLogger _logger;
+        readonly MqttServerEventDispatcher _eventDispatcher;
+        readonly ICollection<IMqttServerAdapter> _adapters;
+        readonly IMqttNetLogger _logger;
 
-        private MqttClientSessionsManager _clientSessionsManager;
-        private IMqttRetainedMessagesManager _retainedMessagesManager;
-        private CancellationTokenSource _cancellationTokenSource;
+        MqttClientSessionsManager _clientSessionsManager;
+        IMqttRetainedMessagesManager _retainedMessagesManager;
+        CancellationTokenSource _cancellationTokenSource;
 
         public MqttServer(IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger)
         {
@@ -34,6 +34,8 @@ namespace MQTTnet.Server
             _eventDispatcher = new MqttServerEventDispatcher(logger.CreateChildLogger(nameof(MqttServerEventDispatcher)));
         }
 
+        public bool IsStarted => _cancellationTokenSource != null;
+
         public IMqttServerStartedHandler StartedHandler { get; set; }
 
         public IMqttServerStoppedHandler StoppedHandler { get; set; }
@@ -190,9 +192,7 @@ namespace MQTTnet.Server
             return _retainedMessagesManager?.ClearMessagesAsync();
         }
 
-        public bool IsStarted => _cancellationTokenSource != null;
-
-        private Task OnHandleClient(IMqttChannelAdapter channelAdapter)
+        Task OnHandleClient(IMqttChannelAdapter channelAdapter)
         {
             return _clientSessionsManager.HandleClientConnectionAsync(channelAdapter);
         }