EntityClient and EntityCollectionPage fixes

Author: zengin

Templates/CSharp/Requests/EntityClient.cs.tt

@@ -79,13 +79,14 @@ namespace <#=@namespace#>
         }
         else
         {
-            var requestBuilder = prop.Projection.Type.Name.ToCheckedCase() + "RequestBuilder";
+            var requestBuilder = prop.GetTypeString(@namespace, "{0}RequestBuilder");
+            var iRequestBuilder = prop.GetTypeString(@namespace, "I{0}RequestBuilder");
     #>
 
         /// <summary>
         /// Gets the <#=propName#> request builder.
         /// </summary>
-        public I<#=requestBuilder#> <#=sanitizedPropName#>
+        public <#=iRequestBuilder#> <#=sanitizedPropName#>
         {
             get
             {

Templates/CSharp/Requests/EntityCollectionPage.cs.tt

@@ -32,7 +32,7 @@ namespace <#=@namespace#>
         /// <summary>
         /// Initializes the NextPageRequest property.
         /// </summary>
-        public void InitializeNextPageRequest(IBaseClient client, string nextPageLinkString)
+        public void InitializeNextPageRequest(<#[email protected]("IBaseClient")#> client, string nextPageLinkString)
         {
             if (!string.IsNullOrEmpty(nextPageLinkString))
             {

src/GraphODataTemplateWriter/CodeHelpers/CSharp/TypeHelperCSharp.cs

@@ -162,12 +162,17 @@ public static string GetTypeString(this OdcmProperty property)
             return GetTypeString(property.Projection.Type);
         }
 
-        public static string GetTypeString(this OdcmType type, string namespaceContext)
+        public static string GetTypeString(this OdcmType type, string namespaceContext, string format = null)
         {
             var typesNamespace = type.Namespace.GetNamespaceName().Replace("edm.", "");
             var plainTypeString = type.GetTypeString();
+            if (format != null)
+            {
+                plainTypeString = string.Format(format, plainTypeString);
+            }
+
             if (string.Equals(typesNamespace, namespaceContext, StringComparison.OrdinalIgnoreCase)
-            || typesNamespace == "Edm")
+                || typesNamespace == "Edm")
             {
                 return plainTypeString;
             }
@@ -177,9 +182,9 @@ public static string GetTypeString(this OdcmType type, string namespaceContext)
             }
         }
 
-        public static string GetTypeString(this OdcmProperty property, string namespaceContext)
+        public static string GetTypeString(this OdcmProperty property, string namespaceContext, string format = null)
         {
-            return property.Projection.Type.GetTypeString(namespaceContext);
+            return property.Projection.Type.GetTypeString(namespaceContext, format);
         }
 
         public static bool IsTypeNullable(this OdcmProperty property)
@@ -337,5 +342,17 @@ public static string GetToLowerImport(this OdcmProperty property)
             var index = type.Name.LastIndexOf('.');
             return type.Name.Substring(0, index).ToLower() + type.Name.Substring(index);
         }
+
+        public static string GetMiddlewareTypeName(this string namespaceContext, string typeName)
+        {
+            if (namespaceContext == "Microsoft.Graph")
+            {
+                return typeName;
+            }
+            else
+            {
+                return $"Microsoft.Graph.{typeName}";
+            }
+        }
     }
 }