Updated GetSanitizedPropertyName to sanitize property names where the property name is the same as the class.

Author: mmainer

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(property);
 
             var attributeDefinition = string.Format("[JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = \"{0}\", Required = Required.Default)]", property.Name);
 

Templates/CSharp/Model/EntityType.cs.tt

@@ -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(property)#> { get; set; }
     <#
             }
         }

src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs

@@ -205,6 +205,22 @@ public static string GetSanitizedPropertyName(this OdcmProperty property)
         }
 
         public static string GetSanitizedPropertyName(this string property, string prefix = null)
+        {
+            return GetSanitizedPropertyName(property, null, prefix);
+        }
+
+        /// <summary>
+        /// Sanitizes a property name for the following conditions: 
+        /// 1) a property has the same name as a C# keyword. Prefix @ to the property name to make it valid. 
+        /// 2) a property has the same name as the class. First we'll try to change the property name to the
+        /// return type name. If the return type name is the same as the class name, then we'll append 
+        /// "Property" to the property name.
+        /// </summary>
+        /// <param name="property">The string that called this extension.</param>
+        /// <param name="odcmProperty">An OdcmProperty. Use the property that you want to sanitize.</param>
+        /// <param name="prefix">The prefix to use on this property.</param>
+        /// <returns></returns>
+        public static string GetSanitizedPropertyName(this string property, OdcmProperty odcmProperty, string prefix = null)
         {
             if (GetReservedNames().Contains(property))
             {
@@ -213,6 +229,22 @@ public static string GetSanitizedPropertyName(this string property, string prefi
                 return string.Concat(reservedPrefix, property.ToUpperFirstChar());
             }
 
+            // Check whether the propertyObject is null (means they called the extension from a string).
+            // Check whether the property name is the same as the class name.
+            // Only constructor members may be named the same as the class name.
+            if (odcmProperty != null && property == odcmProperty.Class.Name.ToUpperFirstChar())
+            {
+                // Check whether the property type is the same as the class name.
+                if (odcmProperty.Projection.Type.Name.ToUpperFirstChar() == odcmProperty.Class.Name.ToUpperFirstChar())
+                {
+                    // Name the property: {metadataName} + "Property"
+                    return string.Concat(property, "Property");
+                }
+
+                // Name the property by its type. Sanitize it in case the type is a reserved name.  
+                return odcmProperty.Projection.Type.Name.ToUpperFirstChar().GetSanitizedPropertyName();
+            }
+
             return property;
         }