Added ErrorHandlingInterceptor

Author: scott-xu

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+- Implemented an abstract `ErrorHandlingInterceptor`
+
 ## [3.3.0] - 2017-09-26
 
 ### Added

src/Ninject.Extensions.Interception/AsyncInterceptor.cs

@@ -6,7 +6,6 @@
 // </copyright>
 // -------------------------------------------------------------------------------------------------
 
-#if !NET_35 && !SILVERLIGHT
 namespace Ninject.Extensions.Interception
 {
     using System.Reflection;
@@ -109,5 +108,4 @@ private void InterceptTaskWithResult<TResult>(IInvocation invocation)
                         });
         }
     }
-}
-#endif
+}

src/Ninject.Extensions.Interception/ErrorHandlingInterceptor.cs

@@ -0,0 +1,86 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="ErrorHandlingInterceptor.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2007-2010, Enkari, Ltd.
+//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
+// </copyright>
+// -------------------------------------------------------------------------------------------------
+
+namespace Ninject.Extensions.Interception
+{
+    using System;
+
+    /// <summary>
+    /// A simple definition of an interceptor, which can take action both before and after
+    /// the invocation proceeds.
+    /// </summary>
+    public abstract class ErrorHandlingInterceptor : IInterceptor
+    {
+        private readonly IInterceptor interceptor;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorHandlingInterceptor"/> class.
+        /// </summary>
+        protected ErrorHandlingInterceptor()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ErrorHandlingInterceptor"/> class.
+        /// </summary>
+        /// <param name="interceptor">The interceptor to decorate.</param>
+        protected ErrorHandlingInterceptor(IInterceptor interceptor)
+        {
+            this.interceptor = interceptor;
+        }
+
+        /// <summary>
+        /// Intercepts the specified invocation.
+        /// </summary>
+        /// <param name="invocation">The invocation to intercept.</param>
+        public void Intercept(IInvocation invocation)
+        {
+            try
+            {
+                if (this.interceptor == null)
+                {
+                    invocation.Proceed();
+                }
+                else
+                {
+                    this.interceptor.Intercept(invocation);
+                }
+            }
+            catch (Exception exception)
+            {
+                if (!this.HandleException(invocation, exception))
+                {
+                    throw;
+                }
+            }
+            finally
+            {
+                this.CompleteInvoke(invocation);
+            }
+        }
+
+        /// <summary>
+        /// Handles exception for the invocation proceeding.
+        /// </summary>
+        /// <param name="invocation">The invocation that is being intercepted.</param>
+        /// <param name="exception">The exception when proceed the invocation.</param>
+        /// <returns>A boolean value indicating whether the exception is being handled or not.</returns>
+        protected virtual bool HandleException(IInvocation invocation, Exception exception)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Takes some action after the invocation proceeds, no matter the proceeding is success or failed.
+        /// </summary>
+        /// <param name="invocation">The invocation that is being intercepted.</param>
+        protected virtual void CompleteInvoke(IInvocation invocation)
+        {
+        }
+    }
+}

src/Ninject.Extensions.Interception/Infrastructure/Language/KernelExtensions.cs

@@ -64,8 +64,6 @@ public static void AddMethodInterceptor(
             kernel.Components.Get<IMethodInterceptorRegistry>().Add(method, interceptor);
         }
 
-#if !NETCF
-
         /// <summary>
         /// Intercepts the given method call and replaces it with the proxy action.
         /// </summary>
@@ -346,7 +344,5 @@ private static PropertyInfo GetPropertyFromExpression<T>(Expression<Func<T, obje
 
             return (PropertyInfo)memberExpr.Member;
         }
-
-#endif
     }
 }