Move RestoreObservable to where other Restore components are situated

Author: russcam

src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/ElasticClient-RestoreObservable.cs

@@ -24,6 +24,5 @@ public IObservable<IRecoveryStatusResponse> RestoreObservable(Name repository, N
 		/// <inheritdoc/>
 		public IObservable<IRecoveryStatusResponse> RestoreObservable(TimeSpan interval, IRestoreRequest request)=>
 			new RestoreObservable(this, request, interval);
-
 	}
 }

src/Nest/Document/Multiple/Reindex/RestoreObservable.cs renamed to src/Nest/Modules/SnapshotAndRestore/Restore/RestoreObservable/RestoreObservable.cs

@@ -1,9 +1,9 @@
-using Elasticsearch.Net;
-using System;
+using System;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -109,7 +109,8 @@ public void Dispose()
 		protected virtual void Dispose(bool disposing)
 		{
 			if (_disposed) return;
-			if (_timer != null) _timer.Dispose();
+			_timer?.Dispose();
+
 			if (_restoreStatusHumbleObject != null)
 			{
 				_restoreStatusHumbleObject.Next -= _nextEventHandlers;
@@ -131,7 +132,7 @@ protected virtual void Dispose(bool disposing)
 
 	public class RestoreNextEventArgs : EventArgs
 	{
-		public IRecoveryStatusResponse RecoveryStatusResponse { get; private set; }
+		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
 
 		public RestoreNextEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
 		{
@@ -141,7 +142,7 @@ public RestoreNextEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
 
 	public class RestoreCompletedEventArgs : EventArgs
 	{
-		public IRecoveryStatusResponse RecoveryStatusResponse { get; private set; }
+		public IRecoveryStatusResponse RecoveryStatusResponse { get; }
 
 		public RestoreCompletedEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
 		{
@@ -151,7 +152,7 @@ public RestoreCompletedEventArgs(IRecoveryStatusResponse recoveryStatusResponse)
 
 	public class RestoreErrorEventArgs : EventArgs
 	{
-		public Exception Exception { get; private set; }
+		public Exception Exception { get; }
 
 		public RestoreErrorEventArgs(Exception exception)
 		{
@@ -220,19 +221,19 @@ public void CheckStatus()
 		protected virtual void OnNext(RestoreNextEventArgs nextEventArgs)
 		{
 			var handler = Next;
-			if (handler != null) handler(this, nextEventArgs);
+			handler?.Invoke(this, nextEventArgs);
 		}
 
 		protected virtual void OnCompleted(RestoreCompletedEventArgs completedEventArgs)
 		{
 			var handler = Completed;
-			if (handler != null) handler(this, completedEventArgs);
+			handler?.Invoke(this, completedEventArgs);
 		}
 
 		protected virtual void OnError(RestoreErrorEventArgs errorEventArgs)
 		{
 			var handler = Error;
-			if (handler != null) handler(this, errorEventArgs);
+			handler?.Invoke(this, errorEventArgs);
 		}
 	}
 }

src/Nest/Search/CovariantSearch.cs

@@ -9,7 +9,7 @@ internal static class CovariantSearch
 		/// Based on the type information present in this descriptor create method that takes
 		/// the returned _source and hit and returns the ClrType it should deserialize too.
 		/// This is so that Documents[A] can contain actual instances of subclasses B, C as well.
-		/// If you specify types using .Types(typeof(B), typeof(C)) then NEST can automagically
+		/// If you specify types using .Type(typeof(B), typeof(C)) then NEST can automagically
 		/// create a TypeSelector based on the hits _type property.
 		/// </summary>
 		public static void CloseOverAutomagicCovariantResultSelector(Inferrer infer, ICovariantSearchRequest self)
@@ -33,12 +33,11 @@ public static void CloseOverAutomagicCovariantResultSelector(Inferrer infer, ICo
 			};
 		}
 	}
+
 	public interface ICovariantSearchRequest
 	{
 		Type ClrType { get; }
 		Types ElasticsearchTypes { get; }
 		Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set;}
 	}
-
-
 }