Skip to content

Commit 5231c7b

Browse files
authored
Merge pull request #33 from ENikS/master
Fixing #23, #27, #31
2 parents 8445c14 + 7bc897d commit 5231c7b

35 files changed

+133
-140
lines changed

src/Attributes/DependencyAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public DependencyAttribute(string name)
3838
public string Name { get; }
3939

4040
/// <summary>
41-
/// Create an instance of <see cref="IDependencyResolverPolicy"/> that
41+
/// Create an instance of <see cref="IResolverPolicy"/> that
4242
/// will be used to get the value for the member this attribute is
4343
/// applied to.
4444
/// </summary>
4545
/// <param name="typeToResolve">Type of parameter or property that
4646
/// this attribute is decoration.</param>
4747
/// <returns>The resolver object.</returns>
48-
public override IDependencyResolverPolicy CreateResolver(Type typeToResolve)
48+
public override IResolverPolicy CreateResolver(Type typeToResolve)
4949
{
5050
return new NamedTypeDependencyResolverPolicy(typeToResolve, Name);
5151
}

src/Attributes/DependencyResolutionAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ namespace Unity.Attributes
1313
public abstract class DependencyResolutionAttribute : Attribute
1414
{
1515
/// <summary>
16-
/// Create an instance of <see cref="IDependencyResolverPolicy"/> that
16+
/// Create an instance of <see cref="IResolverPolicy"/> that
1717
/// will be used to get the value for the member this attribute is
1818
/// applied to.
1919
/// </summary>
2020
/// <param name="typeToResolve">Type of parameter or property that
2121
/// this attribute is decoration.</param>
2222
/// <returns>The resolver object.</returns>
23-
public abstract IDependencyResolverPolicy CreateResolver(Type typeToResolve);
23+
public abstract IResolverPolicy CreateResolver(Type typeToResolve);
2424
}
2525
}

src/Attributes/OptionalDependencyAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public OptionalDependencyAttribute(string name)
3838
public string Name { get; }
3939

4040
/// <summary>
41-
/// Create an instance of <see cref="IDependencyResolverPolicy"/> that
41+
/// Create an instance of <see cref="IResolverPolicy"/> that
4242
/// will be used to get the value for the member this attribute is
4343
/// applied to.
4444
/// </summary>
4545
/// <param name="typeToResolve">Type of parameter or property that
4646
/// this attribute is decoration.</param>
4747
/// <returns>The resolver object.</returns>
48-
public override IDependencyResolverPolicy CreateResolver(Type typeToResolve)
48+
public override IResolverPolicy CreateResolver(Type typeToResolve)
4949
{
5050
return new OptionalDependencyResolverPolicy(typeToResolve, Name);
5151
}

src/Builder/IBuilderContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ public interface IBuilderContext
115115
void AddResolverOverrides(IEnumerable<ResolverOverride> newOverrides);
116116

117117
/// <summary>
118-
/// GetOrDefault a <see cref="IDependencyResolverPolicy"/> object for the given <paramref name="dependencyType"/>
118+
/// GetOrDefault a <see cref="IResolverPolicy"/> object for the given <paramref name="dependencyType"/>
119119
/// or null if that dependency hasn't been overridden.
120120
/// </summary>
121121
/// <param name="dependencyType">Type of the dependency.</param>
122122
/// <returns>Resolver to use, or null if no override matches for the current operation.</returns>
123-
IDependencyResolverPolicy GetOverriddenResolver(Type dependencyType);
123+
IResolverPolicy GetOverriddenResolver(Type dependencyType);
124124

125125
/// <summary>
126126
/// A method to do a new buildup operation on an existing context.

src/Builder/Policy/FactoryDelegateBuildPlanPolicy.cs

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/Builder/Selection/PropertySelectorBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ public virtual IEnumerable<SelectedProperty> SelectProperties(IBuilderContext co
4949

5050
private SelectedProperty CreateSelectedProperty(PropertyInfo property)
5151
{
52-
IDependencyResolverPolicy resolver = this.CreateResolver(property);
52+
IResolverPolicy resolver = this.CreateResolver(property);
5353
return new SelectedProperty(property, resolver);
5454
}
5555

5656
/// <summary>
57-
/// Create a <see cref="IDependencyResolverPolicy"/> for the given
57+
/// Create a <see cref="IResolverPolicy"/> for the given
5858
/// property.
5959
/// </summary>
6060
/// <param name="property">Property to create resolver for.</param>
6161
/// <returns>The resolver object.</returns>
62-
protected abstract IDependencyResolverPolicy CreateResolver(PropertyInfo property);
62+
protected abstract IResolverPolicy CreateResolver(PropertyInfo property);
6363
}
6464
}

src/Builder/Selection/SelectedConstructor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Unity.Builder.Selection
88
/// <summary>
99
/// Objects of this type are the return value from <see cref="IConstructorSelectorPolicy.SelectConstructor"/>.
1010
/// It encapsulates the desired <see cref="ConstructorInfo"/> with the string keys
11-
/// needed to look up the <see cref="IDependencyResolverPolicy"/> for each
11+
/// needed to look up the <see cref="IResolverPolicy"/> for each
1212
/// parameter.
1313
/// </summary>
1414
public class SelectedConstructor : SelectedMemberWithParameters<ConstructorInfo>

src/Builder/Selection/SelectedMemberWithParameters.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ namespace Unity.Builder.Selection
1111
/// </summary>
1212
public class SelectedMemberWithParameters
1313
{
14-
private readonly List<IDependencyResolverPolicy> _parameterResolvers = new List<IDependencyResolverPolicy>();
14+
private readonly List<IResolverPolicy> _parameterResolvers = new List<IResolverPolicy>();
1515

1616
/// <summary>
1717
/// Adds the parameter resolver. Resolvers are assumed
1818
/// to be in the order of the parameters to the member.
1919
/// </summary>
2020
/// <param name="newResolver">The new resolver.</param>
21-
public void AddParameterResolver(IDependencyResolverPolicy newResolver)
21+
public void AddParameterResolver(IResolverPolicy newResolver)
2222
{
2323
_parameterResolvers.Add(newResolver);
2424
}
@@ -27,7 +27,7 @@ public void AddParameterResolver(IDependencyResolverPolicy newResolver)
2727
/// Gets the parameter resolvers.
2828
/// </summary>
2929
/// <returns>An array with the parameter resolvers.</returns>
30-
public IDependencyResolverPolicy[] GetParameterResolvers()
30+
public IResolverPolicy[] GetParameterResolvers()
3131
{
3232
return _parameterResolvers.ToArray();
3333
}

src/Builder/Selection/SelectedMethod.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Unity.Builder.Selection
88
/// <summary>
99
/// Objects of this type are the return value from <see cref="IMethodSelectorPolicy.SelectMethods"/>.
1010
/// It encapsulates the desired <see cref="MethodInfo"/> with the string keys
11-
/// needed to look up the <see cref="IDependencyResolverPolicy"/> for each
11+
/// needed to look up the <see cref="IResolverPolicy"/> for each
1212
/// parameter.
1313
/// </summary>
1414
public class SelectedMethod : SelectedMemberWithParameters<MethodInfo>

src/Builder/Selection/SelectedProperty.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SelectedProperty
2020
/// </summary>
2121
/// <param name="property">The property.</param>
2222
/// <param name="resolver"></param>
23-
public SelectedProperty(PropertyInfo property, IDependencyResolverPolicy resolver)
23+
public SelectedProperty(PropertyInfo property, IResolverPolicy resolver)
2424
{
2525
Property = property;
2626
Resolver = resolver;
@@ -34,6 +34,6 @@ public SelectedProperty(PropertyInfo property, IDependencyResolverPolicy resolve
3434
/// <summary>
3535
/// IDependencyResolverPolicy for this property
3636
/// </summary>
37-
public IDependencyResolverPolicy Resolver { get; }
37+
public IResolverPolicy Resolver { get; }
3838
}
3939
}

0 commit comments

Comments
 (0)