Add support for reserved model words

This allows us to add reserved words that are used in our model classes
(enums excluded). This fixes a bug where "Reserved" was previously
defined by Newtonsoft

Author: Caitlin Bales (MSFT)

Templates/CSharp/Model/ComplexType.cs.tt

@@ -49,7 +49,7 @@ namespace <#=complex.Namespace.GetNamespaceName()#>
             var propertyType = property.IsCollection ? string.Format("IEnumerable<{0}>", property.GetTypeString()) : property.GetTypeString();
             var propertyName = isMethodResponse
                 ? property.Name.Substring(property.Name.IndexOf('.') + 1).ToCheckedCase()
-                : property.Name.ToCheckedCase().GetSanitizedPropertyName();
+                : property.Name.ToCheckedCase().GetSanitizedPropertyName(null, true);
 
             var attributeDefinition = string.Format("[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = \"{0}\", Required = Required.Default)]", property.Name);
 

Templates/CSharp/Model/EntityType.cs.tt

@@ -73,7 +73,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>
         /// Gets or sets <#=property.Name.SplitCamelCase().ToLower()#>.
         /// </summary>
         <#=attributeDefinition#>
-        public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }
+        public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }
     <#
                 }
                 else
@@ -84,7 +84,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>
         /// Gets or sets <#=property.Name.SplitCamelCase().ToLower()#>.
         /// </summary>
         <#=attributeDefinition#>
-        public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }
+        public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }
     <#
                 }
             }
@@ -96,7 +96,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>
         /// Gets or sets <#=property.Name.SplitCamelCase().ToLower()#>.
         /// </summary>
         <#=attributeDefinition#>
-        public <#=propertyType#> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }
+        public <#=propertyType#> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }
     <#
             }
         }

src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs

@@ -104,6 +104,14 @@ public static ICollection<string> GetReservedNames()
             };
         }
 
+        public static ICollection<string> GetReservedModelNames()
+        {
+            return new HashSet<string>(StringComparer.Ordinal)
+            {
+                "Required"
+            };
+        }
+
         private static readonly ICollection<string> SimpleTypes =
             new HashSet<string> (StringComparer.OrdinalIgnoreCase)
             {
@@ -204,9 +212,9 @@ public static string GetSanitizedPropertyName(this OdcmProperty property)
             return GetSanitizedPropertyName(property.Name);
         }
 
-        public static string GetSanitizedPropertyName(this string property, string prefix = null)
+        public static string GetSanitizedPropertyName(this string property, string prefix = null, bool hasReservedModelWords)
         {
-            if (GetReservedNames().Contains(property))
+            if (GetReservedNames().Contains(property) || (hasReservedModelWords && GetReservedModelNames().Contains(property)))
             {
                 var reservedPrefix = string.IsNullOrEmpty(prefix) ? DefaultReservedPrefix : prefix;