Misc cleanup (including line endings for some)

Author: NickCraver

StackExchange.Redis.Tests/TestBase.cs

@@ -103,7 +103,7 @@ protected void OnInternalError(object sender, InternalErrorEventArgs e)
         }
 
         private int privateFailCount;
-        private static AsyncLocal<int> sharedFailCount = new AsyncLocal<int>();
+        private static readonly AsyncLocal<int> sharedFailCount = new AsyncLocal<int>();
         private volatile int expectedFailCount;
 
         private readonly List<string> privateExceptions = new List<string>();

StackExchange.Redis/StackExchange/Redis/ClusterConfiguration.cs

@@ -97,8 +97,8 @@ public static bool TryParse(string range, out SlotRange value)
         /// <param name="other">The other slot range to compare to.</param>
         public int CompareTo(SlotRange other)
         {
-            int delta = (int)this.from - (int)other.from;
-            return delta == 0 ? (int)this.to - (int)other.to : delta;
+            int delta = (int)from - (int)other.from;
+            return delta == 0 ? (int)to - (int)other.to : delta;
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ internal ClusterConfiguration(ServerSelectionStrategy serverSelectionStrategy, s
         {
             // Beware: Any exception thrown here will wreak silent havoc like inability to connect to cluster nodes or non returning calls
             this.serverSelectionStrategy = serverSelectionStrategy;
-            this.Origin = origin;
+            Origin = origin;
             using (var reader = new StringReader(nodes))
             {
                 string line;
@@ -178,7 +178,7 @@ internal ClusterConfiguration(ServerSelectionStrategy serverSelectionStrategy, s
                     // make sure that things like clusterConfiguration[clusterConfiguration.Origin]
                     // will work as expected.
                     if (node.IsMyself)
-                        this.Origin = node.EndPoint;
+                        Origin = node.EndPoint;
 
                     if (nodeLookup.ContainsKey(node.EndPoint))
                     {
@@ -286,7 +286,7 @@ internal ClusterNode(ClusterConfiguration configuration, string raw, EndPoint or
         {
             // https://redis.io/commands/cluster-nodes
             this.configuration = configuration;
-            this.Raw = raw;
+            Raw = raw;
             var parts = raw.Split(StringSplits.Space);
 
             var flags = parts[2].Split(StringSplits.Comma);
@@ -319,8 +319,7 @@ internal ClusterNode(ClusterConfiguration configuration, string raw, EndPoint or
             {
                 if (SlotRange.TryParse(parts[i], out SlotRange range))
                 {
-                    if (slots == null) slots = new List<SlotRange>(parts.Length - i);
-                    slots.Add(range);
+                    (slots ?? (slots = new List<SlotRange>(parts.Length - i))).Add(range);
                 }
             }
             Slots = slots?.AsReadOnly() ?? NoSlots;
@@ -338,10 +337,9 @@ public IList<ClusterNode> Children
                 List<ClusterNode> nodes = null;
                 foreach (var node in configuration.Nodes)
                 {
-                    if (node.ParentNodeId == this.NodeId)
+                    if (node.ParentNodeId == NodeId)
                     {
-                        if (nodes == null) nodes = new List<ClusterNode>();
-                        nodes.Add(node);
+                        (nodes ?? (nodes = new List<ClusterNode>())).Add(node);
                     }
                 }
                 children = nodes?.AsReadOnly() ?? NoNodes;
@@ -416,14 +414,14 @@ public int CompareTo(ClusterNode other)
         {
             if (other == null) return -1;
 
-            if (this.IsSlave != other.IsSlave) return IsSlave ? 1 : -1; // masters first
+            if (IsSlave != other.IsSlave) return IsSlave ? 1 : -1; // masters first
 
             if (IsSlave) // both slaves? compare by parent, so we get masters A, B, C and then slaves of A, B, C
             {
-                int i = string.CompareOrdinal(this.ParentNodeId, other.ParentNodeId);
+                int i = string.CompareOrdinal(ParentNodeId, other.ParentNodeId);
                 if (i != 0) return i;
             }
-            return string.CompareOrdinal(this.NodeId, other.NodeId);
+            return string.CompareOrdinal(NodeId, other.NodeId);
         }
 
         /// <summary>

StackExchange.Redis/StackExchange/Redis/Condition.cs

@@ -98,7 +98,7 @@ internal static string TryGetAzureRoleInstanceIdNoThrow()
                 var currentRoleInstanceId = currentRoleInstanceProp.GetValue(null, null);
                 roleInstanceId = currentRoleInstanceId.GetType().GetProperty("Id").GetValue(currentRoleInstanceId, null).ToString();
 
-                if (String.IsNullOrEmpty(roleInstanceId))
+                if (string.IsNullOrEmpty(roleInstanceId))
                 {
                     roleInstanceId = null;
                 }
@@ -2050,7 +2050,7 @@ void add(string lk, string sk, string v)
 
                             add("Client-Name", "clientName", ClientName);
                             add("Server-Endpoint", "serverEndpoint", server.EndPoint.ToString());
-                            var hashSlot = message.GetHashSlot(this.ServerSelectionStrategy);
+                            var hashSlot = message.GetHashSlot(ServerSelectionStrategy);
                             // only add keyslot if its a valid cluster key slot
                             if (hashSlot != ServerSelectionStrategy.NoSlot)
                             {