Fixes in preparation for bringing Excel into the .NET Graph SDK.

Robert Anderson · Robert Anderson · commit 6b38325ed80c · 2016-06-20T13:45:37.000-07:00
diff --git a/Templates/CSharp/Base/EntityRequestBuilder.Base.template.tt b/Templates/CSharp/Base/EntityRequestBuilder.Base.template.tt
@@ -297,7 +297,7 @@ public string GetMethodProperties(OdcmClass entity)
             
             foreach (var param in requiredParameters)
             {
-                var paramVariableName = param.Name.ToLowerFirstChar();
+                var paramVariableName = param.Name.GetSanitizedParameterName();
                 var paramTypeString = param.Type.GetTypeString();
                 
                 if (param.IsCollection)
@@ -316,7 +316,7 @@ public string GetMethodProperties(OdcmClass entity)
             
             foreach (var param in optionalParameters)
             {
-                var paramVariableName = param.Name.ToLowerFirstChar();
+                var paramVariableName = param.Name.GetSanitizedParameterName();
                 var paramTypeString = param.Type.GetTypeString();
                 
                 if (param.IsCollection)
diff --git a/Templates/CSharp/Base/IEntityRequestBuilder.Base.template.tt b/Templates/CSharp/Base/IEntityRequestBuilder.Base.template.tt
@@ -236,7 +236,7 @@ public string GetMethodProperties(OdcmClass entity)
             
             foreach (var param in requiredParameters)
             {
-                var paramVariableName = param.Name.ToLowerFirstChar();
+                var paramVariableName = param.Name.GetSanitizedParameterName();
                 var paramTypeString = param.Type.GetTypeString();
                 
                 if (param.IsCollection)
@@ -251,7 +251,7 @@ public string GetMethodProperties(OdcmClass entity)
             
             foreach (var param in optionalParameters)
             {
-                var paramVariableName = param.Name.ToLowerFirstChar();
+                var paramVariableName = param.Name.GetSanitizedParameterName();
                 var paramTypeString = param.Type.GetTypeString();
                 
                 if (param.IsCollection)
diff --git a/Templates/CSharp/Model/MethodRequestBody.cs.tt b/Templates/CSharp/Model/MethodRequestBody.cs.tt
@@ -19,6 +19,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Runtime.Serialization;
 
     /// <summary>
diff --git a/Templates/CSharp/Requests/EntityRequestBuilder.cs.tt b/Templates/CSharp/Requests/EntityRequestBuilder.cs.tt
@@ -11,6 +11,7 @@ namespace <#=this.GetNamespaceName(entity)#>
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
 
     <#=this.GetEntityRequestBuilderClassDefinition(entity)#>
     {
diff --git a/Templates/CSharp/Requests/IEntityRequestBuilder.cs.tt b/Templates/CSharp/Requests/IEntityRequestBuilder.cs.tt
@@ -14,6 +14,7 @@ namespace <#=this.GetNamespaceName(entity)#>
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
 
     <#=this.GetEntityRequestBuilderInterfaceDefinition(entity)#>
     {
diff --git a/Templates/CSharp/Requests/IMethodRequestBuilder.cs.tt b/Templates/CSharp/Requests/IMethodRequestBuilder.cs.tt
@@ -13,6 +13,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
 
     /// <summary>
     /// The interface I<#=requestBuilderType#>.
diff --git a/Templates/CSharp/Requests/MethodRequest.cs.tt b/Templates/CSharp/Requests/MethodRequest.cs.tt
@@ -164,7 +164,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>
     else if (returnsStream)
     {
 #>
-            return this.SendStreamRequestAsync(null, httpCompletionOption, cancellationToken);
+            return this.SendStreamRequestAsync(null, cancellationToken, httpCompletionOption);
 <#
     }
     else if (!string.IsNullOrEmpty(sendAsyncReturnType))
diff --git a/Templates/CSharp/Requests/MethodRequestBuilder.cs.tt b/Templates/CSharp/Requests/MethodRequestBuilder.cs.tt
@@ -24,6 +24,8 @@ var methods = overloads
                     {
                         var type = p.Type.GetTypeString();
                         var name = p.Name.ToLowerFirstChar();
+                        var parameterName = p.Name.GetSanitizedParameterName();
+                        var propertyName = p.Name.ToCheckedCase();
 
                         if (p.IsCollection)
                         {
@@ -34,12 +36,12 @@ var methods = overloads
                             type += "?";
                         }
 
-                        return new { Type = type, Name = name, IsNullable = p.IsNullable };
+                        return new { Type = type, Name = name, ParameterName = parameterName, PropertyName = propertyName, IsNullable = p.IsNullable };
                     })
                 .OrderBy(p => p.IsNullable ? 1 : 0);
 
-            var paramStrings = parameters.Select(p => string.Format(",\n            {0} {1}", p.Type, p.Name));
-            var paramComments = parameters.Select(p => string.Format("\n        /// <param name=\"{0}\">A {0} parameter for the OData method call.</param>", p.Name));
+            var paramStrings = parameters.Select(p => string.Format(",\n            {0} {1}", p.Type, p.ParameterName));
+            var paramComments = parameters.Select(p => string.Format("\n        /// <param name=\"{0}\">A {0} parameter for the OData method call.</param>", p.ParameterName));
 
             return new
             {
@@ -55,6 +57,7 @@ namespace Microsoft.Graph
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
 
     /// <summary>
     /// The type DriveItemDeltaRequestBuilder.
@@ -79,7 +82,7 @@ foreach (var m in methods)
     foreach (var p in m.Parameters)
     {
 #>
-            SetParameter("<#=p.Name#>", <#=p.Name#>, <#=p.IsNullable.ToString().ToLowerInvariant()#>);
+            SetParameter("<#=p.Name#>", <#=p.ParameterName#>, <#=p.IsNullable.ToString().ToLowerInvariant()#>);
 <#
     }
 #>
@@ -107,7 +110,7 @@ foreach (var m in methods)
             {
 #>
             if (HasParameter("<#=p.Name#>"))
-                request.RequestBody.<#=p.Name.ToCheckedCase()#> = GetParameter<<#=p.Type#>>("<#=p.Name#>");
+                request.RequestBody.<#=p.PropertyName#> = GetParameter<<#=p.Type#>>("<#=p.Name#>");
 
 <#
             }
diff --git a/src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs b/src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Graph.ODataTemplateWriter.CodeHelpers.CSharp
 
     public static class TypeHelperCSharp
     {
-        public const string DefaultReservedPrefix = "_";
+        public const string DefaultReservedPrefix = "@";
         public static ICollection<string> GetReservedNames()
         {
             return new HashSet<string>(StringComparer.Ordinal)
@@ -214,6 +214,18 @@ public static string GetSanitizedPropertyName(this string property, string prefi
             return property;
         }
 
+        public static string GetSanitizedParameterName(this string parameter, string prefix = null)
+        {
+            if (GetReservedNames().Contains(parameter))
+            {
+                var reservedPrefix = string.IsNullOrEmpty(prefix) ? DefaultReservedPrefix : prefix;
+
+                return string.Concat(reservedPrefix, parameter.ToLowerFirstChar());
+            }
+
+            return parameter;
+        }
+
         public static string GetToLowerImport(this OdcmProperty property)
         {
             var type = property.Projection.Type;

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public string GetMethodProperties(OdcmClass entity)`
`297`	`297`
`298`	`298`	`foreach (var param in requiredParameters)`
`299`	`299`	`{`
`300`		`- var paramVariableName = param.Name.ToLowerFirstChar();`
	`300`	`+ var paramVariableName = param.Name.GetSanitizedParameterName();`
`301`	`301`	`var paramTypeString = param.Type.GetTypeString();`
`302`	`302`
`303`	`303`	`if (param.IsCollection)`
`@@ -316,7 +316,7 @@ public string GetMethodProperties(OdcmClass entity)`
`316`	`316`
`317`	`317`	`foreach (var param in optionalParameters)`
`318`	`318`	`{`
`319`		`- var paramVariableName = param.Name.ToLowerFirstChar();`
	`319`	`+ var paramVariableName = param.Name.GetSanitizedParameterName();`
`320`	`320`	`var paramTypeString = param.Type.GetTypeString();`
`321`	`321`
`322`	`322`	`if (param.IsCollection)`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public string GetMethodProperties(OdcmClass entity)`
`236`	`236`
`237`	`237`	`foreach (var param in requiredParameters)`
`238`	`238`	`{`
`239`		`- var paramVariableName = param.Name.ToLowerFirstChar();`
	`239`	`+ var paramVariableName = param.Name.GetSanitizedParameterName();`
`240`	`240`	`var paramTypeString = param.Type.GetTypeString();`
`241`	`241`
`242`	`242`	`if (param.IsCollection)`
`@@ -251,7 +251,7 @@ public string GetMethodProperties(OdcmClass entity)`
`251`	`251`
`252`	`252`	`foreach (var param in optionalParameters)`
`253`	`253`	`{`
`254`		`- var paramVariableName = param.Name.ToLowerFirstChar();`
	`254`	`+ var paramVariableName = param.Name.GetSanitizedParameterName();`
`255`	`255`	`var paramTypeString = param.Type.GetTypeString();`
`256`	`256`
`257`	`257`	`if (param.IsCollection)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>`
`19`	`19`	`{`
`20`	`20`	`using System;`
`21`	`21`	`using System.Collections.Generic;`
	`22`	`+ using System.IO;`
`22`	`23`	`using System.Runtime.Serialization;`
`23`	`24`
`24`	`25`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace <#=this.GetNamespaceName(entity)#>`
`11`	`11`	`{`
`12`	`12`	`using System;`
`13`	`13`	`using System.Collections.Generic;`
	`14`	`+ using System.IO;`
`14`	`15`
`15`	`16`	`<#=this.GetEntityRequestBuilderClassDefinition(entity)#>`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ namespace <#=this.GetNamespaceName(entity)#>`
`14`	`14`	`{`
`15`	`15`	`using System;`
`16`	`16`	`using System.Collections.Generic;`
	`17`	`+ using System.IO;`
`17`	`18`
`18`	`19`	`<#=this.GetEntityRequestBuilderInterfaceDefinition(entity)#>`
`19`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>`
`13`	`13`	`{`
`14`	`14`	`using System;`
`15`	`15`	`using System.Collections.Generic;`
	`16`	`+ using System.IO;`
`16`	`17`
`17`	`18`	`/// <summary>`
`18`	`19`	`/// The interface I<#=requestBuilderType#>.`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ namespace <#=method.Namespace.GetNamespaceName()#>`
`164`	`164`	`else if (returnsStream)`
`165`	`165`	`{`
`166`	`166`	`#>`
`167`		`- return this.SendStreamRequestAsync(null, httpCompletionOption, cancellationToken);`
	`167`	`+ return this.SendStreamRequestAsync(null, cancellationToken, httpCompletionOption);`
`168`	`168`	`<#`
`169`	`169`	`}`
`170`	`170`	`else if (!string.IsNullOrEmpty(sendAsyncReturnType))`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ var methods = overloads`
`24`	`24`	`{`
`25`	`25`	`var type = p.Type.GetTypeString();`
`26`	`26`	`var name = p.Name.ToLowerFirstChar();`
	`27`	`+ var parameterName = p.Name.GetSanitizedParameterName();`
	`28`	`+ var propertyName = p.Name.ToCheckedCase();`
`27`	`29`
`28`	`30`	`if (p.IsCollection)`
`29`	`31`	`{`
`@@ -34,12 +36,12 @@ var methods = overloads`
`34`	`36`	`type += "?";`
`35`	`37`	`}`
`36`	`38`
`37`		`- return new { Type = type, Name = name, IsNullable = p.IsNullable };`
	`39`	`+ return new { Type = type, Name = name, ParameterName = parameterName, PropertyName = propertyName, IsNullable = p.IsNullable };`
`38`	`40`	`})`
`39`	`41`	`.OrderBy(p => p.IsNullable ? 1 : 0);`
`40`	`42`
`41`		`- var paramStrings = parameters.Select(p => string.Format(",\n {0} {1}", p.Type, p.Name));`
`42`		`- var paramComments = parameters.Select(p => string.Format("\n /// <param name=\"{0}\">A {0} parameter for the OData method call.</param>", p.Name));`
	`43`	`+ var paramStrings = parameters.Select(p => string.Format(",\n {0} {1}", p.Type, p.ParameterName));`
	`44`	`+ var paramComments = parameters.Select(p => string.Format("\n /// <param name=\"{0}\">A {0} parameter for the OData method call.</param>", p.ParameterName));`
`43`	`45`
`44`	`46`	`return new`
`45`	`47`	`{`
`@@ -55,6 +57,7 @@ namespace Microsoft.Graph`
`55`	`57`	`{`
`56`	`58`	`using System;`
`57`	`59`	`using System.Collections.Generic;`
	`60`	`+ using System.IO;`
`58`	`61`
`59`	`62`	`/// <summary>`
`60`	`63`	`/// The type DriveItemDeltaRequestBuilder.`
`@@ -79,7 +82,7 @@ foreach (var m in methods)`
`79`	`82`	`foreach (var p in m.Parameters)`
`80`	`83`	`{`
`81`	`84`	`#>`
`82`		`- SetParameter("<#=p.Name#>", <#=p.Name#>, <#=p.IsNullable.ToString().ToLowerInvariant()#>);`
	`85`	`+ SetParameter("<#=p.Name#>", <#=p.ParameterName#>, <#=p.IsNullable.ToString().ToLowerInvariant()#>);`
`83`	`86`	`<#`
`84`	`87`	`}`
`85`	`88`	`#>`
`@@ -107,7 +110,7 @@ foreach (var m in methods)`
`107`	`110`	`{`
`108`	`111`	`#>`
`109`	`112`	`if (HasParameter("<#=p.Name#>"))`
`110`		`- request.RequestBody.<#=p.Name.ToCheckedCase()#> = GetParameter<<#=p.Type#>>("<#=p.Name#>");`
	`113`	`+ request.RequestBody.<#=p.PropertyName#> = GetParameter<<#=p.Type#>>("<#=p.Name#>");`
`111`	`114`
`112`	`115`	`<#`
`113`	`116`	`}`