Merge pull request #45 from microsoftgraph/v0.9.4-beta

Android v0.9.4-beta

Author: iambmelt

Templates/Android/BaseModel.template.tt

@@ -473,9 +473,15 @@
         return null;
     }
 
+    public string OdcmMethodReturnType(OdcmMethod method) {
+        return method.ReturnType is OdcmPrimitiveType
+            ? method.ReturnType.GetTypeString() : method.ReturnType.Name.ToCheckedCase();
+    }
+
     public string CollectionPageGeneric(OdcmObject c) {
         if (c is OdcmMethod) {
-            return "<" + ClassTypeName(c) + ", " + ITypeCollectionRequestBuilder(c) + ">";
+            string returnType = OdcmMethodReturnType(c as OdcmMethod);
+            return "<" + returnType + ", " + ITypeCollectionRequestBuilder(c) + ">";
         }
         return "<" + TypeName(c) + ", " + ITypeCollectionRequestBuilder(c) + ">";
     }

Templates/Android/generated/BaseMethodCollectionResponse.java.tt

@@ -13,11 +13,15 @@ import com.google.gson.annotations.*;
 <#=CreateClassDef(BaseTypeCollectionResponse(c), null, "IJsonBackedObject")#>
 
     @SerializedName("value")
-    public List<<#=ClassTypeName(c)#>> value;
+    public List<<#=OdcmMethodReturnType(c as OdcmMethod)#>> value;
 
     @SerializedName("@odata.nextLink")
     public String nextLink;
 
 <#=CreateRawJsonObject()#>
-<#=UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>
+<# if ( ! ((c as OdcmMethod).ReturnType is OdcmPrimitiveType) ) { #>
+<#=    UpdateListPropertiesWithinSetRawObject(new [] { "value" })#>
+<# } else { #>
+    }
+<# } #>
 }