Add support for fixed values (fixes #16)

Create models for global types before those for global elements (fixes #17)
mganss · Sep 22, 2016 · 7b0ce51 · 7b0ce51
1 parent a68f700
commit 7b0ce51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd b/XmlSchemaClassGenerator.Tests/xsd/client/client.xsd
@@ -65,7 +65,7 @@
  <xs:complexType name="MandatoryStringType">
  <xs:simpleContent>
  <xs:extension base="xs:string">
- <xs:attribute fixed="True" name="MandatoryField" type="xs:string" use="optional" />
+ <xs:attribute fixed="True" name="MandatoryField" type="xs:string" use="required" />
  </xs:extension>
  </xs:simpleContent>
  </xs:complexType>

diff --git a/XmlSchemaClassGenerator/Generator.cs b/XmlSchemaClassGenerator/Generator.cs
@@ -337,6 +337,13 @@ private void BuildModel()
  AttributeGroups = Set.Schemas().Cast<XmlSchema>().SelectMany(s => s.AttributeGroups.Values.Cast<XmlSchemaAttributeGroup>()).ToDictionary(g => g.QualifiedName);
  Groups = Set.Schemas().Cast<XmlSchema>().SelectMany(s => s.Groups.Values.Cast<XmlSchemaGroup>()).ToDictionary(g => g.QualifiedName);
 
+ foreach (var globalType in Set.GlobalTypes.Values.Cast<XmlSchemaType>())
+ {
+ var schema = globalType.GetSchema();
+ var source = (schema == null ? null : new Uri(schema.SourceUri));
+ var type = CreateTypeModel(source, globalType, globalType.QualifiedName);
+ }
+
  foreach (var rootElement in Set.GlobalElements.Values.Cast<XmlSchemaElement>())
  {
  var source = new Uri(rootElement.GetSchema().SourceUri);
@@ -388,13 +395,6 @@ private void BuildModel()
  type.RootElementName = rootElement.QualifiedName;
  }
  }
-
- foreach (var globalType in Set.GlobalTypes.Values.Cast<XmlSchemaType>())
- {
- var schema = globalType.GetSchema();
- var source = (schema == null ? null : new Uri(schema.SourceUri));
- var type = CreateTypeModel(source, globalType, globalType.QualifiedName);
- }
  }
 
  // see http://msdn.microsoft.com/en-us/library/z2w0sxhf.aspx
@@ -707,7 +707,7 @@ private IEnumerable<PropertyModel> CreatePropertiesForAttributes(Uri source, Typ
  Type = CreateTypeModel(source, attribute.AttributeSchemaType, attributeQualifiedName),
  IsAttribute = true,
  IsNullable = attribute.Use != XmlSchemaUse.Required,
- DefaultValue = attribute.DefaultValue,
+ DefaultValue = attribute.DefaultValue ?? (attribute.Use != XmlSchemaUse.Optional ? attribute.FixedValue : null),
  Form = attribute.Form == XmlSchemaForm.None ? attribute.GetSchema().AttributeFormDefault : attribute.Form,
  XmlNamespace = attribute.QualifiedName.Namespace != "" && attribute.QualifiedName.Namespace != typeModel.XmlSchemaName.Namespace ? attribute.QualifiedName.Namespace : null,
  };
@@ -779,7 +779,7 @@ private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeM
  IsNillable = element.IsNillable,
  IsNullable = item.MinOccurs < 1.0m,
  IsCollection = item.MaxOccurs > 1.0m || particle.MaxOccurs > 1.0m, // http://msdn.microsoft.com/en-us/library/vstudio/d3hx2s7e(v=vs.100).aspx
- DefaultValue = element.DefaultValue,
+ DefaultValue = element.DefaultValue ?? (item.MinOccurs >= 1.0m ? element.FixedValue : null),
  Form = element.Form == XmlSchemaForm.None ? element.GetSchema().ElementFormDefault : element.Form,
  XmlNamespace = element.QualifiedName.Namespace != "" && element.QualifiedName.Namespace != typeModel.XmlSchemaName.Namespace ? element.QualifiedName.Namespace : null,
  };