method request body and some additional method fixes

Author: zengin

Templates/CSharp/Base/IRequestBuilder.Base.template.tt

@@ -7,14 +7,17 @@ public string GetEntityInterfaceDefinition(OdcmClass entity)
 {
     string typeDeclaration = null;
     var className = this.GetEntityRequestBuilderName(entity);
+    var @namespace = entity.GetNamespaceName();
+    var iBaseRequestBuilderTypeName = @namespace.GetMiddlewareTypeName("IBaseRequestBuilder");
 
     if (entity.Base == null)
     {
-        typeDeclaration = string.Format("I{0} : IBaseRequestBuilder", className);
+        typeDeclaration = string.Format("I{0} : {1}", className, iBaseRequestBuilderTypeName);
     }
     else
     {
-        typeDeclaration = string.Format("I{0} : I{1}RequestBuilder", className, entity.Base.Name.ToCheckedCase());
+        var baseIRequestBuilderTypeName = entity.Base.GetTypeString(@namespace, "I{0}RequestBuilder");
+        typeDeclaration = string.Format("I{0} : {1}", className, baseIRequestBuilderTypeName);
     }
 
     var stringBuilder = new StringBuilder();

Templates/CSharp/Base/RequestBuilder.Base.template.tt

@@ -21,13 +21,16 @@ public string GetClassDefinition(string className, string @namespace)
 
 public string GetEntityClassDefinition(OdcmClass entity)
 {
-    var baseRequestBuilderTypeName = entity.GetNamespaceName().GetMiddlewareTypeName("BaseRequestBuilder");
+    var @namespace = entity.GetNamespaceName();
+    var baseRequestBuilderTypeName = @namespace.GetMiddlewareTypeName("BaseRequestBuilder");
+
     string typeDeclaration = null;
     var className = this.GetEntityRequestBuilderName(entity);
 
     if (entity.Base != null)
     {
-        typeDeclaration = string.Format("{0} : {1}RequestBuilder, I{0}", className, entity.Base.Name.ToCheckedCase());
+        var baseTypeRequestBuilderTypeName = entity.Base.GetTypeString(@namespace, "{0}RequestBuilder");
+        typeDeclaration = string.Format("{0} : {1}, I{0}", className, baseTypeRequestBuilderTypeName);
     }
     else
     {

Templates/CSharp/Requests/IMethodRequest.cs.tt

@@ -7,6 +7,8 @@ var method = host.CurrentType.AsOdcmMethod();
 var @namespace = method.Namespace.GetNamespaceName();
 var entityName = method.Class.Name.ToCheckedCase();
 
+var iBaseRequestTypeName = @namespace.GetMiddlewareTypeName("IBaseRequest");
+
 var isFunction = method.IsFunction;
 var isAction = !isFunction;
 var isComposable = method.IsComposable;
@@ -48,7 +50,7 @@ namespace <#=@namespace#>
     /// <summary>
     /// The interface I<#=requestType#>.
     /// </summary>
-    public partial interface I<#=requestType#> : IBaseRequest
+    public partial interface I<#=requestType#> : <#=iBaseRequestTypeName#>
     {
 <#
     if (includeRequestBody)

Templates/CSharp/Requests/IMethodRequestBuilder.cs.tt

@@ -5,6 +5,9 @@
 
 var method = host.CurrentType.AsOdcmMethod();
 var @namespace = method.Namespace.GetNamespaceName();
+
+var optionTypeName = @namespace.GetMiddlewareTypeName("Option");
+
 var entityName = method.Class.Name.ToCheckedCase();
 var requestType = entityName + method.Name.Substring(method.Name.IndexOf('.') + 1).ToCheckedCase() + "Request";
 var requestBuilderType = requestType + "Builder";
@@ -26,6 +29,6 @@ namespace <#=@namespace#>
         /// </summary>
         /// <param name="options">The query and header options for the request.</param>
         /// <returns>The built request.</returns>
-        I<#=requestType#> Request(IEnumerable<Option> options = null);
+        I<#=requestType#> Request(IEnumerable<<#=optionTypeName#>> options = null);
     }
 }

Templates/CSharp/Requests/MethodRequest.cs.tt

@@ -5,6 +5,11 @@
 
 var method = host.CurrentType.AsOdcmMethod();
 var @namespace = method.Namespace.GetNamespaceName();
+
+var baseRequestTypeName = @namespace.GetMiddlewareTypeName("BaseRequest");
+var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
+var optionTypeName = @namespace.GetMiddlewareTypeName("Option");
+
 var entityName = method.Class.Name.ToCheckedCase();
 
 var isFunction = method.IsFunction;
@@ -55,15 +60,15 @@ namespace <#=@namespace#>
     /// <summary>
     /// The type <#=requestType#>.
     /// </summary>
-    public partial class <#=requestType#> : BaseRequest, I<#=requestType#>
+    public partial class <#=requestType#> : <#=baseRequestTypeName#>, I<#=requestType#>
     {
         /// <summary>
         /// Constructs a new <#=requestType#>.
         /// </summary>
         public <#=requestType#>(
             string requestUrl,
-            IBaseClient client,
-            IEnumerable<Option> options)
+            <#=iBaseClientTypeName#> client,
+            IEnumerable<<#=optionTypeName#>> options)
             : base(requestUrl, client, options)
         {
 <#

Templates/CSharp/Requests/MethodRequestBuilder.cs.tt

@@ -5,6 +5,7 @@
 
 var method = host.CurrentType.AsOdcmMethod();
 var @namespace = method.Namespace.GetNamespaceName();
+
 var entityName = method.Class.Name.ToCheckedCase();
 var methodName = method.Name.ToCheckedCase();
 var requestType = entityName + methodName + "Request";
@@ -13,6 +14,10 @@ var requestBuilderType = requestType + "Builder";
 var isPost = method.IsAction() && method.Parameters != null && method.Parameters.Any();
 var methodType = method.IsFunction ? "Function" : "Action";
 
+var baseMethodRequestBuilderTypeName = @namespace.GetMiddlewareTypeName("Base" + methodType + "MethodRequestBuilder");
+var iBaseClientTypeName = @namespace.GetMiddlewareTypeName("IBaseClient");
+var optionTypeName = @namespace.GetMiddlewareTypeName("Option");
+
 // Overloads are determined based on the name of method and the type of the binding parameter.
 // There is no differentiation between an entity, and a collection of the same entities.
 // This may cause issues in the future that would require changes.
@@ -71,7 +76,7 @@ namespace <#=@namespace#>
     /// <summary>
     /// The type <#=requestBuilderType#>.
     /// </summary>
-    public partial class <#=requestBuilderType#> : Base<#=methodType#>MethodRequestBuilder<I<#=requestType#>>, I<#=requestBuilderType#>
+    public partial class <#=requestBuilderType#> : <#=baseMethodRequestBuilderTypeName#><I<#=requestType#>>, I<#=requestBuilderType#>
     {
 <#
 // We only want to generate unique method signatures. 
@@ -90,7 +95,7 @@ foreach (var m in methods)
         /// <param name="client">The <see cref="IBaseClient"/> for handling requests.</param><#=m.ParameterComments#>
         public <#=requestBuilderType#>(
             string requestUrl,
-            IBaseClient client<#=m.ParametersAsArguments#>)
+            <#=iBaseClientTypeName#> client<#=m.ParametersAsArguments#>)
             : base(requestUrl, client)
         {
 <#
@@ -113,7 +118,7 @@ foreach (var m in methods)
         /// <param name="functionUrl">The request URL to </param>
         /// <param name="options">The query and header options for the request.</param>
         /// <returns>An instance of a specific request class.</returns>
-        protected override I<#=requestType#> CreateRequest(string functionUrl, IEnumerable<Option> options)
+        protected override I<#=requestType#> CreateRequest(string functionUrl, IEnumerable<<#=optionTypeName#>> options)
         {
             var request = new <#=requestType#>(functionUrl, this.Client, options);