implab/ImplabNet Commit - r271:d4d437ec4483

Working on Unity xml configuration

cin -

r271:d4d437ec4483 v3

parent child

Context file:

r271:d4d437ec4483

Collapse all files

Implab.Playground/Program.cs +4 0

             using System;
             using System.Diagnostics;
             using Implab.Diagnostics;
             using Implab.ServiceHost.Unity;
             using Implab.Xml;
             using Unity;
             using Unity.Injection;
             namespace Implab.Playground {
                 public class Foo {
                     public class Bar {
                     }
                     public string Name { get; set; }
                     public int IntValue { get; set; }
                     public string StringValue { get; set; }
                 }
                 public class Container<T> {
                     public Container() {
                     }
                     public Container(T instance) {
                         Instance = instance;
                     }
                     public T Instance { get; set; }
                     public void SetInstance(T value) {
                         Instance = value;
                     }
                 }
                 public class Program {
                     static void Main(string[] args) {
                         var container = new UnityContainer();
+                        var ctx = new ConfigurationContext(container);
                         var conf = SerializationHelpers.DeserializeFromFile<ContainerElement>("data/sample.xml");
+                        ctx.Visit(conf);
                         Console.WriteLine($"Registrations: {conf.Items.Count}");
                     }
                 }
             }

Implab.ServiceHost/Unity/AbstractRegistration.cs +12 0

             using System;
             using System.Xml.Serialization;
             using Unity.Lifetime;
             using Unity.Registration;
             namespace Implab.ServiceHost.Unity
             {
                 public abstract class AbstractRegistration : IConfigurationElement {
                     /// <summary>
                     /// An optional name for a registration in the container
                     /// </summary>
                     [XmlAttribute("name")]
                     public string Name {
                         get; set;
                     }
+                    [XmlElement("signleton", typeof(SimgletonLifetimeElement))]
+                    [XmlElement("context", typeof(ContextLifetimeElement))]
+                    [XmlElement("container", typeof(ContainerLifetimeElement))]
+                    [XmlElement("hierarchy", typeof(HierarchicalLifetimeElement))]
+                    public LifetimeElement Lifetime {get; set;}
+                    /// <summary>
+                    /// A type specification for the service registration,
+                    /// </summary>
+                    [XmlAttribute("provides")]
+                    public string ProvidesType { get; set; }
                     public void Visit(ConfigurationContext context) {
                         context.Visit(this);
                     }
                 }
             }

Implab.ServiceHost/Unity/ConfigurationSchema.cs +3 0

             using System;
             using System.Collections.Generic;
             using System.Reflection;
             using System.Xml;
             using System.Xml.Serialization;
             using Implab.Components;
             namespace Implab.ServiceHost.Unity {
                 public class ConfigurationSchema {
                     public static ConfigurationSchema Default { get; private set; } = CreateDefault();
                     readonly Dictionary<Tuple<string,string>, LazyAndWeak<XmlSerializer>> m_mappings = new Dictionary<Tuple<string, string>, LazyAndWeak<XmlSerializer>>();
                     public void DefineMapping(string name, string ns, Type type) {
                         Safe.ArgumentNotEmpty(name, nameof(name));
                         Safe.ArgumentNotNull(type, nameof(type));
                         ns = ns ?? string.Empty;
                         m_mappings[Tuple.Create(name, ns)] = new LazyAndWeak<XmlSerializer>(() => new XmlSerializer(type), true);
                     }
                     public void DefineMapping<T>() {
                         var xmlRoot = typeof(T).GetCustomAttribute<XmlRootAttribute>();
                         var ns = xmlRoot?.Namespace;
                         var root = xmlRoot?.ElementName ?? typeof(T).Name;
                         DefineMapping(root, ns, typeof(T));
                     }
                     public T Deserialize<T>(XmlReader reader) {
                         reader.MoveToContent();
                         var name = reader.Name;
                         var ns = reader.NamespaceURI;
                         return (T)m_mappings[Tuple.Create(name, ns)].Value.Deserialize(reader);
                     }
                     static ConfigurationSchema CreateDefault() {
                         var schema  = new ConfigurationSchema();
                         schema.DefineMapping<RegisterElement>();
+                        schema.DefineMapping<IncludeElement>();
+                        schema.DefineMapping<AssemblyElement>();
+                        schema.DefineMapping<NamespaceElement>();
                         return schema;
                     }
                 }
             }

Implab.ServiceHost/Unity/ContainerElement.cs +4 -1

             using Implab.Xml;
             using System.Collections.Generic;
             using System.Xml;
             using System.Xml.Schema;
             using System.Xml.Serialization;
             namespace Implab.ServiceHost.Unity {
                 [XmlRoot("container", Namespace = Schema.ContainerConfigurationNamespace)]
                 public class ContainerElement : IXmlSerializable {
                     public List<IConfigurationElement> Items {get; set; } = new List<IConfigurationElement>();
                     public XmlSchema GetSchema() {
                         return null;
                     }
                     public void ReadXml(XmlReader reader) {
                         while(reader.Read() && reader.NodeType != XmlNodeType.EndElement) {
                             var registration = ConfigurationSchema.Default.Deserialize<IConfigurationElement>(reader);
                             Items.Add(registration);
                         }
                     }
                     public void WriteXml(XmlWriter writer) {
-                        throw new System.NotImplementedException();
+                        foreach(var item in Items) {
+                            var serializer = new XmlSerializer(item.GetType());
+                            serializer.Serialize(writer, item);
+                        }
                     }
                 }
             }

Implab.ServiceHost/Unity/RegisterElement.cs +1 -13

             using System;
             using System.Xml.Serialization;
             using Unity.Lifetime;
             using Unity.Registration;
             namespace Implab.ServiceHost.Unity {
                 [XmlRoot("register", Namespace = Schema.ContainerConfigurationNamespace)]
                 public class RegisterElement : AbstractRegistration  {
                     /// <summary>
-                    /// An optional type specification for the service registration,
+                    /// An optional type which is registered as a service in the container, must be assignable to <see cref="ProvidesType">.
-                    /// must be assignable from the type specified by <see cref="ImplementedType"/>
-                    /// </summary>
-                    [XmlAttribute("provides")]
-                    public string ProvidesType { get; set; }
-                    /// <summary>
-                    /// The type which is registered as a service in the container.
                     /// </summary>
                     [XmlAttribute("type")]
                     public string ImplementedType { get; set; }
-                    [XmlElement("signleton", typeof(SimgletonLifetimeElement))]
-                    [XmlElement("context", typeof(ContextLifetimeElement))]
-                    [XmlElement("container", typeof(ContainerLifetimeElement))]
-                    [XmlElement("hierarchy", typeof(HierarchicalLifetimeElement))]
-                    public LifetimeElement Lifetime {get; set;}
                     [XmlElement("constructor", typeof(ConstructorInjectionElement))]
                     [XmlElement("property", typeof(PropertyInjectionElement))]
                     [XmlElement("method", typeof(MethodInjectionElement))]
                     public AbstractInjectionElement[] Injectors { get; set; }
                 }
             }

Implab.ServiceHost/Unity/SerializedParameterElement.cs +8 -3

@@ -1,7 +1,12
		1	using System.Xml;
		2	using System.Xml.Schema;
		3	using System.Xml.Serialization;
		4
1	namespace Implab.ServiceHost.Unity	5	namespace Implab.ServiceHost.Unity
2	{	6	{
3	public class SerializedParameterElement : InjectionParameterElement	7	public class SerializedParameterElement : InjectionParameterElement {
4	{	8
5		9	[XmlAnyElement]
		10	public XmlElement[] Content { get; set; }
6	}	11	}
7	} No newline at end of file	12	}

General Comments 3

sergey

|

Auto status change to "Under Review"

sergey

|

ok, latest stable version should be in default

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages