Implementation refactoring.

Author: hypercodeplace

LazyProxy.Autofac.Tests/AutofacExtensionTests.cs

@@ -384,25 +384,20 @@ public void InstancePerLifetimeScopeServiceLifetimeMustBeActualForOpenGenericSer
  }
 
  [Theory]
- [InlineData(ServiceLifetime.Unknown, null)]
- [InlineData(ServiceLifetime.Unknown, "name")]
- [InlineData(ServiceLifetime.InstancePerDependency, null)]
- [InlineData(ServiceLifetime.InstancePerDependency, "name")]
- public void InstancePerDependencyServiceLifetimeMustBeActual(ServiceLifetime lifetime, string name) =>
+ [InlineData(null)]
+ [InlineData("name")]
+ public void InstancePerDependencyServiceLifetimeMustBeActual(string name) =>
  AssertInstancePerDependencyServiceLifetimeMustBeActual<IService>(
- typeof(IService), typeof(Service), lifetime, name);
+ typeof(IService), typeof(Service), name);
 
  [Theory]
- [InlineData(ServiceLifetime.Unknown, null)]
- [InlineData(ServiceLifetime.Unknown, "name")]
- [InlineData(ServiceLifetime.InstancePerDependency, null)]
- [InlineData(ServiceLifetime.InstancePerDependency, "name")]
- public void InstancePerDependencyServiceLifetimeMustBeActualForOpenGenericService(
- ServiceLifetime lifetime, string name)
+ [InlineData(null)]
+ [InlineData("name")]
+ public void InstancePerDependencyServiceLifetimeMustBeActualForOpenGenericService(string name)
  {
  AssertInstancePerDependencyServiceLifetimeMustBeActual<
  IGenericService<ParameterType1, ParameterType2, ParameterType3>>(
- typeof(IGenericService<,,>), typeof(GenericService<,,>), lifetime, name);
+ typeof(IGenericService<,,>), typeof(GenericService<,,>), name);
  }
 
  #endregion
@@ -459,7 +454,7 @@ private IEnumerable<Guid> All()
  private static void AssertSingleInstanceServiceLifetimeMustBeActual<T>(Type typeFrom, Type typeTo, string name)
  {
  var containerBuilder = new ContainerBuilder();
- containerBuilder.RegisterLazy(typeFrom, typeTo, name, ServiceLifetime.SingleInstance);
+ containerBuilder.RegisterLazy(typeFrom, typeTo, name).SingleInstance();
 
  using (var container = containerBuilder.Build()) {
  var resolves = GetResolves<T>(container, name);
@@ -482,7 +477,7 @@ private static void AssertInstancePerLifetimeScopeServiceLifetimeMustBeActual<T>
  Type typeFrom, Type typeTo, string name)
  {
  var containerBuilder = new ContainerBuilder();
- containerBuilder.RegisterLazy(typeFrom, typeTo, name, ServiceLifetime.InstancePerLifetimeScope);
+ containerBuilder.RegisterLazy(typeFrom, typeTo, name).InstancePerLifetimeScope();
 
  using (var container = containerBuilder.Build()) {
  var resolves = GetResolves<T>(container, name);
@@ -511,10 +506,10 @@ private static void AssertInstancePerLifetimeScopeServiceLifetimeMustBeActual<T>
  }
 
  private static void AssertInstancePerDependencyServiceLifetimeMustBeActual<T>(
- Type typeFrom, Type typeTo, ServiceLifetime lifetime, string name)
+ Type typeFrom, Type typeTo, string name)
  {
  var containerBuilder = new ContainerBuilder();
- containerBuilder.RegisterLazy(typeFrom, typeTo, name, lifetime);
+ containerBuilder.RegisterLazy(typeFrom, typeTo, name).InstancePerDependency();
 
  using (var container = containerBuilder.Build()) {
  var resolves = GetResolves<T>(container, name)

LazyProxy.Autofac/AutofacExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using Autofac;
+using Autofac.Builder;
 
 namespace LazyProxy.Autofac
 {
@@ -8,59 +9,32 @@ namespace LazyProxy.Autofac
  /// </summary>
  public static class AutofacExtensions
  {
- /// <summary>
- /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
- /// The real class To will be instantiated only after first method execution.
- /// </summary>
- /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <typeparam name="TFrom">The binded interface.</typeparam>
- /// <typeparam name="TTo">The binded class.</typeparam>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy<TFrom, TTo>(this ContainerBuilder builder)
- where TTo : TFrom where TFrom : class =>
- builder.RegisterLazy<TFrom, TTo>(null, ServiceLifetime.InstancePerDependency);
-
- /// <summary>
- /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
- /// The real class To will be instantiated only after first method or property execution.
- /// </summary>
- /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="name">The registration name.</param>
- /// <typeparam name="TFrom">The binded interface.</typeparam>
- /// <typeparam name="TTo">The binded class.</typeparam>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy<TFrom, TTo>(this ContainerBuilder builder, string name)
- where TTo : TFrom where TFrom : class =>
- builder.RegisterLazy<TFrom, TTo>(name, ServiceLifetime.InstancePerDependency);
-
  /// <summary>
  /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
  /// The real class To will be instantiated only after first method or property execution.
  /// </summary>
  /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="serviceLifetime">The instance lifetime.</param>
  /// <typeparam name="TFrom">The binded interface.</typeparam>
  /// <typeparam name="TTo">The binded class.</typeparam>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy<TFrom, TTo>(
- this ContainerBuilder builder, ServiceLifetime serviceLifetime)
+ /// <returns>The instance of the Autofac registration builder.</returns>
+ public static IRegistrationBuilder<object, SimpleActivatorData, SingleRegistrationStyle>
+ RegisterLazy<TFrom, TTo>(this ContainerBuilder builder)
  where TTo : TFrom where TFrom : class =>
- builder.RegisterLazy<TFrom, TTo>(null, serviceLifetime);
+ builder.RegisterLazy(typeof(TFrom), typeof(TTo), null);
 
  /// <summary>
  /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
  /// The real class To will be instantiated only after first method or property execution.
  /// </summary>
  /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="name">The registration name.</param>
- /// <param name="serviceLifetime">The instance lifetime.</param>
+ /// <param name="name">The registration name. Null if named registration is not required.</param>
  /// <typeparam name="TFrom">The binded interface.</typeparam>
  /// <typeparam name="TTo">The binded class.</typeparam>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy<TFrom, TTo>(
- this ContainerBuilder builder, string name, ServiceLifetime serviceLifetime)
+ /// <returns>The instance of the Autofac registration builder.</returns>
+ public static IRegistrationBuilder<object, SimpleActivatorData, SingleRegistrationStyle>
+ RegisterLazy<TFrom, TTo>(this ContainerBuilder builder, string name)
  where TTo : TFrom where TFrom : class =>
- builder.RegisterLazy(typeof(TFrom), typeof(TTo), name, serviceLifetime);
+ builder.RegisterLazy(typeof(TFrom), typeof(TTo), name);
 
  /// <summary>
  /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
@@ -69,36 +43,10 @@ public static ContainerBuilder RegisterLazy<TFrom, TTo>(
  /// <param name="typeFrom">The binded interface.</param>
  /// <param name="typeTo">The binded class.</param>
  /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy(
- this ContainerBuilder builder, Type typeFrom, Type typeTo) =>
- builder.RegisterLazy(typeFrom, typeTo, null, ServiceLifetime.InstancePerDependency);
-
- /// <summary>
- /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
- /// The real class To will be instantiated only after first method or property execution.
- /// </summary>
- /// <param name="typeFrom">The binded interface.</param>
- /// <param name="typeTo">The binded class.</param>
- /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="name">The registration name.</param>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy(
- this ContainerBuilder builder, Type typeFrom, Type typeTo, string name) =>
- builder.RegisterLazy(typeFrom, typeTo, name, ServiceLifetime.InstancePerDependency);
-
- /// <summary>
- /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
- /// The real class To will be instantiated only after first method or property execution.
- /// </summary>
- /// <param name="typeFrom">The binded interface.</param>
- /// <param name="typeTo">The binded class.</param>
- /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="serviceLifetime">The instance lifetime.</param>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy(
- this ContainerBuilder builder, Type typeFrom, Type typeTo, ServiceLifetime serviceLifetime) =>
- builder.RegisterLazy(typeFrom, typeTo, null, serviceLifetime);
+ /// <returns>The instance of the Autofac registration builder.</returns>
+ public static IRegistrationBuilder<object, SimpleActivatorData, SingleRegistrationStyle>
+ RegisterLazy(this ContainerBuilder builder, Type typeFrom, Type typeTo) =>
+ builder.RegisterLazy(typeFrom, typeTo, null);
 
  /// <summary>
  /// Is used to register interface TFrom to class TTo by creation a lazy proxy at runtime.
@@ -107,11 +55,10 @@ public static ContainerBuilder RegisterLazy(
  /// <param name="typeFrom">The binded interface.</param>
  /// <param name="typeTo">The binded class.</param>
  /// <param name="builder">The instance of the Autofac container builder.</param>
- /// <param name="name">The registration name.</param>
- /// <param name="serviceLifetime">The instance lifetime.</param>
- /// <returns>The instance of the Autofac container builder.</returns>
- public static ContainerBuilder RegisterLazy(
- this ContainerBuilder builder, Type typeFrom, Type typeTo, string name, ServiceLifetime serviceLifetime)
+ /// <param name="name">The registration name. Null if named registration is not required.</param>
+ /// <returns>The instance of the Autofac registration builder.</returns>
+ public static IRegistrationBuilder<object, SimpleActivatorData, SingleRegistrationStyle>
+ RegisterLazy(this ContainerBuilder builder, Type typeFrom, Type typeTo, string name)
  {
  // There is no way to constraint it on the compilation step.
  if (!typeFrom.IsInterface)
@@ -132,52 +79,9 @@ public static ContainerBuilder RegisterLazy(
  );
  });
 
-// Variant 2 (Overrides dont work
-// builder.RegisterType(typeTo).Named(registrationName, typeTo);
-//
-// var funcType = typeof(Func<>);
-// var factoryType = funcType.MakeGenericType(typeTo);
-//
-// var registration = builder.Register((c, p) =>
-// LazyProxyBuilder.CreateInstance(typeFrom, (Func<object>)c.ResolveNamed(registrationName, factoryType)));
-
- if (name == null)
- {
- registration.As(typeFrom);
- }
- else
- {
- registration.Named(name, typeFrom);
- }
-
- switch (serviceLifetime)
- {
- case ServiceLifetime.Unknown:
- case ServiceLifetime.InstancePerDependency:
- registration.InstancePerDependency().ExternallyOwned();
- break;
- case ServiceLifetime.SingleInstance:
- registration.SingleInstance();
- break;
- case ServiceLifetime.InstancePerLifetimeScope:
- registration.InstancePerLifetimeScope();
- break;
- default:
- throw new ArgumentOutOfRangeException(nameof(serviceLifetime), serviceLifetime, null);
- }
-
- return builder;
+ return name == null
+ ? registration.As(typeFrom)
+ : registration.Named(name, typeFrom);
  }
  }
-
- /// <summary>
- /// Service lifetime provided by the IoC container.
- /// </summary>
- public enum ServiceLifetime
- {
- Unknown = 0,
- SingleInstance = 1,
- InstancePerLifetimeScope = 2,
- InstancePerDependency = 3
- }
 }