Async support for Lifetime

Author: ENikS

src/Extensions/Container/UnityContainerAsync.cs

@@ -806,24 +806,11 @@ public static IUnityContainerAsync RegisterFactory(this IUnityContainerAsync con
         public static T ResolveAsync<T>(this IUnityContainerAsync container, params ResolverOverride[] overrides)
         {
             var unity = container ?? throw new ArgumentNullException(nameof(container));
-            var value  = unity.ResolveAsync(typeof(T), null, overrides);
+            var task  = unity.ResolveAsync(typeof(T), null, overrides);
 
-            if (value.IsCompleted) return (T) value.Result;
-
-            try
-            {
-                var task = value.AsTask();
-                task.Wait();
-
-                return (T) task.Result;
-            }
-            catch (AggregateException ex)
-            {
-                if (1 == ex.InnerExceptions.Count)
-                    throw ex.InnerException;
-
-                throw;
-            }
+            return task.IsCompleted
+                ? (T)task.Result
+                : (T)task.GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -839,24 +826,11 @@ public static T ResolveAsync<T>(this IUnityContainerAsync container, params Reso
         public static T ResolveAsync<T>(this IUnityContainerAsync container, string name, params ResolverOverride[] overrides)
         {
             var unity = container ?? throw new ArgumentNullException(nameof(container));
-            var value = unity.ResolveAsync(typeof(T), name, overrides);
-
-            if (value.IsCompleted) return (T)value.Result;
-
-            try
-            {
-                var task = value.AsTask();
-                task.Wait();
-
-                return (T)task.Result;
-            }
-            catch (AggregateException ex)
-            {
-                if (1 == ex.InnerExceptions.Count)
-                    throw ex.InnerException;
+            var task = unity.ResolveAsync(typeof(T), name, overrides);
 
-                throw;
-            }
+            return task.IsCompleted
+                ? (T)task.Result
+                : (T)task.GetAwaiter().GetResult();
         }
 
         /// <summary>

src/Lifetime/Abstracts/LifetimeManager.cs

@@ -8,8 +8,6 @@ namespace Unity.Lifetime
     /// </summary>
     public abstract class LifetimeManager 
     {
-        protected object SyncRoot { get; } = new object();
-
         /// <summary>
         /// This value represents Invalid Value. Lifetime manager must return this
         /// unless value is set with a valid object. Null is a value and is not equal 
@@ -28,8 +26,42 @@ public abstract class LifetimeManager
         /// <value>True is this instance already in use, False otherwise.</value>
         public virtual bool InUse { get; set; }
 
+        
+        #region Constructors
+
+        public LifetimeManager()
+        {
+            Set    = SetValue;
+            Get    = GetValue;
+            TryGet = TryGetValue;
+        }
+        
+        #endregion
+
 
-        #region LifetimeManager Members
+        #region  Optimizers
+
+        public virtual Func<ILifetimeContainer, object> TryGet { get; protected set; }
+
+        public virtual Func<ILifetimeContainer, object> Get { get; protected set; }
+
+        public virtual Action<object, ILifetimeContainer> Set { get; protected set; }
+
+        #endregion
+
+
+        #region   LifetimeManager Members
+
+        /// <summary>
+        /// Retrieves a value from the backing store associated with this Lifetime policy.
+        /// </summary>
+        /// <remarks>
+        /// This method does not block and does not acquire a lock on synchronization 
+        /// primitives.
+        /// </remarks>
+        /// <param name="container">The container this lifetime is associated with</param>
+        /// <returns>the object desired, or null if no such object is currently stored.</returns>
+        public virtual object TryGetValue(ILifetimeContainer container = null) => GetValue(container);
 
         /// <summary>
         /// Retrieves a value from the backing store associated with this Lifetime policy.

src/Lifetime/Abstracts/SynchronizedLifetimeManager.cs

@@ -35,6 +35,20 @@ public abstract class SynchronizedLifetimeManager : LifetimeManager, IDisposable
 
         #endregion
 
+        /// <inheritdoc/>
+        public override object TryGetValue(ILifetimeContainer container = null)
+        {
+            if (Monitor.TryEnter(_lock))
+            {
+                var result = SynchronizedGetValue(container);
+                Monitor.Exit(_lock);
+                return result;
+            }
+            else
+                return NoValue;
+        }
+
+
         /// <inheritdoc/>
         public override object GetValue(ILifetimeContainer container = null)
         {

src/Lifetime/Managers/ContainerControlledLifetimeManager.cs

@@ -33,18 +33,16 @@ public class ContainerControlledLifetimeManager : SynchronizedLifetimeManager,
         /// <value>This field holds a strong reference to the associated object.</value>
         protected object Value = NoValue;
 
-        private Func<ILifetimeContainer, object> _currentGetValue;
-        private Action<object, ILifetimeContainer> _currentSetValue;
-
         #endregion
 
 
         #region Constructor
 
         public ContainerControlledLifetimeManager()
         {
-            _currentGetValue = base.GetValue;
-            _currentSetValue = base.SetValue;
+            Set    = base.SetValue;
+            Get    = base.GetValue;
+            TryGet = base.TryGetValue;
         }
 
         #endregion
@@ -55,34 +53,26 @@ public ContainerControlledLifetimeManager()
         /// <inheritdoc/>
         public override object GetValue(ILifetimeContainer container = null)
         {
-            return _currentGetValue(container);
+            return Get(container);
         }
 
         /// <inheritdoc/>
         public override void SetValue(object newValue, ILifetimeContainer container = null)
         {
-            _currentSetValue(newValue, container);
-            _currentSetValue = (o, c) => throw new InvalidOperationException("InjectionParameterValue of ContainerControlledLifetimeManager can only be set once");
-            _currentGetValue = SynchronizedGetValue;
+            Set(newValue, container);
+            Set = (o, c) => throw new InvalidOperationException("ContainerControlledLifetimeManager can only be set once");
+            Get    = SynchronizedGetValue;
+            TryGet = SynchronizedGetValue;
         }
 
         /// <inheritdoc/>
-        protected override object SynchronizedGetValue(ILifetimeContainer container = null)
-        {
-            return Value;
-        }
+        protected override object SynchronizedGetValue(ILifetimeContainer container = null) => Value;
 
         /// <inheritdoc/>
-        protected override void SynchronizedSetValue(object newValue, ILifetimeContainer container = null)
-        {
-            Value = newValue;
-        }
+        protected override void SynchronizedSetValue(object newValue, ILifetimeContainer container = null) => Value = newValue;
 
         /// <inheritdoc/>
-        public override void RemoveValue(ILifetimeContainer container = null)
-        {
-            Dispose();
-        }
+        public override void RemoveValue(ILifetimeContainer container = null) => Dispose();
 
         #endregion
 

src/Lifetime/Managers/ExternallyControlledLifetimeManager.cs

@@ -13,7 +13,7 @@ public class ExternallyControlledLifetimeManager : LifetimeManager,
     {
         #region Fields
 
-        private WeakReference _value = new WeakReference(NoValue);
+        private WeakReference _value;
 
         #endregion
 
@@ -27,7 +27,14 @@ public class ExternallyControlledLifetimeManager : LifetimeManager,
         /// <returns>the object desired, or null if no such object is currently stored.</returns>
         public override object GetValue(ILifetimeContainer container = null)
         {
-            return _value.Target;
+            if (null == _value) return NoValue;
+
+            var target = _value.Target;
+            if (_value.IsAlive) return target;
+
+            _value = null;
+
+            return NoValue;
         }
 
         /// <summary>