Rename ElasticClient -> ElasticsearchClient

Author: stevejgordon

.github/auto-label.json

@@ -1,6 +1,6 @@
 {
   "rules": {
     "Infra": [".ci/**/*", ".github/**/*","build/**/*"],
-    "v8.0.0-alpha1": "**/*"
+    "v8.0.0-alpha.1": "**/*"
   }
 }

Elasticsearch.sln

@@ -46,8 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Clients.Elasticsearch", "src\Elastic.Clients.Elasticsearch\Elastic.Clients.Elasticsearch.csproj", "{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlaygroundFx", "src\PlaygroundFx\PlaygroundFx.csproj", "{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{1FE49D14-216A-41EE-A177-E42BFF53E0DC}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "scripts", "build\scripts\scripts.fsproj", "{68D1BFDC-F447-4D2C-AF81-537807636610}"
@@ -174,18 +172,6 @@ Global
 		{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D}.Release|x64.Build.0 = Release|Any CPU
 		{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D}.Release|x86.ActiveCfg = Release|Any CPU
 		{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D}.Release|x86.Build.0 = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|x64.Build.0 = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Debug|x86.Build.0 = Debug|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|x64.ActiveCfg = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|x64.Build.0 = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|x86.ActiveCfg = Release|Any CPU
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10}.Release|x86.Build.0 = Release|Any CPU
 		{68D1BFDC-F447-4D2C-AF81-537807636610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68D1BFDC-F447-4D2C-AF81-537807636610}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68D1BFDC-F447-4D2C-AF81-537807636610}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -236,7 +222,6 @@ Global
 		{7141AB85-10C5-42AE-8FC7-B14A4216A89F} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
 		{5222D7CD-3663-49ED-98EA-4B5ECDF705BF} = {B7B8819B-3197-4AB6-B61B-9E1BFD1EC302}
 		{F8A7E60C-0C48-4D76-AF7F-7881DF5A263D} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
-		{11362CEE-B4B3-4EFE-A9A1-A6CDEEFCEA10} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}
 		{68D1BFDC-F447-4D2C-AF81-537807636610} = {1FE49D14-216A-41EE-A177-E42BFF53E0DC}
 		{F6162603-D134-4121-8106-2BA4DAD7350B} = {362B2776-4B29-46AB-B237-56776B5372B6}
 		{8C9275D9-29CE-4A20-8FD5-6B26C6CAAADB} = {D455EC79-E1E0-4509-B297-0DA3AED8DFF7}

benchmarks/Benchmarks/Program.cs

@@ -23,7 +23,7 @@ public class SerialisePolymorphic
 {
 
 	private readonly AggregationContainer _container1 = new AggregationContainer(new MinAggregation("testing"));
-	private readonly ElasticClient _client = new ElasticClient();
+	private readonly ElasticsearchClient _client = new ElasticsearchClient();
 
 
 	private readonly Stream _stream = new MemoryStream();

build/scripts/Versioning.fs

@@ -146,7 +146,7 @@ module Versioning =
             let ciArgs =
                 let appVeyor = Environment.hasEnvironVar "APPVEYOR"
                 let azDevops = Environment.hasEnvironVar "TF_BUILD"
-                if  appVeyor || azDevops then ["-r"; "true"] else []
+                if  true || azDevops then ["-r"; "true"] else []
             ReposTooling.PackageValidator
                 <| [p.Package; "-v"; v; "-a"; p.AssemblyName; "-k"; officialToken] @ ciArgs
                 |> ignore 

readme.md

@@ -140,7 +140,7 @@ You can connect to your Elasticsearch cluster via a single node, or by specifyin
 ```csharp
 var node = new Uri("http://myserver:9200");
 var settings = new ConnectionSettings(node);
-var client = new ElasticClient(settings);
+var client = new ElasticsearchClient(settings);
 ```
 
 **Connecting to multiple nodes using a connection pool**
@@ -155,7 +155,7 @@ var nodes = new Uri[]
 
 var pool = new StaticNodePool(nodes);
 var settings = new ConnectionSettings(pool);
-var client = new ElasticClient(settings);
+var client = new ElasticsearchClient(settings);
 ```
 
 ### Indexing
@@ -270,7 +270,7 @@ var config = new ConnectionConfiguration(node);
 var client = new ElasticLowLevelClient(config);
 ```
 
-Note the main difference here is that we are instantiating an `ElasticLowLevelClient` rather than `ElasticClient`, and `ConnectionConfiguration` instead of `ConnectionSettings`.
+Note the main difference here is that we are instantiating an `ElasticLowLevelClient` rather than `ElasticsearchClient`, and `ConnectionConfiguration` instead of `ConnectionSettings`.
 
 ### Calling an API endpoint
 

src/Elastic.Clients.Elasticsearch/Client/ElasticClient-BulkAll.cs renamed to src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs

@@ -9,7 +9,7 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-public partial interface IElasticClient
+public partial interface IElasticsearchClient
 {
 	//HelpersNamespace Helpers { get; }
 
@@ -18,7 +18,7 @@ public partial interface IElasticClient
     BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default);
 }
 
-public partial class ElasticClient
+public partial class ElasticsearchClient
 {
 	//public HelpersNamespace Helpers { get; private set; }
 
@@ -35,9 +35,9 @@ public BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationT
 
 //public class HelpersNamespace : NamespacedClientProxy
 //{
-//	private readonly ElasticClient _client;
+//	private readonly ElasticsearchClient _client;
 
-//	internal HelpersNamespace(ElasticClient client) : base(client) => _client = client;
+//	internal HelpersNamespace(ElasticsearchClient client) : base(client) => _client = client;
 
 //	public BulkAllObservable<T> BulkAllObservable<T>(IEnumerable<T> documents, Action<BulkAllRequestDescriptor<T>> configure, CancellationToken cancellationToken = default)
 //	{

src/Elastic.Clients.Elasticsearch/Client/ElasticClient.cs renamed to src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient.cs

@@ -11,34 +11,34 @@
 namespace Elastic.Clients.Elasticsearch;
 
 /// <inheritdoc />
-public partial class ElasticClient
+public partial class ElasticsearchClient
 {
 	private readonly ITransport<IElasticsearchClientSettings> _transport;
 
 	/// <summary>
 	///     Creates a client configured to connect to localhost:9200.
 	/// </summary>
-	public ElasticClient() : this(new ElasticsearchClientSettings(new Uri("http://localhost:9200"))) { }
+	public ElasticsearchClient() : this(new ElasticsearchClientSettings(new Uri("http://localhost:9200"))) { }
 
 	/// <summary>
 	///     Creates a client configured to connect to a node reachable at the provided <paramref name="uri" />.
 	/// </summary>
 	/// <param name="uri">The <see cref="Uri" /> to connect to.</param>
-	public ElasticClient(Uri uri) : this(new ElasticsearchClientSettings(uri)) { }
+	public ElasticsearchClient(Uri uri) : this(new ElasticsearchClientSettings(uri)) { }
 
 	/// <summary>
 	///     Creates a client configured to communicate with Elastic Cloud using the provided <paramref name="cloudId" />.
 	///     <para>See the <see cref="CloudNodePool" /> documentation for more information on how to obtain your Cloud Id.</para>
 	///     <para>
-	///         If you want more control, use the <see cref="ElasticClient(IElasticsearchClientSettings)" /> constructor and
+	///         If you want more control, use the <see cref="ElasticsearchClient(IElasticsearchClientSettings)" /> constructor and
 	///         pass
 	///         an instance of
 	///         <see cref="ElasticsearchClientSettings" /> that takes a <paramref name="cloudId" /> in its constructor as well.
 	///     </para>
 	/// </summary>
 	/// <param name="cloudId">The Cloud ID of an Elastic Cloud deployment.</param>
 	/// <param name="credentials">The credentials to use for the connection.</param>
-	public ElasticClient(string cloudId, IAuthenticationHeader credentials) : this(
+	public ElasticsearchClient(string cloudId, IAuthenticationHeader credentials) : this(
 		new ElasticsearchClientSettings(cloudId, credentials))
 	{
 	}
@@ -47,7 +47,7 @@ public ElasticClient(string cloudId, IAuthenticationHeader credentials) : this(
 	///     TODO
 	/// </summary>
 	/// <param name="elasticsearchClientSettings"></param>
-	public ElasticClient(IElasticsearchClientSettings elasticsearchClientSettings)
+	public ElasticsearchClient(IElasticsearchClientSettings elasticsearchClientSettings)
 		: this(new Transport<IElasticsearchClientSettings>(elasticsearchClientSettings))
 	{
 	}
@@ -56,7 +56,7 @@ public ElasticClient(IElasticsearchClientSettings elasticsearchClientSettings)
 	///     TODO
 	/// </summary>
 	/// <param name="transport"></param>
-	public ElasticClient(ITransport<IElasticsearchClientSettings> transport)
+	public ElasticsearchClient(ITransport<IElasticsearchClientSettings> transport)
 	{
 		transport.ThrowIfNull(nameof(transport));
 		transport.Settings.ThrowIfNull(nameof(transport.Settings));

src/Elastic.Clients.Elasticsearch/Client/IElasticClient.cs renamed to src/Elastic.Clients.Elasticsearch/Client/IElasticsearchClient.cs

@@ -1,14 +1,18 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using Elastic.Transport;
 
 namespace Elastic.Clients.Elasticsearch
 {
 	/// <summary>
-	///     ElasticClient is Elastic.Clients.Elasticsearch's strongly typed client which exposes fully mapped Elasticsearch endpoints.
+	///     ElasticsearchClient is Elastic.Clients.Elasticsearch's strongly typed client which exposes fully mapped Elasticsearch endpoints.
 	/// </summary>
 	/// <remarks>
 	///     It is generally expected to be used as a singleton instance for the lifetime of the host application.
 	/// </remarks>
-	public partial interface IElasticClient
+	public partial interface IElasticsearchClient
 	{
 		/// <summary>
 		///     The configured connection settings for the client.

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 IElasticClient client, IEnumerable<T> @objects, IndexName index = null)
+	public static BulkResponse IndexMany<T>(this IElasticsearchClient 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 IElasticClient client, IEnumerable<
 	/// <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 IElasticClient client, IEnumerable<T> objects, IndexName index = null,
+	public static Task<BulkResponse> IndexManyAsync<T>(this IElasticsearchClient client, IEnumerable<T> objects, IndexName index = null,
 		CancellationToken cancellationToken = default
 	)
 		where T : class

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

@@ -1,8 +1,11 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Elastic.Transport;
-using Elastic.Transport.Products.Elasticsearch;
 
 namespace Elastic.Clients.Elasticsearch
 {
@@ -13,9 +16,9 @@ namespace Elastic.Clients.Elasticsearch
 	/// </remarks>
 	public class NamespacedClientProxy
 	{
-		private readonly ElasticClient _client;
+		private readonly ElasticsearchClient _client;
 
-		protected NamespacedClientProxy(ElasticClient client) => _client = client;
+		protected NamespacedClientProxy(ElasticsearchClient client) => _client = client;
 
 		internal TResponse DoRequest<TRequest, TResponse>(
 			TRequest request,

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

@@ -106,7 +106,7 @@ protected ElasticsearchClientSettingsBase(
 			ITransportClient connection,
 			ElasticsearchClientSettings.SourceSerializerFactory? sourceSerializerFactory,
 			IPropertyMappingProvider propertyMappingProvider)
-			: base(nodePool, connection, null, ElasticsearchClientProductRegistration.DefaultForElasticClientsElasticsearch)
+			: base(nodePool, connection, null, ElasticsearchClientProductRegistration.DefaultForElasticsearchClientsElasticsearch)
 		{
 			var defaultSerializer = new DefaultRequestResponseSerializer(this);
 			var sourceSerializer = sourceSerializerFactory?.Invoke(defaultSerializer, this) ?? new DefaultSourceSerializer(this);
@@ -405,7 +405,7 @@ public abstract class
 		protected ConnectionConfigurationBase(NodePool nodePool, ITransportClient connection,
 			Serializer? serializer,
 			IProductRegistration registration = null)
-			: base(nodePool, connection, serializer, registration ?? new ElasticsearchProductRegistration(typeof(IElasticClient))) =>
+			: base(nodePool, connection, serializer, registration ?? new ElasticsearchProductRegistration(typeof(IElasticsearchClient))) =>
 				UserAgent(ConnectionConfiguration.DefaultUserAgent);
 
 		bool ITransportClientConfigurationValues.IncludeServerStackTraceOnError => _includeServerStackTraceOnError;

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

@@ -6,7 +6,7 @@
 namespace Elastic.Clients.Elasticsearch
 {
 	/// <summary>
-	///     Provides the connection settings for Elastic.Clients.Elasticsearch's high level <see cref="ElasticClient" />
+	///     Provides the connection settings for Elastic.Clients.Elasticsearch's high level <see cref="ElasticsearchClient" />
 	/// </summary>
 	public interface IElasticsearchClientSettings : ITransportConfiguration
 	{

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

@@ -8,7 +8,7 @@ internal sealed class ElasticsearchClientProductRegistration : ElasticsearchProd
 {
 	public ElasticsearchClientProductRegistration(Type markerType) : base(markerType) { }
 
-	public static ElasticsearchClientProductRegistration DefaultForElasticClientsElasticsearch { get; } = new(typeof(IElasticClient));
+	public static ElasticsearchClientProductRegistration DefaultForElasticsearchClientsElasticsearch { get; } = new(typeof(IElasticsearchClient));
 
 	/// <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/Common/Extensions/TypeExtensions.cs

@@ -184,8 +184,8 @@ private static bool IsVirtual(this PropertyInfo propertyInfo)
 
 		internal delegate T ObjectActivator<out T>(params object[] args);
 
-		private static readonly Assembly ElasticClientsElasticsearchAssembly = typeof(TypeExtensions).Assembly;
+		private static readonly Assembly ElasticsearchClientsElasticsearchAssembly = typeof(TypeExtensions).Assembly;
 
-		public static bool IsElasticClientsElasticsearchType(this Type type) => type.Assembly == ElasticClientsElasticsearchAssembly;
+		public static bool IsElasticsearchClientsElasticsearchType(this Type type) => type.Assembly == ElasticsearchClientsElasticsearchAssembly;
 	}
 }

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

@@ -1034,7 +1034,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
 		}
 	}
 
-	public partial class ElasticClient
+	public partial class ElasticsearchClient
 	{
 		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configure = null)
 		{
@@ -1044,7 +1044,7 @@ public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, A
 		}
 	}
 
-	public partial interface IElasticClient
+	public partial interface IElasticsearchClient
 	{
 		public SourceResponse<TDocument> Source<TDocument>(DocumentPath<TDocument> id, Action<SourceRequestDescriptor<TDocument>> configure = null);
 	}
@@ -1491,7 +1491,7 @@ public partial struct Refresh : IStringable
 
 	public class DocType { }
 
-	public partial interface IElasticClient
+	public partial interface IElasticsearchClient
 	{
 		DeleteResponse Delete<TDocument>(Id id, Action<DeleteRequestDescriptor<TDocument>> configureRequest);
 
@@ -1510,7 +1510,7 @@ public partial interface IElasticClient
 		UpdateResponse<TDocument> Update<TDocument, TPartialDocument>(IndexName index, Id id, Action<UpdateRequestDescriptor<TDocument, TPartialDocument>> configureRequest = null);
 	}
 
-	public partial class ElasticClient
+	public partial class ElasticsearchClient
 	{
 		public IndexResponse Index<TDocument>(TDocument document, Action<IndexRequestDescriptor<TDocument>> configureRequest)
 		{

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 IElasticClient _client;
+	private readonly IElasticsearchClient _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(IElasticClient client, IBulkAllRequest<T> partitionedBulkRequest, CancellationToken cancellationToken = default)
+	public BulkAllObservable(IElasticsearchClient client, IBulkAllRequest<T> partitionedBulkRequest, CancellationToken cancellationToken = default)
 	{
 		_client = client;
 		_partitionedBulkRequest = partitionedBulkRequest;

src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticClient.Cluster.g.cs renamed to src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.Cluster.g.cs

@@ -24,7 +24,7 @@ namespace Elastic.Clients.Elasticsearch.Cluster
 {
 	public class ClusterNamespace : NamespacedClientProxy
 	{
-		internal ClusterNamespace(ElasticClient client) : base(client)
+		internal ClusterNamespace(ElasticsearchClient client) : base(client)
 		{
 		}
 

src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticClient.IndexManagement.g.cs renamed to src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.IndexManagement.g.cs

@@ -24,7 +24,7 @@ namespace Elastic.Clients.Elasticsearch.IndexManagement
 {
 	public class IndexManagementNamespace : NamespacedClientProxy
 	{
-		internal IndexManagementNamespace(ElasticClient client) : base(client)
+		internal IndexManagementNamespace(ElasticsearchClient client) : base(client)
 		{
 		}
 

src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticClient.g.cs renamed to src/Elastic.Clients.Elasticsearch/_Generated/Client/ElasticsearchClient.g.cs

@@ -24,7 +24,7 @@
 #nullable restore
 namespace Elastic.Clients.Elasticsearch
 {
-	public partial class ElasticClient : IElasticClient
+	public partial class ElasticsearchClient : IElasticsearchClient
 	{
 		public ClusterNamespace Cluster { get; private set; }
 

src/Elastic.Clients.Elasticsearch/_Generated/Client/IElasticClient.g.cs renamed to src/Elastic.Clients.Elasticsearch/_Generated/Client/IElasticsearchClient.g.cs

@@ -24,7 +24,7 @@
 #nullable restore
 namespace Elastic.Clients.Elasticsearch
 {
-	public partial interface IElasticClient
+	public partial interface IElasticsearchClient
 	{
 		ClusterNamespace Cluster { get; }