More duplication reduction re overloads

Author: Brian Melton

Templates/Android/generated/BaseEntityRequestBuilder.java.tt

@@ -100,12 +100,7 @@ if (c.AsOdcmClass() != null)
     }
 #>
 <#
-    var allMethods = new List<OdcmMethod>();
-    foreach (var method in c.AsOdcmClass().Methods) {
-        allMethods.Add(method);
-        allMethods.AddRange(method.Overloads);
-    }
-    foreach (var method in allMethods)
+    foreach (var method in c.AsOdcmClass().MethodsAndOverloads())
     {
         var parameterList = MethodParametersSignature(method);
         if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }

Templates/Android/generated/BaseEntityStreamRequestBuilder.java.tt

@@ -102,12 +102,7 @@ if (c.AsOdcmClass() != null)
 #>
 
 <#
-    var allMethods = new List<OdcmMethod>();
-    foreach (var method in c.AsOdcmClass().Methods) {
-        allMethods.Add(method);
-        allMethods.AddRange(method.Overloads);
-    }
-    foreach (var method in allMethods)
+    foreach (var method in c.AsOdcmClass().MethodsAndOverloads())
     {
         var parameterList = MethodParametersSignature(method);
         if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }

Templates/Android/generated/IBaseEntityRequestBuilder.java.tt

@@ -72,12 +72,7 @@ if (c.AsOdcmClass() != null)
     }
 #>
 <#
-    var allMethods = new List<OdcmMethod>();
-    foreach (var method in c.AsOdcmClass().Methods) {
-        allMethods.Add(method);
-        allMethods.AddRange(method.Overloads);
-    }
-    foreach (var method in allMethods)
+    foreach (var method in c.AsOdcmClass().MethodsAndOverloads())
     {
         var parameterList = MethodParametersSignature(method);
         if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }

Templates/Android/generated/IBaseEntityStreamRequestBuilder.java.tt

@@ -77,12 +77,7 @@ if (c.AsOdcmClass() != null)
 
 
 <#
-    var allMethods = new List<OdcmMethod>();
-    foreach (var method in c.AsOdcmClass().Methods) {
-        allMethods.Add(method);
-        allMethods.AddRange(method.Overloads);
-    }
-    foreach (var method in allMethods)
+    foreach (var method in c.AsOdcmClass().MethodsAndOverloads())
     {
         var parameterList = MethodParametersSignature(method);
         if (parameterList != "") { parameterList = parameterList.Remove(0, 2); }

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -302,6 +302,16 @@ public static List<OdcmMethod> WithOverloads(this OdcmMethod odcmMethod)
             return methods;
         }
 
+        public static List<OdcmMethod> MethodsAndOverloads(this OdcmClass odcmClass)
+        {
+            var allMethods = new List<OdcmMethod>();
+            foreach (var method in odcmClass.Methods)
+            {
+                allMethods.AddRange(method.WithOverloads());
+            }
+            return allMethods;
+        }
+
     }
 
 }