various cleanup.

Author: Claus

src/Umbraco.Deploy.Contrib.Connectors/Caching/Comparers/StringArrayComparer.cs

@@ -3,7 +3,6 @@
 
 namespace Umbraco.Deploy.Contrib.Connectors.Caching.Comparers
 {
-
     /// <summary>
     /// Compares an array of strings.
     /// </summary>
@@ -12,7 +11,6 @@ namespace Umbraco.Deploy.Contrib.Connectors.Caching.Comparers
     /// </remarks>
     public class StringArrayComparer : IEqualityComparer<string[]>
     {
-
         /// <summary>
         /// Check if the arrays are equal.
         /// </summary>
@@ -32,17 +30,20 @@ public bool Equals(string[] x, string[] y)
             {
                 return x == null && y == null;
             }
+
             if (x.Length != y.Length)
             {
                 return false;
             }
+
             for (var i = 0; i < x.Length; i++)
             {
                 if (x[i] != y[i])
                 {
                     return false;
                 }
             }
+
             return true;
         }
 
@@ -68,10 +69,9 @@ public int GetHashCode(string[] items)
                 {
                     hashCode ^= (item ?? string.Empty).GetHashCode();
                 }
+
                 return hashCode;
             }
         }
-
     }
-
 }

src/Umbraco.Deploy.Contrib.Connectors/Caching/InstanceByKeyCache.cs

@@ -4,7 +4,6 @@
 
 namespace Umbraco.Deploy.Contrib.Connectors.Caching
 {
-
     /// <summary>
     /// Caches instance variables by key in a dictionary-like structure.
     /// </summary>
@@ -19,7 +18,6 @@ namespace Umbraco.Deploy.Contrib.Connectors.Caching
     /// </remarks>
     public class InstanceByKeyCache<T, TKey>
     {
-
         /// <summary>
         /// An empty array (convenience variable).
         /// </summary>
@@ -77,8 +75,7 @@ public T Get(TKey key, Func<TKey, T> replenisher, TimeSpan duration, params stri
 
                 // Value already cached?
                 var tempTuple = default(Tuple<Dictionary<string[], T>, DateTime>);
-                if (Instances.TryGetValue(key, out tempTuple)
-                    && tempTuple.Item1.ContainsKey(keys))
+                if (Instances.TryGetValue(key, out tempTuple) && tempTuple.Item1.ContainsKey(keys))
                 {
                     if (now.Subtract(Instances[key].Item2) >= duration)
                     {
@@ -166,6 +163,7 @@ private T TryGetByKeys(string[] keys, TKey accessKey)
                     }
                 }
             }
+
             return default(T);
         }
 
@@ -187,8 +185,7 @@ private T TryGetByKeys(string[] keys, TKey accessKey)
         /// <param name="doLock">
         /// Lock the instance cache during the update?
         /// </param>
-        private void UpdateValueByKeys(string[] keys, TKey accessKey, T value,
-            DateTime lastCache, bool doLock = true)
+        private void UpdateValueByKeys(string[] keys, TKey accessKey, T value, DateTime lastCache, bool doLock = true)
         {
             if (doLock)
             {
@@ -215,10 +212,8 @@ private void UpdateValueByKeys(string[] keys, TKey accessKey, T value,
         /// <param name="value">
         /// The value to update the cache with.
         /// </param>
-        private void UpdateValueByKeysWithoutLock(string[] keys, TKey accessKey,
-            T value, DateTime lastCache)
+        private void UpdateValueByKeysWithoutLock(string[] keys, TKey accessKey, T value, DateTime lastCache)
         {
-
             // Variables.
             var instanceTuple = default(Tuple<Dictionary<string[], T>, DateTime>);
             var instanceDictionary = default(Dictionary<string[], T>);
@@ -237,11 +232,7 @@ private void UpdateValueByKeysWithoutLock(string[] keys, TKey accessKey,
             instanceDictionary[keys] = value;
 
             // Update the last cache date.
-            Instances[accessKey] = new Tuple<Dictionary<string[], T>, DateTime>(
-                instanceDictionary, lastCache);
-
+            Instances[accessKey] = new Tuple<Dictionary<string[], T>, DateTime>(instanceDictionary, lastCache);
         }
-
     }
-
 }

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/ArchetypeValueConnector.cs

@@ -445,7 +445,7 @@ internal class ArchetypeModel
             /// <returns></returns>
             public string SerializeForPersistence()
             {
-                var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings() { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
+                var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
 
                 var propertiesToRemove = new[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType", "editorState" };
 
@@ -514,7 +514,6 @@ internal class UmbracoEditorState
             public IEnumerable<string> FileNames { get; set; }
         }
 
-
         /// <summary>
         /// A local version of IDataTypeDefinition (to avoid any potential lazy loading/deferred
         /// execution issues).
@@ -526,6 +525,5 @@ internal class DataTypeDefinition
             public int Id { get; set; }
             public Guid Key { get; set; }
         }
-
     }
 }

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/NestedContentValueConnector.cs

@@ -98,7 +98,7 @@ public string GetValue(Property property, ICollection<ArtifactDependency> depend
 
                     if (propertyType == null)
                     {
-                        LogHelper.Debug<NestedContentValueConnector>($"No Property Type found with alias {key} on Content Type {contentType.Alias}");
+                        LogHelper.Debug<NestedContentValueConnector>($"No property type found with alias {key} on content type {contentType.Alias}");
                         continue;
                     }
 
@@ -203,7 +203,7 @@ public void SetValue(IContentBase content, string alias, string value)
 
                     if (propertyType == null)
                     {
-                        LogHelper.Debug<NestedContentValueConnector>($"No Property Type found with alias {key} on Content Type {contentType.Alias}");
+                        LogHelper.Debug<NestedContentValueConnector>($"No property type found with alias {key} on content type {contentType.Alias}");
                         continue;
                     }