Duplicate code reduction re overloads

Author: Brian Melton

Templates/Android/extensions/MethodCollectionRequestBuilder.java.tt

@@ -5,14 +5,9 @@
 <#host.TemplateName = TypeCollectionRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<#
-var methods = new List<OdcmMethod>();
-methods.Add(c.AsOdcmMethod());
-methods.AddRange(c.AsOdcmMethod().Overloads);
-#>
 
 <#=CreateClassDef(TypeCollectionRequestBuilder(c), BaseTypeCollectionRequestBuilder(c), ITypeCollectionRequestBuilder(c))#>
-<# foreach (var method in methods) { #>
+<# foreach (var method in c.MethodsAndOverrides()) { #>
 
     /**
      * The request builder for this collection of <#=ClassTypeName(c)#>

Templates/Android/extensions/MethodRequestBuilder.java.tt

@@ -5,14 +5,9 @@
 <#host.TemplateName = TypeRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<#
-var methods = new List<OdcmMethod>();
-methods.Add(c.AsOdcmMethod());
-methods.AddRange(c.AsOdcmMethod().Overloads);
-#>
 
 <#=CreateClassDef(TypeRequestBuilder(c), BaseTypeRequestBuilder(c), ITypeRequestBuilder(c))#>
-<# foreach (var method in methods) { #>
+<# foreach (var method in c.MethodsAndOverrides()) { #>
 
     /**
      * The request builder for this <#=TypeName(c)#>

Templates/Android/generated/BaseMethodCollectionRequestBuilder.java.tt

@@ -5,15 +5,10 @@
 <#host.TemplateName = BaseTypeCollectionRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<#
-var methods = new List<OdcmMethod>();
-methods.Add(c.AsOdcmMethod());
-methods.AddRange(c.AsOdcmMethod().Overloads);
-#>
 <# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
 <#=CreateClassDef(BaseTypeCollectionRequestBuilder(c), RequestBuilderSuperClass(c), IBaseTypeCollectionRequestBuilder(c))#>
 
-<# foreach (var method in methods) { #>
+<# foreach (var method in c.MethodsAndOverrides()) { #>
     /**
      * The request builder for this collection of <#=ClassTypeName(c)#>
      *

Templates/Android/generated/BaseMethodRequestBuilder.java.tt

@@ -5,15 +5,10 @@
 <#host.TemplateName = BaseTypeRequestBuilder(c);#>
 <#=writer.WriteHeader()#>
 <#=CreatePackageDef(host)#>
-<#
-var methods = new List<OdcmMethod>();
-methods.Add(c.AsOdcmMethod());
-methods.AddRange(c.AsOdcmMethod().Overloads);
-#>
 <# bool isPost = IsPostRequestType(c.AsOdcmMethod()); #>
 <#=CreateClassDef(BaseTypeRequestBuilder(c),  RequestBuilderSuperClass(c))#>
 
-<# foreach (var method in methods) { #>
+<# foreach (var method in c.MethodsAndOverrides()) { #>
     /**
      * The request builder for this <#=TypeName(c)#>
      *

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -282,6 +282,7 @@ public static bool LongDescriptionStartsWith(this OdcmObject odcmObject, string
             var descriptionParts = odcmObject.GetLongDescriptionSegments();
             return descriptionParts != null && descriptionParts.Any(value => value.StartsWith(descriptionValue));
         }
+
         public static string[] GetLongDescriptionSegments(this OdcmObject odcmObject)
         {
             if (odcmObject.LongDescription != null)
@@ -292,6 +293,15 @@ public static string[] GetLongDescriptionSegments(this OdcmObject odcmObject)
             return null;
         }
 
+        /// Returns the complete list of methods supported by this OdcmObject, including its overloads
+        public static List<OdcmMethod> MethodsAndOverrides(this OdcmObject odcmObject)
+        {
+            var methods = new List<OdcmMethod>();
+            methods.Add(odcmObject.AsOdcmMethod());
+            methods.AddRange(odcmObject.AsOdcmMethod().Overloads);
+            return methods;
+        }
+
     }
 
 }