Clean up test helpers and fix warnings

Author: ronaldbarendse

.editorconfig

@@ -144,7 +144,7 @@ dotnet_style_prefer_simplified_interpolation = true:warning
 # https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#implicit-and-explicit-types
 csharp_style_var_for_built_in_types = never
 csharp_style_var_when_type_is_apparent = true:warning
-csharp_style_var_elsewhere = false:warning
+csharp_style_var_elsewhere = true:warning
 # Expression-bodied members
 # https://docs.microsoft.com/visualstudio/ide/editorconfig-language-conventions#expression-bodied-members
 csharp_style_expression_bodied_methods = true:suggestion

src/Umbraco.Deploy.Contrib/Extensions/ArtifactTypeResolverCollectionBuilderExtensions.cs

@@ -1,4 +1,4 @@
-using Umbraco.Deploy.Contrib.Connectors.Serialization;
+using Umbraco.Deploy.Contrib.Connectors.Serialization;
 using Umbraco.Deploy.Serialization;
 
 namespace Umbraco.Extensions

src/Umbraco.Deploy.Contrib/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Deploy;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -23,7 +24,18 @@ public class DocTypeGridEditorCellValueConnector : GridCellValueConnectorBase2
 
         private ValueConnectorCollection ValueConnectors => _valueConnectorsLazy.Value;
 
+        [Obsolete("Please use the constructor taking all parameters. This constructor will be removed in a future version.")]
         public DocTypeGridEditorCellValueConnector(ILogger logger, IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors)
+            : this(
+                  Current.Factory.GetInstance<IEntityService>(),
+                  Current.Factory.GetInstance<ILocalLinkParser>(),
+                  logger,
+                  contentTypeService,
+                  valueConnectors)
+        { }
+
+        public DocTypeGridEditorCellValueConnector(IEntityService entityService, ILocalLinkParser localLinkParser, ILogger logger, IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors)
+            : base(entityService, localLinkParser)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
@@ -127,11 +139,8 @@ public sealed override void SetValue(GridValue.GridControl gridControl, IContext
             _logger.Debug<DocTypeGridEditorCellValueConnector>($"SetValue - ContentTypeAlias - {docTypeGridEditorContent.ContentTypeAlias}");
 
             // check if the doc type exist - else abort packaging
-            var contentType = contextCache.GetContentTypeByAlias(_contentTypeService, docTypeGridEditorContent.ContentTypeAlias);
-            if (contentType == null)
-            {
-                throw new InvalidOperationException($"Could not resolve the Content Type for the Doc Type Grid Editor property: {docTypeGridEditorContent.ContentTypeAlias}");
-            }
+            var contentType = contextCache.GetContentTypeByAlias(_contentTypeService, docTypeGridEditorContent.ContentTypeAlias)
+                ?? throw new InvalidOperationException($"Could not resolve the Content Type for the Doc Type Grid Editor property: {docTypeGridEditorContent.ContentTypeAlias}");
 
             _logger.Debug<DocTypeGridEditorCellValueConnector>($"SetValue - ContentType - {contentType}");
 

src/Umbraco.Deploy.Contrib/Migrators/Legacy/ContentType/ElementTypeArtifactMigratorBase.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Semver;
 using Umbraco.Deploy.Artifacts.ContentType;
 using Umbraco.Deploy.Migrators;

src/Umbraco.Deploy.Contrib/Serialization/LegacyArtifactTypeResolver.cs

@@ -1,4 +1,4 @@
-using Semver;
+using Semver;
 using Umbraco.Deploy.Serialization;
 
 namespace Umbraco.Deploy.Contrib.Connectors.Serialization

src/Umbraco.Deploy.Contrib/ValueConnectors/BlockEditorValueConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;

src/Umbraco.Deploy.Contrib/ValueConnectors/BlockListValueConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Services;

src/Umbraco.Deploy.Contrib/ValueConnectors/MultiUrlPickerValueConnector.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -64,7 +64,6 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
             }
 
             var valueAsJToken = JToken.Parse(svalue);
-
             if (valueAsJToken is JArray)
             {
                 // Multiple links, parse as JArray
@@ -114,9 +113,9 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                     }
                     else if (isMedia && TryParseJTokenAttr(link, "url", out string url))
                     {
-                        // This state can happen due to an issue in RJP.MultiUrlPicker(or our linkPicker in RTE which it relies on), 
-                        // where you edit a media link, and just hit "Select". 
-                        // That will set the id to null, but the url will still be filled. We try to get the media item, and if so add it as 
+                        // This state can happen due to an issue in RJP.MultiUrlPicker(or our linkPicker in RTE which it relies on),
+                        // where you edit a media link, and just hit "Select".
+                        // That will set the id to null, but the url will still be filled. We try to get the media item, and if so add it as
                         // a dependency to the package. If we can't find it, we abort(aka continue)
                         var entry = _mediaService.GetMediaByPath(url);
                         if (entry == null)
@@ -132,6 +131,7 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                         link["url"] = udi.ToString();
                     }
                 }
+
                 return JsonConvert.SerializeObject(links);
             }
 
@@ -145,11 +145,9 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                 }
 
                 var isMedia = link["isMedia"] != null;
-                int intId;
-                string url;
-                GuidUdi guidUdi;
+
                 // Only do processing if the Id is set on the element. OR if the url is set and its a media item
-                if (TryParseJTokenAttr(link, "id", out intId))
+                if (TryParseJTokenAttr(link, "id", out int intId))
                 {
                     // Checks weather we are resolving a media item or a document
                     var objectTypeId = isMedia
@@ -169,19 +167,19 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                         link["id"] = udi.ToString();
                     }
                 }
-                else if (TryParseJTokenAttr(link, "udi", out guidUdi))
+                else if (TryParseJTokenAttr(link, "udi", out GuidUdi guidUdi))
                 {
                     if (contextCache.EntityExists(_entityService, guidUdi.Guid))
                     {
                         // Add the artifact dependency
                         dependencies.Add(new ArtifactDependency(guidUdi, false, ArtifactDependencyMode.Exist));
                     }
                 }
-                else if (isMedia && TryParseJTokenAttr(link, "url", out url))
+                else if (isMedia && TryParseJTokenAttr(link, "url", out string url))
                 {
-                    // This state can happen due to an issue in RJP.MultiUrlPicker(or our linkPicker in RTE which it relies on), 
-                    // where you edit a media link, and just hits "Select". 
-                    // That will set the id to null, but the url will still be filled. We try to get the media item, and if so add it as 
+                    // This state can happen due to an issue in RJP.MultiUrlPicker(or our linkPicker in RTE which it relies on),
+                    // where you edit a media link, and just hits "Select".
+                    // That will set the id to null, but the url will still be filled. We try to get the media item, and if so add it as
                     // a dependency to the package. If we can't find it, we abort(aka continue)
                     var entry = _mediaService.GetMediaByPath(url);
                     if (entry != null)
@@ -194,10 +192,11 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                         link["url"] = udi.ToString();
                     }
                 }
+
                 return JsonConvert.SerializeObject(link);
             }
 
-            //if none of the above...
+            // If none of the above...
             return string.Empty;
         }
 
@@ -209,19 +208,16 @@ public sealed override object FromArtifact(string value, PropertyType propertyTy
             }
 
             var valueAsJToken = JToken.Parse(value);
-
             if (valueAsJToken is JArray)
             {
-                //Multiple links, parse as JArray
+                // Multiple links, parse as JArray
                 var links = JsonConvert.DeserializeObject<JArray>(value);
                 if (links != null)
                 {
                     foreach (var link in links)
                     {
-                        GuidUdi udi;
-                        string url;
                         // Only do processing on an item if the Id or the url is set
-                        if (TryParseJTokenAttr(link, "id", out udi))
+                        if (TryParseJTokenAttr(link, "id", out GuidUdi udi))
                         {
                             // Check the type of the link
                             var nodeObjectType = link["isMedia"] != null
@@ -237,15 +233,15 @@ public sealed override object FromArtifact(string value, PropertyType propertyTy
                                 link["id"] = idAttempt.Success ? idAttempt.Result : 0;
                             }
                         }
-                        else if (TryParseJTokenAttr(link, "url", out url))
+                        else if (TryParseJTokenAttr(link, "url", out string url))
                         {
                             // Check whether the url attribute of the link contains a udi, if so, replace it with the
                             // path to the file, i.e. the regex replaces <udi> with /path/to/file
                             var newUrl = MediaUdiSrcRegex.Replace(url, match =>
                             {
                                 var udiString = match.Groups["udi"].ToString();
-                                GuidUdi foundUdi;
-                                if (GuidUdi.TryParse(udiString, out foundUdi) && foundUdi.EntityType == Constants.UdiEntityType.Media)
+                                if (GuidUdi.TryParse(udiString, out var foundUdi) &&
+                                    foundUdi.EntityType == Constants.UdiEntityType.Media)
                                 {
                                     // (take care of nulls)
                                     var media = _mediaService.GetById(foundUdi.Guid);
@@ -254,23 +250,24 @@ public sealed override object FromArtifact(string value, PropertyType propertyTy
                                         return media.GetUrl("umbracoFile", _logger);
                                     }
                                 }
+
                                 return string.Empty;
                             });
+
                             link["url"] = newUrl;
                         }
                     }
+
                     value = JsonConvert.SerializeObject(links);
                 }
             }
             else if (valueAsJToken is JObject)
             {
-                //Single link, parse as JToken    
+                // Single link, parse as JToken
                 var link = JsonConvert.DeserializeObject<JToken>(value);
 
-                GuidUdi udi;
-                string url;
                 // Only do processing on an item if the Id or the url is set
-                if (TryParseJTokenAttr(link, "id", out udi))
+                if (TryParseJTokenAttr(link, "id", out GuidUdi udi))
                 {
                     // Check the type of the link
                     var nodeObjectType = link["isMedia"] != null
@@ -286,15 +283,14 @@ public sealed override object FromArtifact(string value, PropertyType propertyTy
                         link["id"] = idAttempt.Success ? idAttempt.Result : 0;
                     }
                 }
-                else if (TryParseJTokenAttr(link, "url", out url))
+                else if (TryParseJTokenAttr(link, "url", out string url))
                 {
-                    // Check whether the url attribute of the link contains a udi, if so, replace it with the 
+                    // Check whether the url attribute of the link contains a udi, if so, replace it with the
                     // path to the file, i.e. the regex replaces <udi> with /path/to/file
                     var newUrl = MediaUdiSrcRegex.Replace(url, match =>
                     {
                         var udiString = match.Groups["udi"].ToString();
-                        GuidUdi foundUdi;
-                        if (GuidUdi.TryParse(udiString, out foundUdi) &&
+                        if (GuidUdi.TryParse(udiString, out var foundUdi) &&
                             foundUdi.EntityType == Constants.UdiEntityType.Media)
                         {
                             // (take care of nulls)
@@ -307,6 +303,7 @@ public sealed override object FromArtifact(string value, PropertyType propertyTy
 
                         return string.Empty;
                     });
+
                     link["url"] = newUrl;
                 }
 
@@ -323,6 +320,7 @@ private bool TryParseJTokenAttr(JToken link, string attrName, out int attrValue)
                 var val = link[attrName].ToString();
                 return int.TryParse(val, out attrValue);
             }
+
             attrValue = 0;
             return false;
         }
@@ -334,6 +332,7 @@ private bool TryParseJTokenAttr(JToken link, string attrName, out GuidUdi attrVa
                 var val = link[attrName].ToString();
                 return GuidUdi.TryParse(val, out attrValue);
             }
+
             attrValue = null;
             return false;
         }
@@ -349,7 +348,8 @@ private bool TryParseJTokenAttr(JToken link, string attrName, out string strAttr
                     return true;
                 }
             }
-            strAttr = "";
+
+            strAttr = string.Empty;
             return false;
         }
     }