Fixing naming

Author: Brian Melton

Templates/Android/extensions/MethodCollectionRequestBuilder.java.tt

@@ -7,7 +7,7 @@
 <#=CreatePackageDef(host)#>
 
 <#=CreateClassDef(TypeCollectionRequestBuilder(c), BaseTypeCollectionRequestBuilder(c), ITypeCollectionRequestBuilder(c))#>
-<# foreach (var method in c.MethodsAndOverrides()) { #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
 
     /**
      * The request builder for this collection of <#=ClassTypeName(c)#>

Templates/Android/extensions/MethodRequestBuilder.java.tt

@@ -7,7 +7,7 @@
 <#=CreatePackageDef(host)#>
 
 <#=CreateClassDef(TypeRequestBuilder(c), BaseTypeRequestBuilder(c), ITypeRequestBuilder(c))#>
-<# foreach (var method in c.MethodsAndOverrides()) { #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
 
     /**
      * The request builder for this <#=TypeName(c)#>

Templates/Android/generated/BaseMethodCollectionRequestBuilder.java.tt

@@ -8,7 +8,7 @@
 <# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
 <#=CreateClassDef(BaseTypeCollectionRequestBuilder(c), RequestBuilderSuperClass(c), IBaseTypeCollectionRequestBuilder(c))#>
 
-<# foreach (var method in c.MethodsAndOverrides()) { #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
     /**
      * The request builder for this collection of <#=ClassTypeName(c)#>
      *

Templates/Android/generated/BaseMethodRequestBuilder.java.tt

@@ -8,7 +8,7 @@
 <# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
 <#=CreateClassDef(BaseTypeRequestBuilder(c),  RequestBuilderSuperClass(c))#>
 
-<# foreach (var method in c.MethodsAndOverrides()) { #>
+<# foreach (var method in c.AsOdcmMethod().WithOverloads()) { #>
     /**
      * The request builder for this <#=TypeName(c)#>
      *

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -294,11 +294,11 @@ public static string[] GetLongDescriptionSegments(this OdcmObject odcmObject)
         }
 
         /// Returns the complete list of methods supported by this OdcmObject, including its overloads
-        public static List<OdcmMethod> MethodsAndOverrides(this OdcmObject odcmObject)
+        public static List<OdcmMethod> WithOverloads(this OdcmMethod odcmMethod)
         {
             var methods = new List<OdcmMethod>();
-            methods.Add(odcmObject.AsOdcmMethod());
-            methods.AddRange(odcmObject.AsOdcmMethod().Overloads);
+            methods.Add(odcmMethod);
+            methods.AddRange(odcmMethod.Overloads);
             return methods;
         }