SimonG
/
LightweightIocContainer
mirror of https://github.com/SimonG96/LightweightIocContainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#44: validator only checks if types can be created, doesn't really create them

Browse Source
pull/57/head
Simon G 4 years ago
parent e062031aac
commit 2ba8c3d963
4 changed files with 33 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      LightweightIocContainer/IocContainer.cs
  2. 10
      LightweightIocContainer/LightweightIocContainer.xml
  3. 21
      LightweightIocContainer/Validation/IocValidator.cs
  4. 2
      Test.LightweightIocContainer/IocValidatorTest.cs

39
LightweightIocContainer/IocContainer.cs
Unescape View File

@ -113,17 +113,6 @@ namespace LightweightIocContainer
/// <returns>An instance of the given <see cref="Type"/></returns> /// <returns>An instance of the given <see cref="Type"/></returns>
public T Resolve<T>(params object[] arguments) => ResolveInternal<T>(arguments); public T Resolve<T>(params object[] arguments) => ResolveInternal<T>(arguments);
/// <summary>
/// Gets an instance of the given <see cref="Type"/>
/// </summary>
/// <param name="type">The given <see cref="Type"/></param>
/// <param name="arguments">The constructor arguments</param>
/// <param name="resolveStack">The current resolve stack</param>
/// <returns>An instance of the given <see cref="Type"/></returns>
/// <exception cref="InternalResolveException">Could not find function <see cref="ResolveInternal{T}"/></exception>
internal object? Resolve(Type type, object?[]? arguments, List<Type>? resolveStack) =>
GenericMethodCaller.CallPrivate(this, nameof(ResolveInternal), type, arguments, resolveStack);
/// <summary> /// <summary>
/// Gets an instance of a given registered <see cref="Type"/> /// Gets an instance of a given registered <see cref="Type"/>
/// </summary> /// </summary>
@ -145,7 +134,7 @@ namespace LightweightIocContainer
/// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception> /// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception>
/// <exception cref="NoMatchingConstructorFoundException">No matching constructor for the given <see cref="Type"/> found</exception> /// <exception cref="NoMatchingConstructorFoundException">No matching constructor for the given <see cref="Type"/> found</exception>
/// <exception cref="InternalResolveException">Getting resolve stack failed without exception</exception> /// <exception cref="InternalResolveException">Getting resolve stack failed without exception</exception>
private object TryResolve<T>(object[]? arguments, List<Type>? resolveStack) private object TryResolve<T>(object?[]? arguments, List<Type>? resolveStack)
{ {
IRegistration registration = FindRegistration<T>() ?? throw new TypeNotRegisteredException(typeof(T)); IRegistration registration = FindRegistration<T>() ?? throw new TypeNotRegisteredException(typeof(T));
@ -204,7 +193,7 @@ namespace LightweightIocContainer
/// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception> /// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception>
/// <exception cref="NoMatchingConstructorFoundException">No matching constructor for the given <see cref="Type"/> found</exception> /// <exception cref="NoMatchingConstructorFoundException">No matching constructor for the given <see cref="Type"/> found</exception>
/// <exception cref="InternalResolveException">Getting resolve stack failed without exception</exception> /// <exception cref="InternalResolveException">Getting resolve stack failed without exception</exception>
private object? TryResolveNonGeneric(Type type, object[]? arguments, List<Type> resolveStack) => internal object? TryResolveNonGeneric(Type type, object?[]? arguments, List<Type>? resolveStack) =>
GenericMethodCaller.CallPrivate(this, nameof(TryResolve), type, arguments, resolveStack); GenericMethodCaller.CallPrivate(this, nameof(TryResolve), type, arguments, resolveStack);
/// <summary> /// <summary>
@ -301,7 +290,7 @@ namespace LightweightIocContainer
/// <param name="arguments">The given arguments</param> /// <param name="arguments">The given arguments</param>
/// <typeparam name="T">The <see cref="Type"/> of the instance</typeparam> /// <typeparam name="T">The <see cref="Type"/> of the instance</typeparam>
/// <returns>An already existing instance if possible, null if not</returns> /// <returns>An already existing instance if possible, null if not</returns>
private object? TryGetExistingInstance<T>(IRegistration registration, IReadOnlyList<object>? arguments) => private object? TryGetExistingInstance<T>(IRegistration registration, IReadOnlyList<object?>? arguments) =>
registration switch registration switch
{ {
ITypedFactoryRegistration<T> typedFactoryRegistration => typedFactoryRegistration.Factory.Factory, ITypedFactoryRegistration<T> typedFactoryRegistration => typedFactoryRegistration.Factory.Factory,
@ -325,7 +314,7 @@ namespace LightweightIocContainer
/// <param name="arguments">The given arguments</param> /// <param name="arguments">The given arguments</param>
/// <returns>A multiton instance if existing for the given <see cref="IRegistration"/>, null if not</returns> /// <returns>A multiton instance if existing for the given <see cref="IRegistration"/>, null if not</returns>
/// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception> /// <exception cref="MultitonResolveException">Tried resolving a multiton without scope argument</exception>
private object? TryGetMultitonInstance(IMultitonRegistration registration, IReadOnlyList<object>? arguments) private object? TryGetMultitonInstance(IMultitonRegistration registration, IReadOnlyList<object?>? arguments)
{ {
if (arguments == null || !arguments.Any()) if (arguments == null || !arguments.Any())
throw new MultitonResolveException("Can not resolve multiton without arguments.", registration.InterfaceType); throw new MultitonResolveException("Can not resolve multiton without arguments.", registration.InterfaceType);
@ -394,7 +383,7 @@ namespace LightweightIocContainer
/// <param name="registration">The <see cref="IRegistrationBase"/> of the given <see cref="Type"/></param> /// <param name="registration">The <see cref="IRegistrationBase"/> of the given <see cref="Type"/></param>
/// <param name="arguments">The constructor arguments</param> /// <param name="arguments">The constructor arguments</param>
/// <returns>The argument list updated with the <see cref="IWithParametersInternal.Parameters"/></returns> /// <returns>The argument list updated with the <see cref="IWithParametersInternal.Parameters"/></returns>
private object[]? UpdateArgumentsWithRegistrationParameters(IWithParametersInternal registration, object[]? arguments) private object?[]? UpdateArgumentsWithRegistrationParameters(IWithParametersInternal registration, object?[]? arguments)
{ {
if (registration.Parameters == null) if (registration.Parameters == null)
return arguments; return arguments;
@ -402,7 +391,7 @@ namespace LightweightIocContainer
if (arguments != null && arguments.Any()) //if more arguments were passed to resolve if (arguments != null && arguments.Any()) //if more arguments were passed to resolve
{ {
int argumentsSize = registration.Parameters.Length + arguments.Length; int argumentsSize = registration.Parameters.Length + arguments.Length;
object[] newArguments = new object[argumentsSize]; object?[] newArguments = new object[argumentsSize];
for (int i = 0; i < argumentsSize; i++) for (int i = 0; i < argumentsSize; i++)
{ {
@ -416,7 +405,7 @@ namespace LightweightIocContainer
} }
} }
object firstArgument = arguments.FirstOrGiven<object, InternalResolvePlaceholder>(a => a is not InternalResolvePlaceholder); //find the first argument that is not a placeholder object? firstArgument = arguments.FirstOrGiven<object?, InternalResolvePlaceholder>(a => a is not InternalResolvePlaceholder); //find the first argument that is not a placeholder
if (firstArgument is InternalResolvePlaceholder) //no more arguments available if (firstArgument is InternalResolvePlaceholder) //no more arguments available
break; //there won't be any more arguments break; //there won't be any more arguments
@ -445,7 +434,7 @@ namespace LightweightIocContainer
/// <para>parameters: The parameters needed to resolve the given <see cref="Type"/></para> /// <para>parameters: The parameters needed to resolve the given <see cref="Type"/></para>
/// <para>exception: A <see cref="NoMatchingConstructorFoundException"/> if no matching constructor was found</para> /// <para>exception: A <see cref="NoMatchingConstructorFoundException"/> if no matching constructor was found</para>
/// </returns> /// </returns>
private (bool result, List<object?>? parameters, NoMatchingConstructorFoundException? exception) TryGetTypeResolveStack(Type type, object[]? arguments, List<Type> resolveStack) private (bool result, List<object?>? parameters, NoMatchingConstructorFoundException? exception) TryGetTypeResolveStack(Type type, object?[]? arguments, List<Type> resolveStack)
{ {
NoMatchingConstructorFoundException? noMatchingConstructorFoundException = null; NoMatchingConstructorFoundException? noMatchingConstructorFoundException = null;
@ -477,7 +466,7 @@ namespace LightweightIocContainer
/// <para>parameters: The parameters needed to resolve the given <see cref="Type"/></para> /// <para>parameters: The parameters needed to resolve the given <see cref="Type"/></para>
/// <para>exception: A List of <see cref="ConstructorNotMatchingException"/>s if the constructor is not matching</para> /// <para>exception: A List of <see cref="ConstructorNotMatchingException"/>s if the constructor is not matching</para>
/// </returns> /// </returns>
private (bool result, List<object?>? parameters, List<ConstructorNotMatchingException>? exceptions) TryGetConstructorResolveStack(ConstructorInfo constructor, object[]? arguments, List<Type> resolveStack) private (bool result, List<object?>? parameters, List<ConstructorNotMatchingException>? exceptions) TryGetConstructorResolveStack(ConstructorInfo constructor, object?[]? arguments, List<Type> resolveStack)
{ {
List<ParameterInfo> constructorParameters = constructor.GetParameters().ToList(); List<ParameterInfo> constructorParameters = constructor.GetParameters().ToList();
if (!constructorParameters.Any()) if (!constructorParameters.Any())
@ -486,17 +475,17 @@ namespace LightweightIocContainer
List<ConstructorNotMatchingException> exceptions = new(); List<ConstructorNotMatchingException> exceptions = new();
List<object?> parameters = new(); List<object?> parameters = new();
List<object>? passedArguments = null; List<object?>? passedArguments = null;
if (arguments != null) if (arguments != null)
passedArguments = new List<object>(arguments); passedArguments = new List<object?>(arguments);
foreach (ParameterInfo parameter in constructorParameters) foreach (ParameterInfo parameter in constructorParameters)
{ {
object? fittingArgument = new InternalResolvePlaceholder(); object? fittingArgument = new InternalResolvePlaceholder();
if (passedArguments != null) if (passedArguments != null)
{ {
fittingArgument = passedArguments.FirstOrGiven<object, InternalResolvePlaceholder>(a => fittingArgument = passedArguments.FirstOrGiven<object?, InternalResolvePlaceholder>(a =>
a.GetType() == parameter.ParameterType || parameter.ParameterType.IsInstanceOfType(a)); a?.GetType() == parameter.ParameterType || parameter.ParameterType.IsInstanceOfType(a));
if (fittingArgument is not InternalResolvePlaceholder) if (fittingArgument is not InternalResolvePlaceholder)
passedArguments.Remove(fittingArgument); passedArguments.Remove(fittingArgument);
@ -515,7 +504,7 @@ namespace LightweightIocContainer
if (fittingArgument is InternalResolvePlaceholder && passedArguments != null) if (fittingArgument is InternalResolvePlaceholder && passedArguments != null)
{ {
fittingArgument = passedArguments.FirstOrGiven<object, InternalResolvePlaceholder>(a => parameter.ParameterType.GetDefault() == a); fittingArgument = passedArguments.FirstOrGiven<object?, InternalResolvePlaceholder>(a => parameter.ParameterType.GetDefault() == a);
if (fittingArgument is not InternalResolvePlaceholder) if (fittingArgument is not InternalResolvePlaceholder)
passedArguments.Remove(fittingArgument); passedArguments.Remove(fittingArgument);

10
LightweightIocContainer/LightweightIocContainer.xml
Unescape View File

@ -935,16 +935,6 @@
<param name="arguments">The constructor arguments</param> <param name="arguments">The constructor arguments</param>
<returns>An instance of the given <see cref="T:System.Type"/></returns> <returns>An instance of the given <see cref="T:System.Type"/></returns>
</member> </member>
<member name="M:LightweightIocContainer.IocContainer.Resolve(System.Type,System.Object[],System.Collections.Generic.List{System.Type})">
<summary>
Gets an instance of the given <see cref="T:System.Type"/>
</summary>
<param name="type">The given <see cref="T:System.Type"/></param>
<param name="arguments">The constructor arguments</param>
<param name="resolveStack">The current resolve stack</param>
<returns>An instance of the given <see cref="T:System.Type"/></returns>
<exception cref="T:LightweightIocContainer.Exceptions.InternalResolveException">Could not find function <see cref="M:LightweightIocContainer.IocContainer.ResolveInternal``1(System.Object[],System.Collections.Generic.List{System.Type})"/></exception>
</member>
<member name="M:LightweightIocContainer.IocContainer.ResolveInternal``1(System.Object[],System.Collections.Generic.List{System.Type})"> <member name="M:LightweightIocContainer.IocContainer.ResolveInternal``1(System.Object[],System.Collections.Generic.List{System.Type})">
<summary> <summary>
Gets an instance of a given registered <see cref="T:System.Type"/> Gets an instance of a given registered <see cref="T:System.Type"/>

21
LightweightIocContainer/Validation/IocValidator.cs
Unescape View File

@ -72,7 +72,7 @@ namespace LightweightIocContainer.Validation
{ {
try try
{ {
_iocContainer.Resolve(type, arguments, null); _iocContainer.TryResolveNonGeneric(type, arguments, null);
} }
catch (Exception exception) catch (Exception exception)
{ {
@ -81,7 +81,22 @@ namespace LightweightIocContainer.Validation
} }
private T GetMock<T>() where T : class => new Mock<T>().Object; private T GetMock<T>() where T : class => new Mock<T>().Object;
private object? GetMockOrDefault(Type type) => private object? GetMockOrDefault(Type type)
type.IsValueType ? Activator.CreateInstance(type) : GenericMethodCaller.CallPrivate(this, nameof(GetMock), type); {
if (type.IsValueType)
return Activator.CreateInstance(type);
if (type == typeof(string))
return string.Empty;
try
{
return GenericMethodCaller.CallPrivate(this, nameof(GetMock), type);
}
catch (Exception)
{
return null;
}
}
} }
} }

2
Test.LightweightIocContainer/IocValidatorTest.cs
Unescape View File

@ -81,7 +81,7 @@ namespace Test.LightweightIocContainer
validator.Validate(); validator.Validate();
parameterMock.Verify(p => p.Method(), Times.Once); parameterMock.Verify(p => p.Method(), Times.Never);
} }
[Test] [Test]

Write Preview
Loading…
Cancel
Save