Bugfix for using ClassTypeName instead ReturnType

Author: Brian Melton

Templates/Android/generated/BaseMethodRequest.java.tt

@@ -22,21 +22,21 @@
 <# if (c.AsOdcmMethod().IsAction()) { #>
 <#      if (c.AsOdcmMethod().ReturnType != null) { #>
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
-    public void post(final ICallback<<#=ClassTypeName(c)#>> callback) {
+    public void post(final ICallback<<#=ReturnType(c)#>> callback) {
         send(HttpMethod.POST, callback, null);
     }
 
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
-    public <#=ClassTypeName(c)#> post() throws ClientException {
+    public <#=ReturnType(c)#> post() throws ClientException {
        return send(HttpMethod.POST, null);
     }
 
@@ -81,7 +81,7 @@
 <#          } #>
 <#      } else { #>
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
@@ -101,9 +101,9 @@
     }
 
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
     public void post() throws ClientException {
@@ -113,21 +113,21 @@
 <#  } else { #>
 <#      if (c.AsOdcmMethod().ReturnType != null) { #>
     /**
-     * Gets the <#=ClassTypeName(c)#>
+     * Gets the <#=ReturnType(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
-    public void get(final ICallback<<#=ClassTypeName(c)#>> callback) {
+    public void get(final ICallback<<#=ReturnType(c)#>> callback) {
         send(HttpMethod.GET, callback, null);
     }
 
     /**
-     * Gets the <#=ClassTypeName(c)#>
+     * Gets the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
-    public <#=ClassTypeName(c)#> get() throws ClientException {
+    public <#=ReturnType(c)#> get() throws ClientException {
        return send(HttpMethod.GET, null);
     }
 

Templates/Android/generated/IBaseMethodRequest.java.tt

@@ -14,19 +14,19 @@ import com.google.gson.annotations.*;
 <# if (c.AsOdcmMethod().IsAction()) { #>
 <#      if (c.AsOdcmMethod().ReturnType != null) { #>
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
-    void post(final ICallback<<#=ClassTypeName(c)#>> callback);
+    void post(final ICallback<<#=ReturnType(c)#>> callback);
 
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
-    <#=ClassTypeName(c)#> post() throws ClientException;
+    <#=ReturnType(c)#> post() throws ClientException;
 
 <# if (c.GetFeatures().CanSelect) { #>
     /**
@@ -59,16 +59,16 @@ import com.google.gson.annotations.*;
 <#          } #>
 <#      } else { #>
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
      * @param callback The callback to be called after success or failure.
      */
     void post(final ICallback<Void> callback);
 
     /**
-     * Creates the <#=ClassTypeName(c)#>
+     * Creates the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
     void post() throws ClientException;
@@ -77,19 +77,18 @@ import com.google.gson.annotations.*;
 <# } else { #>
 <#      if (c.AsOdcmMethod().ReturnType != null) { #>
     /**
-     * Gets the <#=ClassTypeName(c)#>
-     *
+     * Gets the <#=ReturnType(c)#>
      * @param callback The callback to be called after success or failure.
      */
-    void get(final ICallback<<#=ClassTypeName(c)#>> callback);
+    void get(final ICallback<<#=ReturnType(c)#>> callback);
 
     /**
-     * Gets the <#=ClassTypeName(c)#>
+     * Gets the <#=ReturnType(c)#>
      *
-     * @return The <#=ClassTypeName(c)#>
+     * @return The <#=ReturnType(c)#>
      * @throws ClientException An exception occurs if there was an error while the request was sent.
      */
-    <#=ClassTypeName(c)#> get() throws ClientException;
+    <#=ReturnType(c)#> get() throws ClientException;
 
 <# if (c.GetFeatures().CanSelect) { #>
     /**