Auto status change to "Under Review"
@@ -0,0 +1,125 | |||
|
1 | using System; | |
|
2 | using System.Collections.Generic; | |
|
3 | using System.Text.RegularExpressions; | |
|
4 | using Implab.Diagnostics; | |
|
5 | ||
|
6 | namespace Implab.ServiceHost.Unity { | |
|
7 | using System.Linq; | |
|
8 | using System.Reflection; | |
|
9 | using System.Text; | |
|
10 | using global::Unity; | |
|
11 | using global::Unity.Registration; | |
|
12 | using Implab.Xml; | |
|
13 | using static Trace<ContainerBuilder>; | |
|
14 | ||
|
15 | public class ContainerBuilder { | |
|
16 | ||
|
17 | readonly TypeResolver m_resolver; | |
|
18 | ||
|
19 | readonly UnityContainer m_container; | |
|
20 | ||
|
21 | readonly ContainerConfigurationSchema m_schema; | |
|
22 | ||
|
23 | public UnityContainer Container { | |
|
24 | get { | |
|
25 | return m_container; | |
|
26 | } | |
|
27 | } | |
|
28 | ||
|
29 | public ContainerBuilder() : this(null, null) { | |
|
30 | } | |
|
31 | ||
|
32 | public ContainerBuilder(UnityContainer container, ContainerConfigurationSchema schema) { | |
|
33 | m_container = container ?? new UnityContainer(); | |
|
34 | m_resolver = new TypeResolver(); | |
|
35 | m_schema = schema ?? ContainerConfigurationSchema.Default; | |
|
36 | } | |
|
37 | ||
|
38 | public Type ResolveType(string typeReference) { | |
|
39 | return m_resolver.Resolve(typeReference); | |
|
40 | } | |
|
41 | ||
|
42 | internal void Visit(RegisterElement registerElement) { | |
|
43 | var registrationType = ResolveType(registerElement.RegistrationType); | |
|
44 | var implementationType = string.IsNullOrEmpty(registerElement.MapToType) ? registrationType : ResolveType(registerElement.MapToType); | |
|
45 | ||
|
46 | var registrationContext = new TypeRegistrationBuilder( | |
|
47 | m_resolver, | |
|
48 | registrationType, | |
|
49 | implementationType | |
|
50 | ); | |
|
51 | ||
|
52 | if (registerElement.Injectors != null) { | |
|
53 | foreach (var injector in registerElement.Injectors) { | |
|
54 | injector.Visit(registrationContext); | |
|
55 | } | |
|
56 | } | |
|
57 | ||
|
58 | m_container.RegisterType( | |
|
59 | registrationContext.RegistrationType, | |
|
60 | registrationContext.ImplementationType, | |
|
61 | registerElement.Name, | |
|
62 | registerElement.Lifetime?.GetLifetimeManager(this), | |
|
63 | registrationContext.Injections | |
|
64 | ); | |
|
65 | } | |
|
66 | ||
|
67 | internal void Visit(SerializedElement serializedElement) { | |
|
68 | var registrationType = ResolveType(serializedElement.RegistrationType); | |
|
69 | var valueBuilder = new InjectionValueBuilder(m_resolver, null); | |
|
70 | ||
|
71 | valueBuilder.Visit(serializedElement); | |
|
72 | ||
|
73 | m_container.RegisterInstance( | |
|
74 | registrationType, | |
|
75 | serializedElement.Name, | |
|
76 | valueBuilder.Value, | |
|
77 | serializedElement.Lifetime?.GetLifetimeManager(this) | |
|
78 | ); | |
|
79 | } | |
|
80 | ||
|
81 | internal void Visit(ValueElement valueElement) { | |
|
82 | var registrationType = ResolveType(valueElement.RegistrationType); | |
|
83 | var valueBuilder = new InjectionValueBuilder(m_resolver, null); | |
|
84 | ||
|
85 | valueBuilder.Visit(valueElement); | |
|
86 | ||
|
87 | m_container.RegisterInstance( | |
|
88 | registrationType, | |
|
89 | valueElement.Name, | |
|
90 | valueBuilder.Value, | |
|
91 | valueElement.Lifetime?.GetLifetimeManager(this) | |
|
92 | ); | |
|
93 | } | |
|
94 | ||
|
95 | internal void Visit(NamespaceElement namespaceElement) { | |
|
96 | m_resolver.AddNamespace(namespaceElement.Name); | |
|
97 | } | |
|
98 | ||
|
99 | internal void Visit(AssemblyElement assemblyElement) { | |
|
100 | Assembly.Load(assemblyElement.AssemblyName); | |
|
101 | } | |
|
102 | ||
|
103 | internal void Visit(IncludeElement includeElement) { | |
|
104 | Include(includeElement.Href); | |
|
105 | } | |
|
106 | ||
|
107 | public void Include(string file) { | |
|
108 | var includeContext = new ContainerBuilder(m_container, m_schema); | |
|
109 | includeContext.LoadConfig(file); | |
|
110 | } | |
|
111 | ||
|
112 | public void LoadConfig(string file) { | |
|
113 | var config = m_schema.LoadFile(file); | |
|
114 | Visit(config); | |
|
115 | } | |
|
116 | ||
|
117 | internal void Visit(ContainerElement containerElement) { | |
|
118 | foreach (var item in containerElement.Items) | |
|
119 | item.Visit(this); | |
|
120 | } | |
|
121 | ||
|
122 | ||
|
123 | ||
|
124 | } | |
|
125 | } No newline at end of file |
@@ -0,0 +1,7 | |||
|
1 | namespace Implab.ServiceHost.Unity { | |
|
2 | public class FactoryInjectionElement : AbstractInjectionElement { | |
|
3 | internal override void Visit(TypeRegistrationBuilder context) { | |
|
4 | ||
|
5 | } | |
|
6 | } | |
|
7 | } No newline at end of file |
@@ -0,0 +1,64 | |||
|
1 | using System; | |
|
2 | using System.ComponentModel; | |
|
3 | using System.Xml.Serialization; | |
|
4 | using Unity.Injection; | |
|
5 | ||
|
6 | namespace Implab.ServiceHost.Unity { | |
|
7 | ||
|
8 | public class InjectionValueBuilder { | |
|
9 | ||
|
10 | readonly TypeResolver m_resolver; | |
|
11 | ||
|
12 | public Type DefaultType { get; private set; } | |
|
13 | ||
|
14 | public Type ValueType { get; set; } | |
|
15 | ||
|
16 | public object Value { get; set; } | |
|
17 | ||
|
18 | public InjectionParameterValue Injection { | |
|
19 | get { | |
|
20 | if (Value != null) | |
|
21 | return InjectionParameterValue.ToParameter(Value); | |
|
22 | ||
|
23 | return new InjectionParameter(ValueType, null); | |
|
24 | } | |
|
25 | } | |
|
26 | ||
|
27 | internal InjectionValueBuilder(TypeResolver resolver, Type acceptsType) { | |
|
28 | m_resolver = resolver; | |
|
29 | DefaultType = acceptsType; | |
|
30 | } | |
|
31 | ||
|
32 | public Type ResolveType(string typeSpec) { | |
|
33 | if (string.IsNullOrEmpty(typeSpec)) { | |
|
34 | if (DefaultType == null) | |
|
35 | throw new Exception("The type must be specified"); | |
|
36 | return DefaultType; | |
|
37 | } | |
|
38 | return m_resolver.Resolve(typeSpec); | |
|
39 | } | |
|
40 | ||
|
41 | public void Visit(ITextValue value) { | |
|
42 | ValueType = ResolveType(value.TypeName); | |
|
43 | ||
|
44 | Value = string.IsNullOrEmpty(value.Value) ? | |
|
45 | Safe.CreateDefaultValue(ValueType) : | |
|
46 | TypeDescriptor.GetConverter(ValueType).ConvertFromString(value.Value); | |
|
47 | } | |
|
48 | ||
|
49 | public void Visit(ISerializedValue value) { | |
|
50 | ValueType = ResolveType(value.TypeName); | |
|
51 | ||
|
52 | var serializer = new XmlSerializer(ValueType); | |
|
53 | ||
|
54 | using (var reader = value.GetReader()) | |
|
55 | Value = new InjectionParameter(ValueType, serializer.Deserialize(reader)); | |
|
56 | } | |
|
57 | ||
|
58 | public void Visit(IDependencyReference value) { | |
|
59 | ValueType = ResolveType(value.TypeName); | |
|
60 | Value = new ResolvedParameter(ValueType, value.DependencyName); | |
|
61 | } | |
|
62 | ||
|
63 | } | |
|
64 | } No newline at end of file |
@@ -0,0 +1,21 | |||
|
1 | using System; | |
|
2 | using System.Collections.Generic; | |
|
3 | using System.ComponentModel; | |
|
4 | using System.Linq; | |
|
5 | using System.Xml.Serialization; | |
|
6 | using Implab.Xml; | |
|
7 | using Unity.Injection; | |
|
8 | using Unity.Registration; | |
|
9 | ||
|
10 | namespace Implab.ServiceHost.Unity { | |
|
11 | public abstract class RegistrationBuilder { | |
|
12 | public Type RegistrationType { | |
|
13 | get; | |
|
14 | private set; | |
|
15 | } | |
|
16 | ||
|
17 | protected RegistrationBuilder(Type registrationType) { | |
|
18 | RegistrationType = registrationType; | |
|
19 | } | |
|
20 | } | |
|
21 | } No newline at end of file |
@@ -0,0 +1,77 | |||
|
1 | using System; | |
|
2 | using System.Collections.Generic; | |
|
3 | using System.Linq; | |
|
4 | using Unity.Injection; | |
|
5 | using Unity.Registration; | |
|
6 | ||
|
7 | namespace Implab.ServiceHost.Unity { | |
|
8 | public class TypeRegistrationBuilder : RegistrationBuilder { | |
|
9 | ||
|
10 | readonly TypeResolver m_resolver; | |
|
11 | ||
|
12 | readonly List<InjectionMember> m_injections = new List<InjectionMember>(); | |
|
13 | ||
|
14 | public InjectionMember[] Injections { get { return m_injections.ToArray(); } } | |
|
15 | ||
|
16 | public Type ImplementationType { | |
|
17 | get; | |
|
18 | private set; | |
|
19 | } | |
|
20 | ||
|
21 | internal TypeRegistrationBuilder(TypeResolver resolver, Type registrationType, Type implementationType) : base(registrationType) { | |
|
22 | ImplementationType = implementationType; | |
|
23 | ||
|
24 | // when registering a generic mapping, register all generic parameter names as local types | |
|
25 | if (ImplementationType.IsGenericTypeDefinition) { | |
|
26 | m_resolver = new TypeResolver(resolver); | |
|
27 | ||
|
28 | foreach (var p in ImplementationType.GetGenericArguments()) | |
|
29 | m_resolver.AddMapping(p.Name, p); | |
|
30 | } else { | |
|
31 | m_resolver = resolver; | |
|
32 | } | |
|
33 | } | |
|
34 | ||
|
35 | internal void Visit(ConstructorInjectionElement constructorInjection) { | |
|
36 | ||
|
37 | ||
|
38 | var parameters = constructorInjection.Parameters? | |
|
39 | .Select(x => { | |
|
40 | var valueBuilder = new InjectionValueBuilder(m_resolver, null); | |
|
41 | x.Visit(valueBuilder); | |
|
42 | return valueBuilder.Injection; | |
|
43 | }) | |
|
44 | .ToArray(); | |
|
45 | ||
|
46 | var injection = parameters != null ? new InjectionConstructor(parameters) : new InjectionConstructor(); | |
|
47 | m_injections.Add(injection); | |
|
48 | } | |
|
49 | ||
|
50 | internal void Visit(MethodInjectionElement methodInjection) { | |
|
51 | var valueContext = new InjectionValueBuilder(m_resolver, null); | |
|
52 | ||
|
53 | var parameters = methodInjection.Parameters? | |
|
54 | .Select(x => { | |
|
55 | var valueBuilder = new InjectionValueBuilder(m_resolver, null); | |
|
56 | x.Visit(valueBuilder); | |
|
57 | return valueBuilder.Injection; | |
|
58 | }) | |
|
59 | .ToArray(); | |
|
60 | ||
|
61 | var injection = parameters != null ? new InjectionMethod(methodInjection.Name, parameters) : new InjectionMethod(methodInjection.Name); | |
|
62 | m_injections.Add(injection); | |
|
63 | } | |
|
64 | ||
|
65 | internal void Visit(PropertyInjectionElement propertyInjection) { | |
|
66 | if (propertyInjection.Value == null) | |
|
67 | throw new Exception($"A value value must be specified for the property '{propertyInjection.Name}'"); | |
|
68 | ||
|
69 | var propertyType = RegistrationType.GetProperty(propertyInjection.Name)?.PropertyType; | |
|
70 | var valueContext = new InjectionValueBuilder(m_resolver, propertyType); | |
|
71 | ||
|
72 | propertyInjection.Value.Visit(valueContext); | |
|
73 | var injection = new InjectionProperty(propertyInjection.Name, valueContext.Injection); | |
|
74 | m_injections.Add(injection); | |
|
75 | } | |
|
76 | } | |
|
77 | } No newline at end of file |
@@ -50,7 +50,7 namespace Implab.Playground { | |||
|
50 | 50 | var stopwatch = new Stopwatch(); |
|
51 | 51 | stopwatch.Start(); |
|
52 | 52 | |
|
53 |
var ctx = new Container |
|
|
53 | var ctx = new ContainerBuilder(); | |
|
54 | 54 | |
|
55 | 55 | Console.WriteLine($"Created: {stopwatch.ElapsedMilliseconds}"); |
|
56 | 56 |
@@ -38,7 +38,7 | |||
|
38 | 38 | </register> |
|
39 | 39 | |
|
40 | 40 | <serialized type="Foo+Bar"> |
|
41 | <Bar id="1"> | |
|
41 | <Bar xmlns="" id="1"> | |
|
42 | 42 | <Name>Baaar</Name> |
|
43 | 43 | </Bar> |
|
44 | 44 | </serialized> |
@@ -1,8 +1,10 | |||
|
1 | 1 | using System; |
|
2 | 2 | |
|
3 | namespace Implab.ServiceHost.Unity | |
|
4 | { | |
|
3 | namespace Implab.ServiceHost.Unity { | |
|
4 | /// <summary> | |
|
5 | /// Base class for injections, each injection is applied to the type registration context. | |
|
6 | /// </summary> | |
|
5 | 7 | public abstract class AbstractInjectionElement { |
|
6 |
internal abstract void Visit(TypeRegistration |
|
|
8 | internal abstract void Visit(TypeRegistrationBuilder context); | |
|
7 | 9 | } |
|
8 | 10 | } No newline at end of file |
@@ -27,9 +27,5 namespace Implab.ServiceHost.Unity | |||
|
27 | 27 | [XmlAttribute("type")] |
|
28 | 28 | public string RegistrationType { get; set; } |
|
29 | 29 | |
|
30 | public virtual Type ResolveRegistrationType(ContainerContext ctx) { | |
|
31 | return ctx.Resolve(RegistrationType); | |
|
32 | } | |
|
33 | ||
|
34 | 30 | } |
|
35 | 31 | } No newline at end of file |
@@ -7,7 +7,7 namespace Implab.ServiceHost.Unity | |||
|
7 | 7 | [XmlAttribute("name")] |
|
8 | 8 | public string AssemblyName { get; set; } |
|
9 | 9 | |
|
10 |
public override void Visit(Container |
|
|
10 | public override void Visit(ContainerBuilder context) { | |
|
11 | 11 | context.Visit(this); |
|
12 | 12 | } |
|
13 | 13 | } |
@@ -9,7 +9,7 namespace Implab.ServiceHost.Unity { | |||
|
9 | 9 | [XmlElement("default", typeof(DefaultParameterElement))] |
|
10 | 10 | public InjectionParameterElement[] Parameters { get; set; } |
|
11 | 11 | |
|
12 |
internal override void Visit(TypeRegistration |
|
|
12 | internal override void Visit(TypeRegistrationBuilder context) { | |
|
13 | 13 | context.Visit(this); |
|
14 | 14 | } |
|
15 | 15 | } |
@@ -55,6 +55,8 namespace Implab.ServiceHost.Unity { | |||
|
55 | 55 | var schema = new ContainerConfigurationSchema(); |
|
56 | 56 | |
|
57 | 57 | schema.RegisterContainerElement<RegisterElement>("register"); |
|
58 | schema.RegisterContainerElement<SerializedElement>("serialized"); | |
|
59 | schema.RegisterContainerElement<ValueElement>("value"); | |
|
58 | 60 | schema.RegisterContainerElement<IncludeElement>("include"); |
|
59 | 61 | schema.RegisterContainerElement<AssemblyElement>("assembly"); |
|
60 | 62 | schema.RegisterContainerElement<NamespaceElement>("namespace"); |
@@ -10,7 +10,7 namespace Implab.ServiceHost.Unity { | |||
|
10 | 10 | |
|
11 | 11 | public List<ContainerItemElement> Items {get; set; } = new List<ContainerItemElement>(); |
|
12 | 12 | |
|
13 |
public override void Visit(Container |
|
|
13 | public override void Visit(ContainerBuilder context) { | |
|
14 | 14 | context.Visit(this); |
|
15 | 15 | } |
|
16 | 16 | } |
@@ -1,5 +1,5 | |||
|
1 | 1 | namespace Implab.ServiceHost.Unity { |
|
2 | 2 | public abstract class ContainerItemElement { |
|
3 |
public abstract void Visit(Container |
|
|
3 | public abstract void Visit(ContainerBuilder context); | |
|
4 | 4 | } |
|
5 | 5 | } No newline at end of file |
@@ -3,7 +3,7 using Unity.Lifetime; | |||
|
3 | 3 | namespace Implab.ServiceHost.Unity |
|
4 | 4 | { |
|
5 | 5 | public class ContainerLifetimeElement : LifetimeElement { |
|
6 |
public override LifetimeManager GetLifetimeManager(Container |
|
|
6 | public override LifetimeManager GetLifetimeManager(ContainerBuilder ctx) { | |
|
7 | 7 | return new ContainerControlledLifetimeManager(); |
|
8 | 8 | } |
|
9 | 9 | } |
@@ -3,7 +3,7 using Unity.Lifetime; | |||
|
3 | 3 | namespace Implab.ServiceHost.Unity |
|
4 | 4 | { |
|
5 | 5 | public class ContextLifetimeElement : LifetimeElement { |
|
6 |
public override LifetimeManager GetLifetimeManager(Container |
|
|
6 | public override LifetimeManager GetLifetimeManager(ContainerBuilder ctx) { | |
|
7 | 7 | return new PerResolveLifetimeManager(); |
|
8 | 8 | } |
|
9 | 9 | } |
@@ -1,9 +1,12 | |||
|
1 | 1 | namespace Implab.ServiceHost.Unity |
|
2 | 2 | { |
|
3 | public class DefaultParameterElement : InjectionParameterElement { | |
|
4 | internal override object Resolve(InjectionValueContext context) { | |
|
5 | var type = context.ResolveType(TypeName); | |
|
6 | return Safe.CreateDefaultValue(type); | |
|
3 | public class DefaultParameterElement : InjectionParameterElement, ITextValue { | |
|
4 | public string Value { | |
|
5 | get { return null; } | |
|
6 | } | |
|
7 | ||
|
8 | internal override void Visit(InjectionValueBuilder builder) { | |
|
9 | builder.Visit(this); | |
|
7 | 10 | } |
|
8 | 11 | } |
|
9 | 12 | } No newline at end of file |
@@ -1,12 +1,16 | |||
|
1 | 1 | using System.Xml.Serialization; |
|
2 | 2 | |
|
3 | 3 | namespace Implab.ServiceHost.Unity { |
|
4 | public class DependencyParameterElement : InjectionParameterElement { | |
|
4 | public class DependencyParameterElement : InjectionParameterElement, IDependencyReference { | |
|
5 | 5 | |
|
6 | 6 | [XmlAttribute("name")] |
|
7 | 7 | public string DependencyName { get; set; } |
|
8 | 8 | |
|
9 | 9 | [XmlAttribute("optional")] |
|
10 | 10 | public bool Optional { get; set; } |
|
11 | ||
|
12 | internal override void Visit(InjectionValueBuilder builder) { | |
|
13 | builder.Visit(this); | |
|
14 | } | |
|
11 | 15 | } |
|
12 | 16 | } No newline at end of file |
@@ -3,7 +3,7 using Unity.Lifetime; | |||
|
3 | 3 | namespace Implab.ServiceHost.Unity |
|
4 | 4 | { |
|
5 | 5 | public class HierarchicalLifetimeElement : LifetimeElement { |
|
6 |
public override LifetimeManager GetLifetimeManager(Container |
|
|
6 | public override LifetimeManager GetLifetimeManager(ContainerBuilder ctx) { | |
|
7 | 7 | return new HierarchicalLifetimeManager(); |
|
8 | 8 | } |
|
9 | 9 | } |
@@ -1,5 +1,8 | |||
|
1 | 1 | namespace Implab.ServiceHost.Unity { |
|
2 | 2 | public interface IDependencyReference { |
|
3 | string Name { get; set; } | |
|
3 | ||
|
4 | string TypeName { get; set; } | |
|
5 | ||
|
6 | string DependencyName { get; set; } | |
|
4 | 7 | } |
|
5 | 8 | } No newline at end of file |
@@ -1,7 +1,11 | |||
|
1 | namespace Implab.ServiceHost.Unity | |
|
2 | { | |
|
3 | public class ISerializedValue | |
|
4 | { | |
|
1 | using System.Xml; | |
|
2 | ||
|
3 | namespace Implab.ServiceHost.Unity { | |
|
4 | public interface ISerializedValue { | |
|
5 | ||
|
6 | string TypeName { get; } | |
|
7 | ||
|
8 | XmlReader GetReader(); | |
|
5 | 9 | |
|
6 | 10 | } |
|
7 | 11 | } No newline at end of file |
@@ -1,5 +1,7 | |||
|
1 | 1 | namespace Implab.ServiceHost.Unity { |
|
2 | 2 | public interface ITextValue { |
|
3 | string TypeName { get; } | |
|
4 | ||
|
3 | 5 | string Value { get; } |
|
4 | 6 | |
|
5 | 7 | } |
@@ -6,7 +6,7 namespace Implab.ServiceHost.Unity { | |||
|
6 | 6 | [XmlAttribute("href")] |
|
7 | 7 | public string Href { get; set; } |
|
8 | 8 | |
|
9 |
public override void Visit(Container |
|
|
9 | public override void Visit(ContainerBuilder context) { | |
|
10 | 10 | context.Visit(this); |
|
11 | 11 | } |
|
12 | 12 | } |
@@ -7,10 +7,6 namespace Implab.ServiceHost.Unity { | |||
|
7 | 7 | [XmlAttribute("type")] |
|
8 | 8 | public string TypeName { get; set; } |
|
9 | 9 | |
|
10 |
internal abstract |
|
|
11 | ||
|
12 | public virtual Type ResolveParameterType(InjectionValueContext context) { | |
|
13 | return context.ResolveType(TypeName); | |
|
14 | } | |
|
10 | internal abstract void Visit(InjectionValueBuilder builder); | |
|
15 | 11 | } |
|
16 | 12 | } No newline at end of file |
@@ -4,7 +4,7 namespace Implab.ServiceHost.Unity | |||
|
4 | 4 | { |
|
5 | 5 | public abstract class LifetimeElement |
|
6 | 6 | { |
|
7 |
public abstract LifetimeManager GetLifetimeManager(Container |
|
|
7 | public abstract LifetimeManager GetLifetimeManager(ContainerBuilder ctx); | |
|
8 | 8 | |
|
9 | 9 | } |
|
10 | 10 | } No newline at end of file |
@@ -12,7 +12,7 namespace Implab.ServiceHost.Unity { | |||
|
12 | 12 | [XmlElement("default", typeof(DefaultParameterElement))] |
|
13 | 13 | public InjectionParameterElement[] Parameters { get; set; } |
|
14 | 14 | |
|
15 |
internal override void Visit(Registration |
|
|
15 | internal override void Visit(TypeRegistrationBuilder context) { | |
|
16 | 16 | context.Visit(this); |
|
17 | 17 | } |
|
18 | 18 | } |
@@ -8,7 +8,7 namespace Implab.ServiceHost.Unity | |||
|
8 | 8 | [XmlAttribute("name")] |
|
9 | 9 | public string Name { get; set; } |
|
10 | 10 | |
|
11 |
public override void Visit(Container |
|
|
11 | public override void Visit(ContainerBuilder context) { | |
|
12 | 12 | context.Visit(this); |
|
13 | 13 | } |
|
14 | 14 | } |
@@ -12,7 +12,7 namespace Implab.ServiceHost.Unity { | |||
|
12 | 12 | [XmlElement("default", typeof(DefaultParameterElement))] |
|
13 | 13 | public InjectionParameterElement Value { get; set; } |
|
14 | 14 | |
|
15 |
internal override void Visit(Registration |
|
|
15 | internal override void Visit(TypeRegistrationBuilder context) { | |
|
16 | 16 | context.Visit(this); |
|
17 | 17 | } |
|
18 | 18 | } |
@@ -20,15 +20,9 namespace Implab.ServiceHost.Unity { | |||
|
20 | 20 | [XmlElement("method", typeof(MethodInjectionElement))] |
|
21 | 21 | public AbstractInjectionElement[] Injectors { get; set; } |
|
22 | 22 | |
|
23 |
public override void Visit(Container |
|
|
23 | public override void Visit(ContainerBuilder context) { | |
|
24 | 24 | context.Visit(this); |
|
25 | 25 | } |
|
26 | ||
|
27 | public virtual Type ResolveImplementationType(ContainerContext ctx) { | |
|
28 | return string.IsNullOrEmpty(MapToType) ? | |
|
29 | ResolveRegistrationType(ctx) : | |
|
30 | ctx.Resolve(MapToType); | |
|
31 | } | |
|
32 | 26 | } |
|
33 | 27 | |
|
34 | 28 | } No newline at end of file |
@@ -4,7 +4,7 using System.Xml.Serialization; | |||
|
4 | 4 | |
|
5 | 5 | namespace Implab.ServiceHost.Unity |
|
6 | 6 | { |
|
7 | public class SerializedElement : AbstractRegistration { | |
|
7 | public class SerializedElement : AbstractRegistration, ISerializedValue { | |
|
8 | 8 | [XmlAttribute("href")] |
|
9 | 9 | public string Location { get; set; } |
|
10 | 10 | |
@@ -15,24 +15,23 namespace Implab.ServiceHost.Unity | |||
|
15 | 15 | [XmlAnyElement] |
|
16 | 16 | public XmlElement[] Content { get; set; } |
|
17 | 17 | |
|
18 | public override void Visit(ContainerContext context) { | |
|
18 | string ISerializedValue.TypeName { | |
|
19 | get { | |
|
20 | return string.IsNullOrEmpty(SerializedType) ? RegistrationType : SerializedType; | |
|
21 | } | |
|
22 | } | |
|
23 | ||
|
24 | public override void Visit(ContainerBuilder context) { | |
|
19 | 25 | context.Visit(this); |
|
20 | 26 | } |
|
21 | 27 | |
|
22 | public virtual Type ResolveSerializedType(ContainerContext context) { | |
|
23 |
if(string.IsNullOrEmpty( |
|
|
24 |
return |
|
|
25 | return context.Resolve(SerializedType); | |
|
26 | } | |
|
28 | public XmlReader GetReader() { | |
|
29 | if (!string.IsNullOrEmpty(Location)) | |
|
30 | return XmlReader.Create(Location); | |
|
31 | if (Content != null && Content.Length > 0) | |
|
32 | return Content[0].CreateNavigator().ReadSubtree(); | |
|
27 | 33 | |
|
28 | public virtual object GetValue(ContainerContext context) { | |
|
29 | var type = ResolveRegistrationType(context); | |
|
30 | if (Content == null || Content.Length == 0) | |
|
31 | return Safe.CreateDefaultValue(type); | |
|
32 | ||
|
33 | var serializer = new XmlSerializer(type); | |
|
34 | using(var reader = Content[0].CreateNavigator().ReadSubtree()) | |
|
35 | return serializer.Deserialize(reader); | |
|
34 | throw new Exception("No content found, expected XML document"); | |
|
36 | 35 | } |
|
37 | 36 | } |
|
38 | 37 | } No newline at end of file |
@@ -1,18 +1,28 | |||
|
1 | using System; | |
|
1 | 2 | using System.Xml; |
|
2 | 3 | using System.Xml.Schema; |
|
3 | 4 | using System.Xml.Serialization; |
|
4 | 5 | |
|
5 | 6 | namespace Implab.ServiceHost.Unity |
|
6 | 7 | { |
|
7 | public class SerializedParameterElement : InjectionParameterElement { | |
|
8 | public class SerializedParameterElement : InjectionParameterElement, ISerializedValue { | |
|
8 | 9 | [XmlAttribute("href")] |
|
9 | 10 | public string Location { get; set; } |
|
10 | 11 | |
|
11 | 12 | [XmlAnyElement] |
|
12 | 13 | public XmlElement[] Content { get; set; } |
|
13 | 14 | |
|
14 | internal override object Resolve(RegistrationContext context) { | |
|
15 | return context.Resolve(this); | |
|
15 | public XmlReader GetReader() { | |
|
16 | if (!string.IsNullOrEmpty(Location)) | |
|
17 | return XmlReader.Create(Location); | |
|
18 | if (Content != null && Content.Length > 0) | |
|
19 | return Content[0].CreateNavigator().ReadSubtree(); | |
|
20 | ||
|
21 | throw new Exception("No content found, expected XML document"); | |
|
22 | } | |
|
23 | ||
|
24 | internal override void Visit(InjectionValueBuilder builder) { | |
|
25 | builder.Visit(this); | |
|
16 | 26 | } |
|
17 | 27 | } |
|
18 | 28 | } No newline at end of file |
@@ -3,7 +3,7 using Unity.Lifetime; | |||
|
3 | 3 | namespace Implab.ServiceHost.Unity |
|
4 | 4 | { |
|
5 | 5 | public class SimgletonLifetimeElement : LifetimeElement { |
|
6 |
public override LifetimeManager GetLifetimeManager(Container |
|
|
6 | public override LifetimeManager GetLifetimeManager(ContainerBuilder ctx) { | |
|
7 | 7 | return new SingletonLifetimeManager(); |
|
8 | 8 | } |
|
9 | 9 | } |
@@ -3,11 +3,25 using System.Xml.Serialization; | |||
|
3 | 3 | namespace Implab.ServiceHost.Unity { |
|
4 | 4 | public class ValueElement : AbstractRegistration, ITextValue { |
|
5 | 5 | |
|
6 | [XmlText] | |
|
7 | 6 |
|
|
8 | 7 | public string Value { get; set; } |
|
9 | 8 | |
|
10 | public override void Visit(ContainerContext context) { | |
|
9 | [XmlText] | |
|
10 | public string Text { get; set; } | |
|
11 | ||
|
12 | string ITextValue.Value { | |
|
13 | get { | |
|
14 | return string.IsNullOrEmpty(Value) ? Text : Value; | |
|
15 | } | |
|
16 | } | |
|
17 | ||
|
18 | public string TypeName { | |
|
19 | get { | |
|
20 | return RegistrationType; | |
|
21 | } | |
|
22 | } | |
|
23 | ||
|
24 | public override void Visit(ContainerBuilder context) { | |
|
11 | 25 | context.Visit(this); |
|
12 | 26 | } |
|
13 | 27 | } |
@@ -1,15 +1,13 | |||
|
1 | 1 | using System.Xml.Serialization; |
|
2 | 2 | |
|
3 | namespace Implab.ServiceHost.Unity | |
|
4 | { | |
|
5 | public class ValueParameterElement : InjectionParameterElement | |
|
6 | { | |
|
3 | namespace Implab.ServiceHost.Unity { | |
|
4 | public class ValueParameterElement : InjectionParameterElement, ITextValue { | |
|
7 | 5 | [XmlText] |
|
8 | 6 | [XmlAttribute("value")] |
|
9 | 7 | public string Value { get; set; } |
|
10 | 8 | |
|
11 | internal override object Resolve(RegistrationContext context) { | |
|
12 | return context.Resolve(this); | |
|
9 | internal override void Visit(InjectionValueBuilder builder) { | |
|
10 | builder.Visit(this); | |
|
13 | 11 | } |
|
14 | 12 | } |
|
15 | 13 | } No newline at end of file |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
|
1 | NO CONTENT: file was removed |
General Comments 3
ok, latest stable version should be in default
You need to be logged in to leave comments.
Login now