Merge branch 'master' of github.com:elastic/elasticsearch-net

Author: russcam

src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -286,8 +286,8 @@ public static string CreateMethodName(string apiEnpointKey)
 
 		public void GenerateClientInterface(RestApiSpec model)
 		{
-			var targetFile = EsNetFolder + @"IElasticsearchClient.Generated.cs";
-			var source = RazorHelper.Execute(File.ReadAllText(ViewFolder + @"IElasticsearchClient.Generated.cshtml"), model).ToString();
+			var targetFile = EsNetFolder + @"IElasticLowLevelClient.Generated.cs";
+			var source = RazorHelper.Execute(File.ReadAllText(ViewFolder + @"IElasticLowLevelClient.Generated.cshtml"), model).ToString();
 			File.WriteAllText(targetFile, source);
 		}
 
@@ -300,8 +300,8 @@ public void GenerateRawDispatch(RestApiSpec model)
 		}
 		public void GenerateRawClient(RestApiSpec model)
 		{
-			var targetFile = EsNetFolder + @"ElasticsearchClient.Generated.cs";
-			var source = RazorHelper.Execute(File.ReadAllText(ViewFolder + @"ElasticsearchClient.Generated.cshtml"), model).ToString();
+			var targetFile = EsNetFolder + @"ElasticLowLevelClient.Generated.cs";
+			var source = RazorHelper.Execute(File.ReadAllText(ViewFolder + @"ElasticLowLevelClient.Generated.cshtml"), model).ToString();
 			File.WriteAllText(targetFile, source);
 		}
 

src/CodeGeneration/CodeGeneration.LowLevelClient/Views/ElasticsearchClient.Generated.cshtml renamed to src/CodeGeneration/CodeGeneration.LowLevelClient/Views/ElasticLowLevelClient.Generated.cshtml

@@ -22,7 +22,7 @@ namespace Elasticsearch.Net
 	///<summary>
 	///Raw operations with elasticsearch
 	///</summary>
-	public partial class ElasticsearchClient : IElasticsearchClient
+	public partial class ElasticLowLevelClient : IElasticLowLevelClient
 	{
 	</text>
 	foreach (var kv in model.Endpoints)

src/CodeGeneration/CodeGeneration.LowLevelClient/Views/IElasticsearchClient.Generated.cshtml renamed to src/CodeGeneration/CodeGeneration.LowLevelClient/Views/IElasticLowLevelClient.Generated.cshtml

@@ -18,7 +18,7 @@ namespace Elasticsearch.Net
 	///Generated of commit @Model.Commit
 	///</pre>
 	///</summary>
-	public partial interface IElasticsearchClient
+	public partial interface IElasticLowLevelClient
 	{	
 		//IConnection Connection { get; }
 		//IConnectionConfigurationValues Settings { get; }

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

@@ -13,7 +13,7 @@
 namespace Elasticsearch.Net
 {
 	/// <summary>
-	/// ConnectionConfiguration allows you to control how ElasticsearchClient behaves and where/how it connects 
+	/// ConnectionConfiguration allows you to control how ElasticLowLevelClient behaves and where/how it connects 
 	/// to elasticsearch
 	/// </summary>
 	public class ConnectionConfiguration : ConnectionConfiguration<ConnectionConfiguration>
@@ -23,7 +23,7 @@ public class ConnectionConfiguration : ConnectionConfiguration<ConnectionConfigu
 		public static readonly TimeSpan DefaultPingTimeoutOnSSL = TimeSpan.FromSeconds(5);
 
 		/// <summary>
-		/// ConnectionConfiguration allows you to control how ElasticsearchClient behaves and where/how it connects 
+		/// ConnectionConfiguration allows you to control how ElasticLowLevelClient behaves and where/how it connects 
 		/// to elasticsearch
 		/// </summary>
 		/// <param name="uri">The root of the elasticsearch node we want to connect to. Defaults to http://localhost:9200</param>
@@ -33,7 +33,7 @@ public ConnectionConfiguration(Uri uri = null)
 		{ }
 
 		/// <summary>
-		/// ConnectionConfiguration allows you to control how ElasticsearchClient behaves and where/how it connects 
+		/// ConnectionConfiguration allows you to control how ElasticLowLevelClient behaves and where/how it connects 
 		/// to elasticsearch
 		/// </summary>
 		/// <param name="connectionPool">A connection pool implementation that'll tell the client what nodes are available</param>

src/Elasticsearch.Net/ElasticsearchClient.Generated.cs renamed to src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs

@@ -6,7 +6,7 @@ namespace Elasticsearch.Net
 	/// <summary>
 	/// Low level client that exposes all of elasticsearch API endpoints but leaves you in charge of building request and handling the response
 	/// </summary>
-	public partial class ElasticsearchClient : IElasticsearchClient
+	public partial class ElasticLowLevelClient : IElasticLowLevelClient
 	{
 		private readonly UrlFormatProvider _formatter;
 
@@ -17,16 +17,16 @@ public partial class ElasticsearchClient : IElasticsearchClient
 
 		/// <summary>Instantiate a new low level elasticsearch client to http://localhost:9200</summary>
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-		public ElasticsearchClient() : this(new Transport<IConnectionConfigurationValues>(new ConnectionConfiguration())) { }
+		public ElasticLowLevelClient() : this(new Transport<IConnectionConfigurationValues>(new ConnectionConfiguration())) { }
 
 		/// <summary>Instantiate a new low level elasticsearch client using the specified settings</summary>
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-		public ElasticsearchClient(IConnectionConfigurationValues settings) : this(new Transport<IConnectionConfigurationValues>(settings ?? new ConnectionConfiguration())) { }
+		public ElasticLowLevelClient(IConnectionConfigurationValues settings) : this(new Transport<IConnectionConfigurationValues>(settings ?? new ConnectionConfiguration())) { }
 
 		/// <summary>
 		/// Instantiate a new low level elasticsearch client explicitly specifying a custom transport setup
 		/// </summary>
-		public ElasticsearchClient(ITransport<IConnectionConfigurationValues> transport)
+		public ElasticLowLevelClient(ITransport<IConnectionConfigurationValues> transport)
 		{
 			transport.ThrowIfNull(nameof(transport));
 			transport.Settings.ThrowIfNull(nameof(transport.Settings));