Merge CreateClient and RegisterClient into PrepareClient

Author: Micky5991

JustAnotherVoiceChat.Server.Dummy/src/ServerHandler.cs

@@ -61,18 +61,7 @@ public ServerHandler(IDummyClientRepository clientRepository, IVoiceWrapper voic
 
         public IVoiceClient PrepareClient()
         {
-            var voiceClient = CreateClient(1);
-            if (voiceClient == null)
-            {
-                return null;
-            }
-
-            if (!RegisterClient(voiceClient))
-            {
-                return null;
-            }
-            
-            return voiceClient;
+            return PrepareClient(1);
         }
 
         public void TriggerClientConnect(ushort handle)

JustAnotherVoiceChat.Server.GTMP/src/Elements/Server/GtmpVoiceServer.Players.cs

@@ -41,16 +41,11 @@ public IGtmpVoiceClient GetVoiceClient(Client player)
 
         private IGtmpVoiceClient RegisterPlayer(Client player)
         {
-            var voiceClient = CreateClient(player);
+            var voiceClient = PrepareClient(player);
             if (voiceClient == null)
             {
                 return null;
             }
-
-            if (!RegisterClient(voiceClient))
-            {
-                return null;
-            }
 
             OnClientPrepared?.Invoke(voiceClient);
 

JustAnotherVoiceChat.Server.Wrapper/src/Elements/Server/VoiceServer.Clients.cs

@@ -38,35 +38,45 @@ public partial class VoiceServer<TClient, TIdentifer> where TClient : IVoiceClie
     {
         private readonly ConcurrentDictionary<ushort, IVoiceClient> _clients = new ConcurrentDictionary<ushort, IVoiceClient>();
         private readonly object _voiceHandleGenerationLock = new object();
+
+        protected TClient PrepareClient(TIdentifer identifer)
+        {
+            var client = CreateClient(identifer);
+            if (ReferenceEquals(client, default(TClient)) || !RegisterClient(client))
+            {
+                return default(TClient);
+            }
+
+            return client;
+        }
 
-        protected TClient CreateClient(TIdentifer identifer)
+        private TClient CreateClient(TIdentifer identifer)
         {
-            if (!CreateVoiceHandle(out var voiceHandle))
+            var voiceHandle = CreateVoiceHandle();
+            if (voiceHandle == VoiceHandle.Empty)
             {
                 return default(TClient);
             }
 
             return _factory.MakeClient(identifer, this, voiceHandle);
         }
 
-        protected bool CreateVoiceHandle(out VoiceHandle voiceHandle)
+        private VoiceHandle CreateVoiceHandle()
         {
             lock (_voiceHandleGenerationLock)
             {
                 try
                 {
-                    voiceHandle = CreateFreeVoiceHandle();
-                    return true;
+                    return CreateFreeVoiceHandle();
                 }
                 catch (InvalidOperationException)
                 {
-                    voiceHandle = new VoiceHandle();
-                    return false;
+                    return VoiceHandle.Empty;
                 }
             }
         }
 
-        protected bool RegisterClient(IVoiceClient client)
+        private bool RegisterClient(IVoiceClient client)
         {
             lock (_voiceHandleGenerationLock)
             {