Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve GetRegistrationResult #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improve GetRegistrationResult #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions BoDi/BoDi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public RegistrationKey(Type type, string name)
Name = name;
}

private Type TypeGroup
internal Type TypeGroup
{
get
{
Expand Down Expand Up @@ -843,47 +843,49 @@ private object Resolve(Type typeToResolve, ResolutionList resolutionPath, string
return resolvedObject;
}

private KeyValuePair<ObjectContainer, IRegistration>? GetRegistrationResult(RegistrationKey keyToResolve)
private KeyValuePair<ObjectContainer, IRegistration> GetRegistrationResult(RegistrationKey keyToResolve)
{
IRegistration registration;
if (registrations.TryGetValue(keyToResolve, out registration))
if (registrations.TryGetValue(keyToResolve, out var registration))
{
return new KeyValuePair<ObjectContainer, IRegistration>(this, registration);
}

if (baseContainer != null)
return baseContainer.GetRegistrationResult(keyToResolve);

if (IsSpecialNamedInstanceDictionaryKey(keyToResolve))
{
var targetType = keyToResolve.Type.GetGenericArguments()[1];
return GetRegistrationResult(CreateNamedInstanceDictionaryKey(targetType));
return baseContainer.GetRegistrationResult(keyToResolve);
}

// if there was no named registration, we still return an empty dictionary
if (IsDefaultNamedInstanceDictionaryKey(keyToResolve))
if (IsNamedInstanceDictionaryKey(keyToResolve))
{
return new KeyValuePair<ObjectContainer, IRegistration>(this, new NamedInstanceDictionaryRegistration());
var genericArguments = keyToResolve.Type.GetGenericArguments();
if (IsSpecialNamed(genericArguments[0]))
{
return GetRegistrationResult(CreateNamedInstanceDictionaryKey(genericArguments[1]));
}

// if there was no named registration, we still return an empty dictionary
if (IsDefaultNamed(genericArguments[0]))
{
return new KeyValuePair<ObjectContainer, IRegistration>(this, new NamedInstanceDictionaryRegistration());
}
}

return null;
return new KeyValuePair<ObjectContainer, IRegistration>(this, EnsureImplicitRegistration(keyToResolve));
}

private bool IsDefaultNamedInstanceDictionaryKey(RegistrationKey keyToResolve)
private static bool IsSpecialNamed(Type genericType)
{
return IsNamedInstanceDictionaryKey(keyToResolve) &&
keyToResolve.Type.GetGenericArguments()[0] == typeof(string);
return genericType.IsEnum;
}

private bool IsSpecialNamedInstanceDictionaryKey(RegistrationKey keyToResolve)
private static bool IsDefaultNamed(Type genericType)
{
return IsNamedInstanceDictionaryKey(keyToResolve) &&
keyToResolve.Type.GetGenericArguments()[0].IsEnum;
return genericType == typeof(string);
}

private bool IsNamedInstanceDictionaryKey(RegistrationKey keyToResolve)
private static bool IsNamedInstanceDictionaryKey(RegistrationKey keyToResolve)
{
return keyToResolve.Name == null && keyToResolve.Type.IsGenericType && keyToResolve.Type.GetGenericTypeDefinition() == typeof(IDictionary<,>);
return keyToResolve.Name is null && keyToResolve.TypeGroup == typeof(IDictionary<,>);
}

private object GetPooledObject(RegistrationKey pooledObjectKey)
Expand Down Expand Up @@ -914,13 +916,9 @@ private object ResolveObject(RegistrationKey keyToResolve, ResolutionList resolu

var registrationResult = GetRegistrationResult(keyToResolve);

var registrationToUse = registrationResult ??
new KeyValuePair<ObjectContainer, IRegistration>(this, EnsureImplicitRegistration(keyToResolve));
var resolutionPathForResolve = registrationResult.Key == this ? resolutionPath : new ResolutionList();
var result = registrationResult.Value.Resolve(registrationResult.Key, keyToResolve, resolutionPathForResolve);

var resolutionPathForResolve = registrationToUse.Key == this ?
resolutionPath : new ResolutionList();
var result = registrationToUse.Value.Resolve(registrationToUse.Key, keyToResolve, resolutionPathForResolve);

return result;
}

Expand Down