fix #3116 instances of gethashcode in equals implementation (#3117)

* fix #3116 instances of gethashcode in equals implementation

* Equals on types and indices now ignores order and implements == operator

Conflicts:
	src/Nest/CommonAbstractions/Infer/RelationName/RelationName.cs
	src/Tests/ClientConcepts/HighLevel/Inference/TypesAndRelationsInference.doc.cs
	src/Tests/Framework/Configuration/Versions/ElasticsearchVersion.cs
	src/Tests/Framework/ElasticsearchVersionTests.cs

Author: Mpdreamz

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

@@ -72,12 +72,13 @@ public bool EqualsString(string other)
 
 		public 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

@@ -74,8 +74,7 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 				all => "_all",
 				many =>
 				{
-					var nestSettings = settings as IConnectionSettingsValues;
-					if (nestSettings == null)
+					if (!(settings is IConnectionSettingsValues nestSettings))
 						throw new Exception("Tried to pass index names on querysting but it could not be resolved because no nest settings are available");
 
 					var infer = nestSettings.Inferrer;
@@ -85,19 +84,29 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 			);
 		}
 
+		public static bool operator ==(Indices left, Indices right) => Equals(left, right);
+
+		public static bool operator !=(Indices left, Indices right) => !Equals(left, right);
+
 		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> thisIndices, IReadOnlyList<IndexName> otherIndices)
+		{
+			if (thisIndices == null && otherIndices == null) return true;
+			if (thisIndices == null || otherIndices == null) return false;
+			return thisIndices.Count == otherIndices.Count && !thisIndices.Except(otherIndices).Any();
+		}
+
 		public override int GetHashCode()
 		{
 			return this.Match(

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

@@ -73,8 +73,8 @@ public 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

@@ -85,20 +85,30 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 			);
 
 		}
+		public static bool operator ==(Types left, Types right) => Equals(left, right);
+
+		public static bool operator !=(Types left, Types right) => !Equals(left, right);
 
 		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> thisTypes, IReadOnlyList<TypeName> otherTypes)
+		{
+			if (thisTypes == null && otherTypes == null) return true;
+			if (thisTypes == null || otherTypes == null) return false;
+			if (thisTypes.Count != otherTypes.Count) return false;
+			return thisTypes.Count == otherTypes.Count && !thisTypes.Except(otherTypes).Any();
+		}
+
 		public override int GetHashCode()
 		{
 			return this.Match(

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

@@ -170,17 +170,22 @@ [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"));
+
+			Nest.Indices indices1 = "foo,bar";
+			Nest.Indices indices2 = "bar,foo";
+			indices1.Should().Be(indices2);
+			(indices1 == indices2).Should().BeTrue();
 		}
 
 		//hide

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
 {