remove all generic addchild

Author: twsouthwick

src/DocumentFormat.OpenXml.Framework/AlternateContent.cs

@@ -16,7 +16,8 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContent : OpenXmlCompositeElement
     {
-        internal static readonly OpenXmlQualifiedName InternalQName = new(@"http://schemas.openxmlformats.org/markup-compatibility/2006", "AlternateContent");
+        internal static readonly OpenXmlQualifiedName ElementQName = new(@"http://schemas.openxmlformats.org/markup-compatibility/2006", "AlternateContent");
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
 
         /// <summary>
         /// Initializes a new instance of the AlternateContent
@@ -66,16 +67,16 @@ public AlternateContent(string outerXml)
         /// Gets a value that represents the markup compatibility
         /// namespace.
         /// </summary>
-        public static string MarkupCompatibilityNamespace => InternalQName.Namespace.Uri;
+        public static string MarkupCompatibilityNamespace => ElementQName.Namespace.Uri;
 
         /// <summary>
         /// Gets a value that represents the tag name of the
         /// AlternateContent element.
         /// </summary>
-        public static string TagName => InternalQName.Name;
+        public static string TagName => ElementQName.Name;
 
         /// <inheritdoc/>
-        public override string LocalName => InternalQName.Name;
+        public override string LocalName => ElementQName.Name;
 
         /// <summary>
         /// Appends a new child of type T:DocumentFormat.OpenXml.AlternateContentChoice
@@ -113,10 +114,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(InternalQName, default));
+            builder.SetSchema(ElementType);
 
-            builder.AddChild<AlternateContentChoice>();
-            builder.AddChild<AlternateContentFallback>();
+            builder.AddChild(AlternateContentChoice.ElementType, () => new AlternateContentChoice());
+            builder.AddChild(AlternateContentFallback.ElementType, () => new AlternateContentFallback());
         }
     }
 }

src/DocumentFormat.OpenXml.Framework/AlternateContentChoice.cs

@@ -12,10 +12,11 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContentChoice : OpenXmlCompositeElement
     {
-        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
-
         private const string Name = "Choice";
 
+        internal static readonly OpenXmlQualifiedName ElementQName = new(AlternateContent.ElementQName.Namespace.Uri, Name);
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
+
         /// <summary>
         /// Initializes a new instance of the
         /// AlternateContentChoice class.
@@ -116,7 +117,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(new(AlternateContent.InternalQName.Namespace.Uri, Name), default));
+            builder.SetSchema(ElementType);
 
             builder.AddElement<AlternateContentChoice>()
                 .AddAttribute("Requires", a => a.Requires);

src/DocumentFormat.OpenXml.Framework/AlternateContentFallback.cs

@@ -12,10 +12,11 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContentFallback : OpenXmlCompositeElement
     {
-        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
-
         private const string Name = "Fallback";
 
+        internal static readonly OpenXmlQualifiedName ElementQName = new(AlternateContent.ElementQName.Namespace.Uri, Name);
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
+
         /// <summary>
         /// Initializes a new instance of the AlternateContentFallback class.
         /// </summary>
@@ -98,7 +99,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(new(AlternateContent.InternalQName.Namespace.Uri, Name), default));
+            builder.SetSchema(ElementType);
         }
     }
 }

src/DocumentFormat.OpenXml.Framework/Framework/Metadata/ElementMetadata.cs

@@ -60,7 +60,7 @@ public class Builder : ValidatorBuilder
             private readonly IOpenXmlNamespaceResolver _resolver;
 
             private List<IMetadataBuilder<AttributeMetadata>>? _attributes;
-            private HashSet<IMetadataBuilder<ElementFactory>>? _children;
+            private List<ElementFactory>? _children;
             private List<IValidator>? _constraints;
             private OpenXmlSchemaType _type;
 
@@ -97,21 +97,10 @@ public void AddChild(in OpenXmlSchemaType type, Func<OpenXmlElement> activator)
             {
                 if (_children is null)
                 {
-                    _children = new HashSet<IMetadataBuilder<ElementFactory>>();
+                    _children = [];
                 }
 
-                _children.Add(new KnownChild(type, activator));
-            }
-
-            public void AddChild<T>()
-                where T : OpenXmlElement, new()
-            {
-                if (_children is null)
-                {
-                    _children = new HashSet<IMetadataBuilder<ElementFactory>>();
-                }
-
-                _children.Add(new KnownChild<T>());
+                _children.Add(new ElementFactory(type, activator));
             }
 
             public FileFormatVersions Availability { get; set; } = FileFormatVersions.Office2007;
@@ -128,7 +117,7 @@ public void Add(IMetadataBuilder<AttributeMetadata> builder)
 
             public ElementMetadata Build()
             {
-                var lookup = _children is null ? _lazy : new Lazy<ElementFactoryCollection>(() => new ElementFactoryCollection(_children.Select(c => c.Build())), true);
+                var lookup = _children is null ? _lazy : new Lazy<ElementFactoryCollection>(() => new ElementFactoryCollection(_children), true);
 
                 return new ElementMetadata(_type, BuildAttributes(), GetValidators(), _constraints?.ToArray(), Availability, Particle.Compile(), lookup);
             }
@@ -149,17 +138,6 @@ public ElementMetadata Build()
 
                 return attributes;
             }
-
-            private class KnownChild<T> : IMetadataBuilder<ElementFactory>
-                where T : OpenXmlElement, new()
-            {
-                public ElementFactory Build() => ElementFactory.Create<T>();
-            }
-
-            private class KnownChild(OpenXmlSchemaType type, Func<OpenXmlElement> factory) : IMetadataBuilder<ElementFactory>
-            {
-                public ElementFactory Build() => new ElementFactory(type, factory);
-            }
         }
 
         public class Builder<TElement> : ValidatorBuilder

src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs

@@ -1814,7 +1814,7 @@ internal OpenXmlElement CreateElement(in OpenXmlQualifiedName qname, string pref
                 newElement = ElementFactory(qname);
 
                 // try AlternateContent
-                if (newElement is null && AlternateContent.InternalQName.Equals(qname))
+                if (newElement is null && AlternateContent.ElementQName.Equals(qname))
                 {
                     newElement = new AlternateContent();
                 }