Added "log an continue" behavior on content item handlers

--HG--
branch : theming

src/Orchard/ContentManagement/DefaultContentManager.cs

@@ -11,6 +11,7 @@ using Orchard.ContentManagement.Records;
 using Orchard.Data;
 using Orchard.DisplayManagement;
 using Orchard.Indexing;
+using Orchard.Logging;
 
 namespace Orchard.ContentManagement {
     public class DefaultContentManager : IContentManager {
@@ -37,8 +38,11 @@ namespace Orchard.ContentManagement {
             _contentDefinitionManager = contentDefinitionManager;
             _contentManagerSession = contentManagerSession;
             _shapeHelperFactory = shapeHelperFactory;
+            Logger = NullLogger.Instance;
         }
 
+        public ILogger Logger { get; set; }
+
         private IEnumerable<IContentHandler> _handlers;
         public IEnumerable<IContentHandler> Handlers {
             get {
@@ -66,9 +70,8 @@ namespace Orchard.ContentManagement {
             };
 
             // invoke handlers to weld aspects onto kernel
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Activating(context), Logger);
-                handler.Activating(context);
+
-            }
             var context2 = new ActivatedContentContext {
                 ContentType = contentType,
                 ContentItem = context.Builder.Build()
@@ -77,18 +80,14 @@ namespace Orchard.ContentManagement {
             // back-reference for convenience (e.g. getting metadata when in a view)
             context2.ContentItem.ContentManager = this;
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Activated(context2), Logger);
-                handler.Activated(context2);
-            }
 
             var context3 = new InitializingContentContext {
                 ContentType = context2.ContentType,
                 ContentItem = context2.ContentItem,
             };
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Initializing(context3), Logger);
-                handler.Initializing(context3);
-            }
 
             // composite result is returned
             return context3.ContentItem;
@@ -141,12 +140,8 @@ namespace Orchard.ContentManagement {
             var context = new LoadContentContext(contentItem);
 
             // invoke handlers to acquire state, or at least establish lazy loading callbacks
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Loading(context), Logger);
-                handler.Loading(context);
+            Handlers.Invoke(handler => handler.Loaded(context), Logger);
-            }
-            foreach (var handler in Handlers) {
-                handler.Loaded(context);
-            }
 
             // when draft is required and latest is published a new version is appended 
             if (options.IsDraftRequired && versionRecord.Published) {
@@ -200,18 +195,14 @@ namespace Orchard.ContentManagement {
             var context = new PublishContentContext(contentItem, previous);
 
             // invoke handlers to acquire state, or at least establish lazy loading callbacks
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Publishing(context), Logger);
-                handler.Publishing(context);
-            }
 
             if (previous != null) {
                 previous.Published = false;
             }
             contentItem.VersionRecord.Published = true;
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Published(context), Logger);
-                handler.Published(context);
-            }
         }
 
         public virtual void Unpublish(ContentItem contentItem) {
@@ -237,24 +228,18 @@ namespace Orchard.ContentManagement {
                 PublishingItemVersionRecord = null
             };
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Publishing(context), Logger);
-                handler.Publishing(context);
-            }
 
             publishedItem.VersionRecord.Published = false;
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Published(context), Logger);
-                handler.Published(context);
-            }
         }
 
         public virtual void Remove(ContentItem contentItem) {
             var activeVersions = _contentItemVersionRepository.Fetch(x => x.ContentItemRecord == contentItem.Record && (x.Published || x.Latest));
             var context = new RemoveContentContext(contentItem);
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Removing(context), Logger);
-                handler.Removing(context);
-            }
 
             foreach (var version in activeVersions) {
                 if (version.Published) {
@@ -265,9 +250,7 @@ namespace Orchard.ContentManagement {
                 }
             }
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Removed(context), Logger);
-                handler.Removed(context);
-            }
         }
 
         protected virtual ContentItem BuildNewVersion(ContentItem existingContentItem) {
@@ -308,12 +291,8 @@ namespace Orchard.ContentManagement {
                 ExistingItemVersionRecord = existingItemVersionRecord,
                 BuildingItemVersionRecord = buildingItemVersionRecord,
             };
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Versioning(context), Logger);
-                handler.Versioning(context);
+            Handlers.Invoke(handler => handler.Versioned(context), Logger);
-            }
-            foreach (var handler in Handlers) {
-                handler.Versioned(context);
-            }
 
             return context.BuildingContentItem;
         }
@@ -354,25 +333,17 @@ namespace Orchard.ContentManagement {
 
 
             // invoke handlers to add information to persistent stores
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Creating(context), Logger);
-                handler.Creating(context);
+            Handlers.Invoke(handler => handler.Created(context), Logger);
-            }
-            foreach (var handler in Handlers) {
-                handler.Created(context);
-            }
 
             if (options.IsPublished) {
                 var publishContext = new PublishContentContext(contentItem, null);
 
                 // invoke handlers to acquire state, or at least establish lazy loading callbacks
-                foreach (var handler in Handlers) {
+                Handlers.Invoke(handler => handler.Publishing(publishContext), Logger);
-                    handler.Publishing(publishContext);
-                }
 
                 // invoke handlers to acquire state, or at least establish lazy loading callbacks
-                foreach (var handler in Handlers) {
+                Handlers.Invoke(handler => handler.Published(publishContext), Logger);
-                    handler.Published(publishContext);
-                }
             }
         }
 
@@ -381,46 +352,40 @@ namespace Orchard.ContentManagement {
                 ContentItem = content.ContentItem,
                 Metadata = new ContentItemMetadata(content)
             };
-            foreach (var handler in Handlers) {
+
-                handler.GetContentItemMetadata(context);
+            Handlers.Invoke(handler => handler.GetContentItemMetadata(context), Logger);
-                //-- was - from ContentItemDriver --
+            //-- was - from ContentItemDriver --
-                //void IContentItemDriver.GetContentItemMetadata(GetContentItemMetadataContext context) {
+            //void IContentItemDriver.GetContentItemMetadata(GetContentItemMetadataContext context) {
-                //  var item = context.ContentItem.As<TContent>();
+            //  var item = context.ContentItem.As<TContent>();
-                //  if (item != null) {
+            //  if (item != null) {
-                //    context.Metadata.DisplayText = GetDisplayText(item) ?? context.Metadata.DisplayText;
+            //    context.Metadata.DisplayText = GetDisplayText(item) ?? context.Metadata.DisplayText;
-                //    context.Metadata.DisplayRouteValues = GetDisplayRouteValues(item) ?? context.Metadata.DisplayRouteValues;
+            //    context.Metadata.DisplayRouteValues = GetDisplayRouteValues(item) ?? context.Metadata.DisplayRouteValues;
-                //    context.Metadata.EditorRouteValues = GetEditorRouteValues(item) ?? context.Metadata.EditorRouteValues;
+            //    context.Metadata.EditorRouteValues = GetEditorRouteValues(item) ?? context.Metadata.EditorRouteValues;
-                //    context.Metadata.CreateRouteValues = GetCreateRouteValues(item) ?? context.Metadata.CreateRouteValues;
+            //    context.Metadata.CreateRouteValues = GetCreateRouteValues(item) ?? context.Metadata.CreateRouteValues;
-                //  }
+            //  }
-                //}
+            //}
-            }
+
             return context.Metadata;
         }
 
         public dynamic BuildDisplayModel<TContent>(TContent content, string displayType) where TContent : IContent {
             var shapeHelper = _shapeHelperFactory.CreateHelper();
             var context = new BuildDisplayModelContext(content, displayType, shapeHelper.Create("Item", Arguments.Empty()), _shapeHelperFactory);
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.BuildDisplayShape(context), Logger);
-                handler.BuildDisplayShape(context);
-            }
             return context.Model;
         }
 
         public dynamic BuildEditorModel<TContent>(TContent content) where TContent : IContent {
             var shapeHelper = _shapeHelperFactory.CreateHelper();
             var context = new BuildEditorModelContext(content, shapeHelper.Create("Item", Arguments.Empty()), _shapeHelperFactory);
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.BuildEditorShape(context), Logger);
-                handler.BuildEditorShape(context);
-            }
             return context.Model;
         }
 
         public dynamic UpdateEditorModel<TContent>(TContent content, IUpdateModel updater) where TContent : IContent {
             var shapeHelper = _shapeHelperFactory.CreateHelper();
             var context = new UpdateEditorModelContext(content, updater, shapeHelper.Create("Item", Arguments.Empty()), _shapeHelperFactory);
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.UpdateEditorShape(context), Logger);
-                handler.UpdateEditorShape(context);
-            }
             return context.Model;
         }
 
@@ -447,13 +412,9 @@ namespace Orchard.ContentManagement {
             var indexContentContext = new IndexContentContext(contentItem, documentIndex);
 
             // dispatch to handlers to retrieve index information
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Indexing(indexContentContext), Logger);
-                handler.Indexing(indexContentContext);
-            }
 
-            foreach (var handler in Handlers) {
+            Handlers.Invoke(handler => handler.Indexed(indexContentContext), Logger);
-                handler.Indexed(indexContentContext);
-            }
         }
 
         //public ISearchBuilder Search() {