Bugfixes for function/action detection + renaming superclass

Author: Brian Melton

Templates/Android/BaseModel.template.tt

@@ -5,37 +5,18 @@
     CustomT4Host host          = (CustomT4Host) Host;
     var model                  = host.CurrentModel;
     CodeWriterAndroid writer   = (CodeWriterAndroid) host.CodeWriter;
-    bool logTemplateSrc        = true;
+    bool logTemplateSrc        = false;
     var c = host.CurrentType;
 #>
 <# if (logTemplateSrc) { #>
 // Template Source: <#= TemplateName(host.TemplateFile) #>
 <# } #>
 <#+
 
-    /// Is this request type a post?
-    public bool IsPostRequestType(OdcmMethod method) {
-        return method.IsAction()
-            && null != method.Parameters
-            && method.Parameters.Any();
-    }
-
     /// Choose an intermediate class type based on GETs/POSTs
     public string RequestBuilderSuperClass(OdcmObject currentType) {
-        var isPostAction =
-            IsPostRequestType(
-                currentType.AsOdcmMethod()
-            );
-
-        string superClass;
-
-        if (isPostAction) {
-            superClass = "BasePostMethodRequestBuilder";
-        } else {
-            superClass = "BaseGetMethodRequestBuilder";
-        }
-
-        return superClass;
+        return currentType.AsOdcmMethod().IsFunction ?
+            "BaseFunctionRequestBuilder" : "BaseActionRequestBuilder";
     }
 
     /// <summary>

Templates/Android/generated/BaseMethodCollectionRequestBuilder.java.tt

@@ -5,7 +5,7 @@
 <#host.TemplateName = BaseTypeCollectionRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
+<# bool isAction = !c.AsOdcmMethod().IsFunction; #>
 <#=CreateClassDef(BaseTypeCollectionRequestBuilder(c), RequestBuilderSuperClass(c), IBaseTypeCollectionRequestBuilder(c))#>
 
 <# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
@@ -19,7 +19,7 @@
     public <#=BaseTypeCollectionRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions<#=MethodParametersSignature(method)#>) {
         super(requestUrl, client, requestOptions);
 <# foreach (var p in method.Parameters) { #>
-  <# if (isPost) { #>
+  <# if (isAction) { #>
       mBodyParams.put("<#=ParamName(p)#>", <#=ParamName(p)#>);
   <# } else { #>
       mFunctionOptions.add(new FunctionOption("<#=ParamName(p)#>", <#=ParamName(p)#>));
@@ -39,7 +39,7 @@
                 requestOptions
         );
 
-<# if (isPost) { #>
+<# if (isAction) { #>
   <# foreach (var p in c.AsOdcmMethod().Parameters) { #>
       if (hasParameter("<#=ParamName(p)#>")) {
             request.mBody.<#=ParamName(p)#> = getParameter("<#=ParamName(p)#>");

Templates/Android/generated/BaseMethodRequestBuilder.java.tt

@@ -5,7 +5,7 @@
 <#host.TemplateName = BaseTypeRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
+<# bool isAction = !c.AsOdcmMethod().IsFunction; #>
 <#=CreateClassDef(BaseTypeRequestBuilder(c),  RequestBuilderSuperClass(c))#>
 
 <# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
@@ -19,7 +19,7 @@
     public <#=BaseTypeRequestBuilder(c)#>(final String requestUrl, final <#=IBaseClientType()#> client, final List<Option> requestOptions<#=MethodParametersSignature(method)#>) {
         super(requestUrl, client, requestOptions);
 <#     foreach (var p in method.Parameters) { #>
-<#         if (isPost) { #>
+<#         if (isAction) { #>
         mBodyParams.put("<#=ParamName(p)#>", <#=ParamName(p)#>);
 <#         } else { #>
         mFunctionOptions.add(new FunctionOption("<#=ParamName(p)#>", <#=ParamName(p)#>));
@@ -50,18 +50,19 @@
                 requestOptions
         );
 
-<# if (isPost) { #>
-  <# foreach (var p in c.AsOdcmMethod().Parameters) { #>
-      if (hasParameter("<#=ParamName(p)#>")) {
+<# if (isAction) { #>
+<#   foreach (var p in c.AsOdcmMethod().Parameters) { #>
+        if (hasParameter("<#=ParamName(p)#>")) {
             request.mBody.<#=ParamName(p)#> = getParameter("<#=ParamName(p)#>");
         }
-  <# } #>
+
+<#   } #>
 <# } else { #>
       for (FunctionOption option : mFunctionOptions) {
             request.addFunctionOption(option);
       }
-<# } #>
 
+<# } #>
         return request;
     }
 }