Add additional caching using IContextCache (#59)

* Fix missing cached entity key lookup

* Use throw expressions in constructors

* Remove non-existent Umbraco.BlockEditor alias

Author: ronaldbarendse

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

@@ -25,7 +25,7 @@ public class DocTypeGridEditorCellValueConnector : GridCellValueConnectorBase2
 
         public DocTypeGridEditorCellValueConnector(ILogger logger, IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors)
         {
-            _logger = logger;
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
             _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors));
         }

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

@@ -26,23 +26,17 @@ public abstract class BlockEditorValueConnector : ValueConnectorBase
         private readonly ILogger _logger;
 
         /// <inheritdoc />
-        public override IEnumerable<string> PropertyEditorAliases { get; } = new[]
-        {
-            "Umbraco.BlockEditor"
-        };
+        public override IEnumerable<string> PropertyEditorAliases { get; } = Enumerable.Empty<string>();
 
         // cannot inject ValueConnectorCollection directly as it would cause a circular (recursive) dependency,
         // so we have to inject it lazily and use the lazy value when actually needing it
         private ValueConnectorCollection ValueConnectors => _valueConnectorsLazy.Value;
 
         public BlockEditorValueConnector(IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors, ILogger logger)
         {
-            if (contentTypeService == null) throw new ArgumentNullException(nameof(contentTypeService));
-            if (valueConnectors == null) throw new ArgumentNullException(nameof(valueConnectors));
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-            _contentTypeService = contentTypeService;
-            _valueConnectorsLazy = valueConnectors;
-            _logger = logger;
+            _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
+            _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
         public override string ToArtifact(object value, PropertyType propertyType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)

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

@@ -11,7 +11,10 @@ namespace Umbraco.Deploy.Contrib.Connectors.ValueConnectors
     /// </summary>
     public class BlockListValueConnector : BlockEditorValueConnector
     {
-        public override IEnumerable<string> PropertyEditorAliases => new[] { "Umbraco.BlockList" };
+        public override IEnumerable<string> PropertyEditorAliases { get; } = new[]
+        {
+            "Umbraco.BlockList"
+        };
 
         public BlockListValueConnector(IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors, ILogger logger)
             : base(contentTypeService, valueConnectors, logger)

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

@@ -50,11 +50,9 @@ public class MultiUrlPickerValueConnector : ValueConnectorBase
         /// <param name="logger"></param>
         public MultiUrlPickerValueConnector(IEntityService entityService, IMediaService mediaService, ILogger logger)
         {
-            if (entityService == null) throw new ArgumentNullException(nameof(entityService));
-            if (mediaService == null) throw new ArgumentNullException(nameof(mediaService));
-            _entityService = entityService;
-            _mediaService = mediaService;
-            _logger = logger;
+            _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
+            _mediaService = mediaService ?? throw new ArgumentNullException(nameof(mediaService));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
         public sealed override string ToArtifact(object value, PropertyType propertyType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)
@@ -85,7 +83,7 @@ public sealed override string ToArtifact(object value, PropertyType propertyType
                             : UmbracoObjectTypes.Document;
                         var entityType = isMedia ? Constants.UdiEntityType.Media : Constants.UdiEntityType.Document;
 
-                        var guidAttempt = _entityService.GetKey(intId, objectTypeId);
+                        var guidAttempt = contextCache.GetEntityKeyById(_entityService, intId, objectTypeId);
                         if (guidAttempt.Success == false)
                             continue;
 

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

@@ -41,12 +41,9 @@ public class NestedContentValueConnector : ValueConnectorBase
 
         public NestedContentValueConnector(IContentTypeService contentTypeService, Lazy<ValueConnectorCollection> valueConnectors, ILogger logger)
         {
-            if (contentTypeService == null) throw new ArgumentNullException(nameof(contentTypeService));
-            if (valueConnectors == null) throw new ArgumentNullException(nameof(valueConnectors));
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-            _contentTypeService = contentTypeService;
-            _valueConnectorsLazy = valueConnectors;
-            _logger = logger;
+            _contentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService));
+            _valueConnectorsLazy = valueConnectors ?? throw new ArgumentNullException(nameof(valueConnectors));
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
         public sealed override string ToArtifact(object value, PropertyType propertyType, ICollection<ArtifactDependency> dependencies, IContextCache contextCache)