fix #3116 instances of gethashcode in equals implementation

Author: Mpdreamz

src/Nest/CommonAbstractions/Infer/IndexName/IndexName.cs

@@ -92,12 +92,13 @@ private bool EqualsString(string other)
 
 		private bool EqualsMarker(IndexName other)
 		{
-			if (!this.Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
+			if (other == null) return false;
+			if (!this.Name.IsNullOrEmpty() && !other.Name.IsNullOrEmpty())
 				return EqualsString(PrefixClusterName(other,other.Name));
 
-			if (this.Type != null && other != null && other.Type != null)
-				return this.GetHashCode() == other.GetHashCode();
-			return false;
+			if ((!this.Cluster.IsNullOrEmpty() || !other.Cluster.IsNullOrEmpty()) && this.Cluster != other.Cluster) return false;
+
+			return this.Type != null && other?.Type != null && this.Type == other.Type;
 		}
 
 		public string GetString(IConnectionConfigurationValues settings)

src/Nest/CommonAbstractions/Infer/Indices/Indices.cs

@@ -87,17 +87,24 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 
 		public override bool Equals(object obj)
 		{
-			var other = obj as Indices;
-			if (other == null) return false;
+			if (!(obj is Indices other)) return false;
 			return this.Match(
 				all => other.Match(a => true, m => false),
 				many => other.Match(
 					a => false,
-					m => this.GetHashCode().Equals(other.GetHashCode())
+					m => EqualsAllIndices(m.Indices, many.Indices)
 				)
 			);
 		}
 
+		private static bool EqualsAllIndices(IReadOnlyList<IndexName> indicesCurrent, IReadOnlyList<IndexName> indicesOther)
+		{
+			if (indicesCurrent == null && indicesOther == null) return true;
+			if (indicesCurrent == null || indicesOther == null) return false;
+			if (indicesCurrent.Count != indicesOther.Count) return false;
+			return indicesCurrent.Zip(indicesOther, Tuple.Create).All(t=>t.Item1.Equals(t.Item2));
+		}
+
 		public override int GetHashCode()
 		{
 			return this.Match(

src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs

@@ -53,9 +53,7 @@ public override bool Equals(object obj)
 		{
 			var s = obj as string;
 			if (!s.IsNullOrEmpty()) return this.EqualsString(s);
-			var pp = obj as RelationName;
-			if (pp != null) return this.EqualsMarker(pp);
-
+			if (obj is RelationName pp) return this.EqualsMarker(pp);
 			return base.Equals(obj);
 		}
 
@@ -70,8 +68,8 @@ public bool EqualsMarker(RelationName other)
 		{
 			if (!this.Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
 				return EqualsString(other.Name);
-			if (this.Type != null && other != null && other.Type != null)
-				return this.GetHashCode() == other.GetHashCode();
+			if (this.Type != null && other?.Type != null)
+				return this.Type == other.Type;
 			return false;
 		}
 

src/Nest/CommonAbstractions/Infer/TypeName/TypeName.cs

@@ -66,8 +66,8 @@ private bool EqualsMarker(TypeName other)
 		{
 			if (!this.Name.IsNullOrEmpty() && other != null && !other.Name.IsNullOrEmpty())
 				return EqualsString(other.Name);
-			if (this.Type != null && other != null && other.Type != null)
-				return this.GetHashCode() == other.GetHashCode();
+			if (this.Type != null && other?.Type != null)
+				return this.Type == other.Type;
 			return false;
 		}
 

src/Nest/CommonAbstractions/Infer/Types/Types.cs

@@ -88,17 +88,24 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 
 		public override bool Equals(object obj)
 		{
-			var other = obj as Types;
-			if (other == null) return false;
+			if (!(obj is Types other)) return false;
 			return this.Match(
 				all => other.Match(a => true, m => false),
 				many => other.Match(
 					a => false,
-					m => this.GetHashCode().Equals(other.GetHashCode())
+					m => EqualsAllTypes(m.Types, many.Types)
 				)
 			);
 		}
 
+		private static bool EqualsAllTypes(IReadOnlyList<TypeName> indicesCurrent, IReadOnlyList<TypeName> indicesOther)
+		{
+			if (indicesCurrent == null && indicesOther == null) return true;
+			if (indicesCurrent == null || indicesOther == null) return false;
+			if (indicesCurrent.Count != indicesOther.Count) return false;
+			return indicesCurrent.Zip(indicesOther, Tuple.Create).All(t=>t.Item1.Equals(t.Item2));
+		}
+
 		public override int GetHashCode()
 		{
 			return this.Match(

src/Tests/ClientConcepts/HighLevel/Inference/IndexNameInference.doc.cs

@@ -170,14 +170,14 @@ [U] public void EqualsValidation()
 		{
 			var clusterIndex = (IndexName)"cluster_one:p";
 			var index = (IndexName)"p";
+			Index<Project>("cluster_one").Should().NotBe(Index<Project>("cluster_two"));
 
 			clusterIndex.Should().NotBe(index);
 			clusterIndex.Should().Be("cluster_one:p");
 			clusterIndex.Should().Be((IndexName)"cluster_one:p");
 
 			Index<Project>().Should().Be(Index<Project>());
 			Index<Project>().Should().NotBe(Index<Project>("cluster_two"));
-			Index<Project>("cluster_one").Should().NotBe(Index<Project>("cluster_two"));
 			Index<Project>("cluster_one").Should().NotBe("cluster_one:project");
 			Index<Project>().Should().NotBe(Index<Developer>());
 			Index<Project>("cluster_one").Should().NotBe(Index<Developer>("cluster_one"));

src/Tests/Framework/Configuration/TestConfigurationBase.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tests.Framework.Versions;
+using Tests.Framework.Versions;
 
 namespace Tests.Framework.Configuration
 {

src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Net;
-using System.Text.RegularExpressions;
-using Nest;
 using Version = SemVer.Version;
 
 namespace Tests.Framework.Versions

src/Tests/Framework/ElasticsearchVersionTests.cs

@@ -5,10 +5,7 @@ namespace Tests.Framework
 {
 	public class MockElasticsearchVersionResolver : ElasticsearchVersionResolver
 	{
-		public MockElasticsearchVersionResolver()
-		{
-
-		}
+		public MockElasticsearchVersionResolver() { }
 
 		public override string LatestSnapshot => "7.3.1-SNAPSHOT";
 		public override string LatestVersion => "7.3.1";
@@ -18,8 +15,6 @@ public override string SnapshotZipFilename(string version)
 		}
 	}
 
-
-
 	public class ElasticsearchVersionTests
 	{
 		public ElasticsearchVersion Create(string version) => ElasticsearchVersion.Create(version, new MockElasticsearchVersionResolver());