Rename InvalidProductException to UnsupportedProductException (#5930)

Author: stevejgordon

src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs

@@ -272,9 +272,9 @@ public void FirstPoolUsage(SemaphoreSlim semaphore)
 			switch (_connectionPool.ProductCheckStatus)
 			{
 				case ProductCheckStatus.InvalidProduct:
-					throw new InvalidProductException(InvalidProductException.InvalidProductError);
+					throw new UnsupportedProductException(UnsupportedProductException.InvalidProductError);
 				case ProductCheckStatus.UnsupportedBuildFlavor:
-					throw new InvalidProductException(InvalidProductException.InvalidBuildFlavorError);
+					throw new UnsupportedProductException(UnsupportedProductException.InvalidBuildFlavorError);
 			}
 
 			// If sniffing has completed and the product check has run, we are done!
@@ -322,9 +322,9 @@ public void FirstPoolUsage(SemaphoreSlim semaphore)
 				switch (_connectionPool.ProductCheckStatus)
 				{
 					case ProductCheckStatus.InvalidProduct:
-						throw new InvalidProductException(InvalidProductException.InvalidProductError);
+						throw new UnsupportedProductException(UnsupportedProductException.InvalidProductError);
 					case ProductCheckStatus.UnsupportedBuildFlavor:
-						throw new InvalidProductException(InvalidProductException.InvalidBuildFlavorError);
+						throw new UnsupportedProductException(UnsupportedProductException.InvalidBuildFlavorError);
 				}
 
 				if (!FirstPoolUsageNeedsSniffing)
@@ -348,9 +348,9 @@ public async Task FirstPoolUsageAsync(SemaphoreSlim semaphore, CancellationToken
 			switch (_connectionPool.ProductCheckStatus)
 			{
 				case ProductCheckStatus.InvalidProduct:
-					throw new InvalidProductException(InvalidProductException.InvalidProductError);
+					throw new UnsupportedProductException(UnsupportedProductException.InvalidProductError);
 				case ProductCheckStatus.UnsupportedBuildFlavor:
-					throw new InvalidProductException(InvalidProductException.InvalidBuildFlavorError);
+					throw new UnsupportedProductException(UnsupportedProductException.InvalidBuildFlavorError);
 			}
 
 			// If sniffing has completed and the product check has run, we are done!
@@ -402,9 +402,9 @@ public async Task FirstPoolUsageAsync(SemaphoreSlim semaphore, CancellationToken
 				switch (_connectionPool.ProductCheckStatus)
 				{
 					case ProductCheckStatus.InvalidProduct:
-						throw new InvalidProductException(InvalidProductException.InvalidProductError);
+						throw new UnsupportedProductException(UnsupportedProductException.InvalidProductError);
 					case ProductCheckStatus.UnsupportedBuildFlavor:
-						throw new InvalidProductException(InvalidProductException.InvalidBuildFlavorError);
+						throw new UnsupportedProductException(UnsupportedProductException.InvalidBuildFlavorError);
 				}
 
 				if (FirstPoolUsageNeedsSniffing)

src/Elasticsearch.Net/Transport/Pipeline/InvalidProductException.cs renamed to src/Elasticsearch.Net/Transport/Pipeline/UnsupportedProductException.cs

@@ -6,12 +6,17 @@
 
 namespace Elasticsearch.Net
 {
-	public class InvalidProductException : Exception
+	/// <summary>
+	/// Thrown when the client pre-flight check determines that the server is not a supported Elasticsearch product.
+	/// </summary>
+	public class UnsupportedProductException : Exception
 	{
-		internal const string InvalidProductError = "The client noticed that the server is not Elasticsearch and we do not support this unknown product.";
 		internal const string InvalidBuildFlavorError = "The client noticed that the server is not a supported distribution of Elasticsearch.";
 
-		public InvalidProductException(string error)
+		internal const string InvalidProductError =
+			"The client noticed that the server is not Elasticsearch and we do not support this unknown product.";
+
+		public UnsupportedProductException(string error)
 			: base(error) { }
 	}
 }

tests/Tests/ClientConcepts/ProductCheckTests.cs

@@ -25,7 +25,7 @@ [U] public void MissingProductNameHeaderCausesExceptionOnVersion7_14()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void InvalidProductNameHeaderCausesException()
@@ -40,7 +40,7 @@ [U] public void InvalidProductNameHeaderCausesException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void UnauthorizedStatusCodeFromRootPathDoesNotThrowException_WithExpectedDataOnApiCall()
@@ -87,7 +87,7 @@ [U] public void OldVersionsThrowException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void MissingTaglineOnVersionSixThrowsException()
@@ -102,7 +102,7 @@ [U] public void MissingTaglineOnVersionSixThrowsException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void InvalidTaglineOnVersionSixThrowsException()
@@ -117,7 +117,7 @@ [U] public void InvalidTaglineOnVersionSixThrowsException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void ExpectedTaglineOnVersionSixDoesNotThrowException_WithExpectedDataOnApiCall()
@@ -148,7 +148,7 @@ [U] public void MissingBuildFlavorOnVersionSevenThrowsException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void InvalidBuildFlavorMissingOnVersionSevenThrowsException()
@@ -163,7 +163,7 @@ [U] public void InvalidBuildFlavorMissingOnVersionSevenThrowsException()
 
 			client.Invoking(y => y.Cluster.Health())
 				.Should()
-				.Throw<InvalidProductException>();
+				.Throw<UnsupportedProductException>();
 		}
 
 		[U] public void ExpectedBuildFlavorOnVersionSixDoesNotThrowException_WithExpectedDataOnApiCall()