rename OutOfNodesException with MaxRetryException

Author: Mpdreamz

src/Elasticsearch.Net/Connection/ConnectionConfiguration.cs

@@ -106,7 +106,7 @@ public ConnectionConfiguration(Uri uri = null)
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200")))
 		{
 			//this.Host = uri.Host;
-			//this.Port = uri.Port;
+			//this.Port = uri.Port
 		}
 
 		public T MaximumRetries(int maxRetries)

src/Elasticsearch.Net/Connection/Transport.cs

@@ -128,7 +128,7 @@ private ElasticsearchResponse<T> RetryRequest<T>(
 			{
 				return this.DoRequest<T>(method, path, data, null, deserializationState, ++retried, initialSeed);
 			}
-			throw new OutOfNodesException(exceptionMessage, e);
+			throw new MaxRetryException(exceptionMessage, e);
 		}
 
 		private ElasticsearchResponse<T> _doRequest<T>(string method, Uri uri, byte[] postData, object deserializationState)
@@ -205,7 +205,7 @@ private Task<ElasticsearchResponse<T>> RetryRequestAsync<T>(
 			{
 				return this.DoRequestAsync<T>(method, path, data, null, deserializationState, ++retried, initialSeed);
 			}
-			throw new OutOfNodesException(exceptionMessage, e);
+			throw new MaxRetryException(exceptionMessage, e);
 		}
 		private Task<ElasticsearchResponse<T>> _doRequestAsync<T>(string method, Uri uri, byte[] postData, object deserializationState)
 		{

src/Elasticsearch.Net/Exceptions/OutOfNodesException.cs

@@ -5,13 +5,13 @@
 
 namespace Elasticsearch.Net.Exceptions
 {
-	public class OutOfNodesException : Exception
+	public class MaxRetryException : Exception
 	{
-		public OutOfNodesException(string message) : base(message)
+		public MaxRetryException(string message) : base(message)
 		{
 		}
 
-		public OutOfNodesException(string message, Exception innerException) : base(message, innerException)
+		public MaxRetryException(string message, Exception innerException) : base(message, innerException)
 		{
 
 		}

src/Tests/Elasticsearch.Net.Tests.Unit/Connection/RetryTests.cs

@@ -40,7 +40,7 @@ public void ThrowsOutOfNodesException_AndRetriesTheSpecifiedTimes()
 
 				client.Settings.MaxRetries.Should().Be(_retries);
 
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 				getCall.MustHaveHappened(Repeated.Exactly.Times(_retries + 1));
 
 			}
@@ -70,11 +70,11 @@ public async void ThrowsOutOfNodesException_AndRetriesTheSpecifiedTimes_Async()
 				}
 				catch (AggregateException ae)
 				{
-					Assert.AreEqual(typeof(OutOfNodesException), ae.InnerException.GetType());
+					Assert.AreEqual(typeof(MaxRetryException), ae.InnerException.GetType());
 				}
 				catch (Exception e)
 				{
-					Assert.AreEqual(typeof(OutOfNodesException), e.GetType());
+					Assert.AreEqual(typeof(MaxRetryException), e.GetType());
 				}
 				getCall.MustHaveHappened(Repeated.Exactly.Times(_retries + 1));
 
@@ -168,7 +168,7 @@ public void ShouldRetryOn503()
 
 				var client = fake.Resolve<ElasticsearchClient>();
 
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 				getCall.MustHaveHappened(Repeated.Exactly.Times(_retries + 1));
 
 			}
@@ -192,11 +192,11 @@ public async void ShouldRetryOn503_Async()
 				}
 				catch (AggregateException e)
 				{
-					Assert.AreEqual(e.InnerException.GetType(), typeof(OutOfNodesException));
+					Assert.AreEqual(e.InnerException.GetType(), typeof(MaxRetryException));
 				}
 				catch (Exception e)
 				{
-					Assert.AreEqual(e.GetType(), typeof(OutOfNodesException));
+					Assert.AreEqual(e.GetType(), typeof(MaxRetryException));
 				}
 				getCall.MustHaveHappened(Repeated.Exactly.Times(_retries + 1));
 

src/Tests/Elasticsearch.Net.Tests.Unit/Connection/SniffingConnectionPoolTests.cs

@@ -164,7 +164,7 @@ public void SniffOnConnectionFaultCausesSniffOn503()
 				client1.Info(); //info call 2
 				client1.Info(); //info call 3
 				client1.Info(); //info call 4
-				Assert.Throws<OutOfNodesException>(()=>client1.Info()); //info call 5
+				Assert.Throws<MaxRetryException>(()=>client1.Info()); //info call 5
 
 				sniffCall.MustHaveHappened(Repeated.Exactly.Once);
 				nowCall.MustHaveHappened(Repeated.Exactly.Times(7));

src/Tests/Elasticsearch.Net.Tests.Unit/Connection/StaticConnectionPoolRetryTests.cs

@@ -74,7 +74,7 @@ public void ThrowsOutOfNodesException_AndRetriesTheSpecifiedTimes()
 
 				//calling GET / should throw an OutOfNodesException because our fake
 				//will always throw an exception
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 				//the GetSync method must in total have been called the number of nodes times.
 				getCall.MustHaveHappened(Repeated.Exactly.Times(_retries + 1));
 
@@ -106,7 +106,7 @@ public void AllNodesMustBeTriedOnce()
 
 				var client = fake.Resolve<ElasticsearchClient>();
 
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 
 				//make sure we've observed an attempt on all the nodes
 				foreach (var call in calls)
@@ -135,7 +135,7 @@ public void HardRetryLimitTakesPrecedenceOverNumberOfNodes()
 
 				var client = fake.Resolve<ElasticsearchClient>();
 
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 
 				//We want to see 8 attempt to do a GET on /
 				//(original call + retry of 7 == 8)
@@ -227,7 +227,7 @@ public void AllNodesWillBeMarkedDead()
 				var client = fake.Resolve<ElasticsearchClient>();
 
 				//Since we always get a 503 we should see an out of nodes exception
-				Assert.Throws<OutOfNodesException>(()=> client.Info());
+				Assert.Throws<MaxRetryException>(()=> client.Info());
 
 				//The call should be tried on all the nodes
 				getCall.MustHaveHappened(Repeated.Exactly.Times(4));

src/Tests/Nest.Tests.Integration/ConnectionTests.cs

@@ -63,7 +63,7 @@ public void connect_to_unknown_hostname()
 
 			//this test will fail if fiddler is enabled since the proxy 
 			//will report a statuscode of 502 instead of -1
-			Assert.Throws<OutOfNodesException>(() =>
+			Assert.Throws<MaxRetryException>(() =>
 			{
 				var settings = new ConnectionSettings(new Uri("http://youdontownthis.domain.do.you"), "index");
 				var client = new ElasticClient(settings);