Emit XmlElementAttribute for substitutionGroups with an abstract head…

…. See #36 (comment)
mganss · Oct 4, 2018 · 3bbbd06 · 3bbbd06
1 parent ec95c6f
commit 3bbbd06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -96,6 +96,11 @@ public ModelBuilder(GeneratorConfiguration configuration, XmlSchemaSet set)
  if (type is ClassModel classModel)
  {
  classModel.Documentation.AddRange(GetDocumentation(rootElement));
+ if (!rootElement.SubstitutionGroup.IsEmpty)
+ {
+ classModel.IsSubstitution = true;
+ classModel.SubstitutionName = rootElement.QualifiedName;
+ }
  }
 
  type.RootElementName = rootElement.QualifiedName;

diff --git a/XmlSchemaClassGenerator/TypeModel.cs b/XmlSchemaClassGenerator/TypeModel.cs
@@ -225,6 +225,7 @@ public class ClassModel : TypeModel
  public bool IsAbstract { get; set; }
  public bool IsMixed { get; set; }
  public bool IsSubstitution { get; set; }
+ public XmlQualifiedName SubstitutionName { get; set; }
  public TypeModel BaseClass { get; set; }
  public List<PropertyModel> Properties { get; set; }
  public List<InterfaceModel> Interfaces { get; set; }
@@ -974,7 +975,7 @@ private IEnumerable<CodeAttributeDeclaration> GetAttributes(bool isArray)
  foreach (var derivedType in derivedTypes)
  {
  var derivedAttribute = new CodeAttributeDeclaration(new CodeTypeReference(typeof(XmlElementAttribute), Configuration.CodeTypeReferenceOptions),
- new CodeAttributeArgument(new CodePrimitiveExpression(derivedType.XmlSchemaName.Name)),
+ new CodeAttributeArgument(new CodePrimitiveExpression((derivedType.SubstitutionName ?? derivedType.XmlSchemaName).Name)),
  new CodeAttributeArgument("Type", new CodeTypeOfExpression(derivedType.GetReferenceFor(OwningType.Namespace, false))));
  if (Order != null)
  {