Remove IElasticsearchClient interface (#6161) (#6162)

Remove IElasticsearchClient interface.

We have deemed that this interface is not all that useful as it may change between versions if APIs are added, which ends up breaking and implementations. It's not super useful for testing scenarios and we'll look to provide better options and documentation instead.

Co-authored-by: Steve Gordon <sgordon@hotmail.co.uk>

src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs

@@ -9,15 +9,6 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-public partial interface IElasticsearchClient
-{
-	//HelpersNamespace Helpers { get; }
-
-	BulkAllObservable<T> BulkAll<T>(IEnumerable<T> documents, Action<BulkAllRequestDescriptor<T>> configure, CancellationToken cancellationToken = default);
-
-    BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default);
-}
-
 public partial class ElasticsearchClient
 {
 	//public HelpersNamespace Helpers { get; private set; }

src/Elastic.Clients.Elasticsearch/Client/IndexManyExtensions.cs

@@ -24,7 +24,7 @@ public static class IndexManyExtensions
 	/// <param name="objects">List of objects to index, Id will be inferred (Id property or IdProperty attribute on type)</param>
 	/// <param name="index">Override the inferred indexname for T</param>
 	/// <param name="type">Override the inferred typename for T</param>
-	public static BulkResponse IndexMany<T>(this IElasticsearchClient client, IEnumerable<T> @objects, IndexName index = null)
+	public static BulkResponse IndexMany<T>(this ElasticsearchClient client, IEnumerable<T> @objects, IndexName index = null)
 		where T : class
 	{
 		var bulkRequest = CreateIndexBulkRequest(objects, index);
@@ -41,7 +41,7 @@ public static BulkResponse IndexMany<T>(this IElasticsearchClient client, IEnume
 	/// <param name="objects">List of objects to index, Id will be inferred (Id property or IdProperty attribute on type)</param>
 	/// <param name="index">Override the inferred indexname for T</param>
 	/// <param name="type">Override the inferred typename for T</param>
-	public static Task<BulkResponse> IndexManyAsync<T>(this IElasticsearchClient client, IEnumerable<T> objects, IndexName index = null,
+	public static Task<BulkResponse> IndexManyAsync<T>(this ElasticsearchClient client, IEnumerable<T> objects, IndexName index = null,
 		CancellationToken cancellationToken = default
 	)
 		where T : class

src/Elastic.Clients.Elasticsearch/Common/Configuration/ElasticsearchClientSettings.cs

@@ -409,7 +409,7 @@ public abstract class
 		protected ConnectionConfigurationBase(NodePool nodePool, ITransportClient connection,
 			Serializer? serializer,
 			IProductRegistration registration = null)
-			: base(nodePool, connection, serializer, registration ?? new ElasticsearchProductRegistration(typeof(IElasticsearchClient))) =>
+			: base(nodePool, connection, serializer, registration ?? new ElasticsearchProductRegistration(typeof(ElasticsearchClient))) =>
 				UserAgent(ConnectionConfiguration.DefaultUserAgent);
 
 		bool ITransportClientConfigurationValues.IncludeServerStackTraceOnError => _includeServerStackTraceOnError;

src/Elastic.Clients.Elasticsearch/Common/ElasticsearchClientProductRegistration.cs

@@ -12,7 +12,7 @@ internal sealed class ElasticsearchClientProductRegistration : ElasticsearchProd
 {
 	public ElasticsearchClientProductRegistration(Type markerType) : base(markerType) { }
 
-	public static ElasticsearchClientProductRegistration DefaultForElasticsearchClientsElasticsearch { get; } = new(typeof(IElasticsearchClient));
+	public static ElasticsearchClientProductRegistration DefaultForElasticsearchClientsElasticsearch { get; } = new(typeof(ElasticsearchClient));
 
 	/// <summary>
 	///     Elastic.Clients.Elasticsearch handles 404 in its <see cref="ResponseBase.IsValid" />, we do not want the low level client throwing

src/Elastic.Clients.Elasticsearch/FutureGenerated/FutureGenerated.cs

@@ -1064,20 +1064,16 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 		}
 	}
 
-	public partial class ElasticsearchClient
-	{
-		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configure = null)
-		{
-			var descriptor = new SourceRequestDescriptor<TDocument>(document: id.Document, index: id?.Self?.Index, id: id?.Self?.Id);
-			configure?.Invoke(descriptor);
-			return DoRequest<SourceRequestDescriptor<TDocument>, SourceResponse<TDocument>>(descriptor);
-		}
-	}
+	//public partial class ElasticsearchClient
+	//{
+	//	public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configure = null)
+	//	{
+	//		var descriptor = new SourceRequestDescriptor<TDocument>(document: id.Document, index: id?.Self?.Index, id: id?.Self?.Id);
+	//		configure?.Invoke(descriptor);
+	//		return DoRequest<SourceRequestDescriptor<TDocument>, SourceResponse<TDocument>>(descriptor);
+	//	}
+	//}
 
-	public partial interface IElasticsearchClient
-	{
-		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configure = null);
-	}
 
 	public abstract partial class BulkResponseItemBase
 	{
@@ -1092,7 +1088,7 @@ public abstract partial class BulkResponseItemBase
 	// TODO - Should be added as a rule to the descriptor generator
 	//public sealed partial class SourceRequestDescriptor<TDocument>
 	//{
-	//	public SourceRequestDescriptor(TDocument documentWithId, IndexName index = null, Id id = null) : this(index ?? typeof(TDocument), id ?? Id.From(documentWithId)) { }
+	//	public SourceRequestDescriptor(TDocument documentWithId, IndexName index = null, Id id = null) : this(index ?? typeof(TDocument), id ?? Id.From(documentWithId)) => Doc
 	//}
 
 	public partial class SourceRequestDescriptor
@@ -1545,29 +1541,6 @@ public partial struct Refresh : IStringable
 
 	public class DocType { }
 
-	public partial interface IElasticsearchClient
-	{
-		DeleteResponse Delete<TDocument>(Id id, Action<DeleteRequestDescriptor<TDocument>> configureRequest);
-
-		Task<DeleteResponse> DeleteAsync<TDocument>(Id id, Action<DeleteRequestDescriptor<TDocument>> configureRequest, CancellationToken cancellationToken = default);
-
-		CreateResponse Create<TDocument>(TDocument document, Action<CreateRequestDescriptor<TDocument>> configureRequest);
-
-		Task<CreateResponse> CreateAsync<TDocument>(TDocument document, Action<CreateRequestDescriptor<TDocument>> configureRequest, CancellationToken cancellationToken = default);
-
-		IndexResponse Index<TDocument>(TDocument document, Action<IndexRequestDescriptor<TDocument>> configureRequest);
-
-		Task<IndexResponse> IndexAsync<TDocument>(TDocument document, Action<IndexRequestDescriptor<TDocument>> configureRequest, CancellationToken cancellationToken = default);
-
-		Task<UpdateResponse<TDocument>> UpdateAsync<TDocument, TPartialDocument>(IndexName index, Id id, Action<UpdateRequestDescriptor<TDocument, TPartialDocument>> configureRequest = null, CancellationToken cancellationToken = default);
-
-		UpdateResponse<TDocument> Update<TDocument, TPartialDocument>(IndexName index, Id id, Action<UpdateRequestDescriptor<TDocument, TPartialDocument>> configureRequest = null);
-
-		CountResponse Count<TDocument>(Action<CountRequestDescriptor<TDocument>> configureRequest = null);
-
-		Task<CountResponse> CountAsync<TDocument>(Action<CountRequestDescriptor<TDocument>> configureRequest = null, CancellationToken cancellationToken = default);
-	}
-
 	public partial class ElasticsearchClient
 	{
 		public IndexResponse Index<TDocument>(TDocument document, Action<IndexRequestDescriptor<TDocument>> configureRequest)
@@ -1626,11 +1599,11 @@ public UpdateResponse<TDocument> Update<TDocument, TPartialDocument>(IndexName i
 			return DoRequest<UpdateRequestDescriptor<TDocument, TPartialDocument>, UpdateResponse<TDocument>>(descriptor);
 		}
 
-		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor> configureRequest = null)
+		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configureRequest = null)
 		{
-			var descriptor = new SourceRequestDescriptor(typeof(TDocument), new Id(typeof(TDocument)));
+			var descriptor = new SourceRequestDescriptor<TDocument>(document: id.Document, index: id?.Self?.Index ?? typeof(TDocument), id: id?.Self?.Id ?? Id.From(id.Document));
 			configureRequest?.Invoke(descriptor);
-			return DoRequest<SourceRequestDescriptor, SourceResponse<TDocument>>(descriptor);
+			return DoRequest<SourceRequestDescriptor<TDocument>, SourceResponse<TDocument>>(descriptor);
 		}
 
 		public CountResponse Count<TDocument>(Action<CountRequestDescriptor<TDocument>> configureRequest = null)

src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs

@@ -22,7 +22,7 @@ public class BulkAllObservable<T> : IDisposable, IObservable<BulkAllResponse>
 	private readonly int _backOffRetries;
 	private readonly TimeSpan _backOffTime;
 	private readonly int _bulkSize;
-	private readonly IElasticsearchClient _client;
+	private readonly ElasticsearchClient _client;
 
 	private readonly CancellationToken _compositeCancelToken;
 	private readonly CancellationTokenSource _compositeCancelTokenSource;
@@ -36,7 +36,7 @@ public class BulkAllObservable<T> : IDisposable, IObservable<BulkAllResponse>
 
 	private readonly Action<BulkResponse> _bulkResponseCallback;
 
-	public BulkAllObservable(IElasticsearchClient client, IBulkAllRequest<T> partitionedBulkRequest, CancellationToken cancellationToken = default)
+	public BulkAllObservable(ElasticsearchClient client, IBulkAllRequest<T> partitionedBulkRequest, CancellationToken cancellationToken = default)
 	{
 		_client = client;
 		_partitionedBulkRequest = partitionedBulkRequest;

src/Elastic.Clients.Elasticsearch/_Generated/Api/SourceRequest.g.cs

@@ -199,4 +199,4 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 		{
 		}
 	}
-}
+}

src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs

@@ -26,7 +26,7 @@
 #nullable restore
 namespace Elastic.Clients.Elasticsearch
 {
-	public partial class ElasticsearchClient : IElasticsearchClient
+	public partial class ElasticsearchClient
 	{
 		public AsyncSearchNamespace AsyncSearch { get; private set; }
 

tests/Tests.Core/Client/FixedResponseClient.cs

@@ -13,7 +13,7 @@ namespace Tests.Core.Client
 {
 	public static class FixedResponseClient
 	{
-		public static IElasticsearchClient Create(
+		public static ElasticsearchClient Create(
 			object response,
 			int statusCode = 200,
 			Func<ElasticsearchClientSettings, ElasticsearchClientSettings> modifySettings = null,