- adds a distinct overloads methods to avoid generating similar overloads in Java

Author: baywet

src/GraphODataTemplateWriter/Extensions/OdcmModelExtensions.cs

@@ -470,11 +470,20 @@ public static string[] GetLongDescriptionSegments(this OdcmObject odcmObject)
         /// Returns a List containing the supplied method plus its overloads
         public static List<OdcmMethod> WithOverloads(this OdcmMethod odcmMethod)
         {
-            var methods = new List<OdcmMethod>();
-            methods.Add(odcmMethod);
+            var methods = new List<OdcmMethod>
+            {
+                odcmMethod
+            };
             methods.AddRange(odcmMethod.Overloads);
             return methods;
         }
+        private static readonly OdcmMethodEqualityComparer methodComparer = new OdcmMethodEqualityComparer();
+        public static List<OdcmMethod> WithDistinctOverloads(this OdcmMethod odcmMethod)
+        {
+            var methods = odcmMethod.WithOverloads();
+
+            return methods.Distinct(methodComparer).ToList();
+        }
 
         /// Returns a List containing the supplied class' methods plus their overloads
         public static List<OdcmMethod> MethodsAndOverloads(this OdcmClass odcmClass)

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -76,6 +76,10 @@
     <Compile Include="CodeHelpers\Python\CodeWriterPython.cs" />
     <Compile Include="CodeHelpers\Python\TypeHelperPython.cs" />
     <Compile Include="Extensions\FeatureExtensions.cs" />
+    <Compile Include="OdcmMethodEqualityComparer.cs" />
+    <Compile Include="OdcmParameterCollectionEqualityComparer.cs" />
+    <Compile Include="OdcmParameterEqualityComparer.cs" />
+    <Compile Include="OdcmTypeEqualityComparer.cs" />
     <Compile Include="PathWriters\AndroidPathWriter.cs" />
     <Compile Include="PathWriters\CSharpPathWriter.cs" />
     <Compile Include="PathWriters\TypeScriptPathWriter.cs" />

src/GraphODataTemplateWriter/OdcmMethodEqualityComparer.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using Vipr.Core.CodeModel;
+
+namespace Microsoft.Graph.ODataTemplateWriter
+{
+    public class OdcmMethodEqualityComparer : IEqualityComparer<OdcmMethod>
+    {
+        private static readonly OdcmParameterCollectionEqualityComparer paramComparer = new OdcmParameterCollectionEqualityComparer();
+        public bool Equals(OdcmMethod x, OdcmMethod y)
+        {
+            return x.FullName == y.FullName && paramComparer.Equals(y.Parameters, x.Parameters);
+        }
+        public int GetHashCode(OdcmMethod obj)
+        {
+            unchecked
+            {
+                return (obj?.FullName?.GetHashCode() ?? 0) * 23 + paramComparer.GetHashCode(obj?.Parameters);
+            }
+        }
+    }
+}

src/GraphODataTemplateWriter/OdcmParameterCollectionEqualityComparer.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Vipr.Core.CodeModel;
+
+namespace Microsoft.Graph.ODataTemplateWriter
+{
+    public class OdcmParameterCollectionEqualityComparer : IEqualityComparer<IEnumerable<OdcmParameter>>
+    {
+        private static readonly OdcmParameterEqualityComparer paramComparer = new OdcmParameterEqualityComparer();
+        public bool Equals(IEnumerable<OdcmParameter> x, IEnumerable<OdcmParameter> y)
+        {
+            if (x == null || y == null)
+                return x == y;
+            else
+            {
+                var orderedY = y.OrderBy(z => z.Name);
+                return x.Count() == y.Count()
+                        && x.OrderBy(z => z.Name).Select((z, idx) => paramComparer.Equals(z, orderedY.ElementAt(idx))).Aggregate((z, w) => z && w);
+            }
+        }
+
+        public int GetHashCode(IEnumerable<OdcmParameter> obj)
+        {
+            unchecked
+            {
+                return (obj?.Count() ?? 0) * 23 + (obj != null && obj.Any() ? 
+                                                    (obj?.Select(x => paramComparer.GetHashCode(x))?.Aggregate((x, y) => x ^ y) ?? 0) : 
+                                                    0);
+            }
+        }
+    }
+}

src/GraphODataTemplateWriter/OdcmParameterEqualityComparer.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using Vipr.Core.CodeModel;
+
+namespace Microsoft.Graph.ODataTemplateWriter
+{
+    public class OdcmParameterEqualityComparer : IEqualityComparer<OdcmParameter>
+    {
+        private static OdcmTypeEqualityComparer typeComparer = new OdcmTypeEqualityComparer();
+        public bool Equals(OdcmParameter x, OdcmParameter y)
+        {
+            return x?.Name == y?.Name && x?.IsCollection == y?.IsCollection && x?.IsNullable == y?.IsNullable && typeComparer.Equals(x?.Type, y?.Type);
+        }
+
+        public int GetHashCode(OdcmParameter obj)
+        {
+            unchecked
+            {
+                return obj == null ? 0 : obj.Name.GetHashCode() * 23 + obj.IsCollection.GetHashCode() * 13 + obj.IsNullable.GetHashCode() * 11 + typeComparer.GetHashCode(obj.Type);
+            }
+        }
+    }
+}

src/GraphODataTemplateWriter/OdcmTypeEqualityComparer.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using Vipr.Core.CodeModel;
+
+namespace Microsoft.Graph.ODataTemplateWriter
+{
+    public class OdcmTypeEqualityComparer : IEqualityComparer<OdcmType>
+    {
+        public bool Equals(OdcmType x, OdcmType y)
+        {
+            return x?.FullName == y?.FullName;
+        }
+
+        public int GetHashCode(OdcmType obj)
+        {
+            unchecked
+            {
+                return obj?.FullName?.GetHashCode() ?? 0;
+            }
+        }
+    }
+}