Refactored implementation for fullresthost and fullrealtimehost

ably · Mar 27, 2024 · d5b2bf2 · d5b2bf2
1 parent a337a44
commit d5b2bf2
Showing 1 changed file with 18 additions and 22 deletions.
diff --git a/src/IO.Ably.Shared/ClientOptions.cs b/src/IO.Ably.Shared/ClientOptions.cs
@@ -159,20 +159,17 @@ public string[] FallbackHosts
         /// <returns>RestHost.</returns>
         public string FullRestHost()
         {
-            var restHost = _restHost;
-            if (restHost.IsEmpty())
+            if (_restHost.IsNotEmpty())
             {
-                restHost = Defaults.RestHost;
+                return _restHost;
             }
 
-            if (restHost == Defaults.RestHost)
+            if (!IsProductionEnvironment)
             {
-                return IsProductionEnvironment
-                    ? restHost
-                    : $"{Environment}-{restHost}";
+                return $"{Environment}-{Defaults.RestHost}";
             }
 
-            return restHost;
+            return Defaults.RestHost;
         }
 
         /// <summary>
@@ -181,27 +178,26 @@ public string FullRestHost()
         /// <returns>RealtimeHost.</returns>
         public string FullRealtimeHost()
         {
-            var realtimeHost = _realtimeHost;
-            if (realtimeHost.IsEmpty())
+            if (_realtimeHost.IsNotEmpty())
             {
-                if (_restHost.IsNotEmpty())
-                {
-                    Logger.Warning(
-                        $@"restHost is set to {_restHost} but realtimeHost is not set,
-                                     so setting realtimeHost to {_restHost} too. If this is not what you want,
-                                     please set realtimeHost explicitly.");
-                    return _restHost;
-                }
+                return _realtimeHost;
+            }
 
-                realtimeHost = Defaults.RealtimeHost;
+            if (_restHost.IsNotEmpty())
+            {
+                Logger.Warning(
+                    $@"restHost is set to {_restHost} but realtimeHost is not set,
+                    so setting realtimeHost to {_restHost} too. If this is not what you want,
+                    please set realtimeHost explicitly.");
+                return _restHost;
             }
 
-            if (realtimeHost == Defaults.RealtimeHost)
+            if (!IsProductionEnvironment)
             {
-                return IsProductionEnvironment ? realtimeHost : $"{Environment}{'-'}{realtimeHost}";
+                return $"{Environment}-{Defaults.RealtimeHost}";
             }
 
-            return realtimeHost;
+            return Defaults.RealtimeHost;
         }
 
         /// <summary>