Remove unsupported types and refactor namespaces (#6755) (#6757)

* WIP

* Namespace changes

* Bump integration test version for 8.4.x

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

Author: github-actions[bot]

.github/workflows/integration-jobs.yml

@@ -25,7 +25,7 @@ jobs:
           '8.1.3',
           '8.2.3',
           '8.3.3',
-          '8.4.2',
+          '8.4.3',
           '8.5.0-SNAPSHOT',
           'latest-8'
         ]

src/Elastic.Clients.Elasticsearch.JsonNetSerializer/Converters/HandleNestTypesOnSourceJsonConverter.cs

@@ -23,7 +23,7 @@ public class HandleNestTypesOnSourceJsonConverter : JsonConverter
 			//typeof(Attachment),
 			typeof(LazyJson),
 			//typeof(GeoCoordinate),
-			typeof(GeoLocation),
+			//typeof(GeoLocation),
 			//typeof(CartesianPoint),
 		};
 

src/Elastic.Clients.Elasticsearch/Api/BulkRequest.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch
 {

src/Elastic.Clients.Elasticsearch/Api/BulkResponse.cs

@@ -6,6 +6,7 @@
 using System.Text.Json.Serialization;
 using System.Text;
 using System.Linq;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch
 {

src/Elastic.Clients.Elasticsearch/Api/BulkResponseItemBase.cs

@@ -2,7 +2,7 @@
 // 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.
 
-namespace Elastic.Clients.Elasticsearch
+namespace Elastic.Clients.Elasticsearch.Core.Bulk
 {
 	public abstract partial class BulkResponseItemBase
 	{

src/Elastic.Clients.Elasticsearch/Api/ScrollResponse.cs

@@ -11,7 +11,7 @@ namespace Elastic.Clients.Elasticsearch;
 public partial class ScrollResponse<TDocument>
 {
 	[JsonIgnore]
-	public IReadOnlyCollection<Hit<TDocument>> Hits => HitsMetadata.Hits;
+	public IReadOnlyCollection<Core.Search.Hit<TDocument>> Hits => HitsMetadata.Hits;
 
 	[JsonIgnore]
 	public IReadOnlyCollection<TDocument> Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection();

src/Elastic.Clients.Elasticsearch/Api/SearchRequest.cs

@@ -42,7 +42,7 @@ public SearchRequestDescriptor<TDocument> Index(Indices indices)
 			return Self;
 		}
 
-		public SearchRequestDescriptor<TDocument> Pit(string id, Action<PointInTimeReferenceDescriptor> configure)
+		public SearchRequestDescriptor<TDocument> Pit(string id, Action<Core.Search.PointInTimeReferenceDescriptor> configure)
 		{
 			PitValue = null;
 			PitDescriptorAction = null;

src/Elastic.Clients.Elasticsearch/Api/SearchResponse.cs

@@ -11,7 +11,7 @@ namespace Elastic.Clients.Elasticsearch;
 public partial class SearchResponse<TDocument>
 {
 	[JsonIgnore]
-	public IReadOnlyCollection<Hit<TDocument>> Hits => HitsMetadata.Hits;
+	public IReadOnlyCollection<Core.Search.Hit<TDocument>> Hits => HitsMetadata.Hits;
 
 	[JsonIgnore]
 	public IReadOnlyCollection<TDocument> Documents => HitsMetadata.Hits.Select(s => s.Source).ToReadOnlyCollection();

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

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using Elastic.Clients.Elasticsearch;
 
 namespace Elastic.Clients.Elasticsearch;
 

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

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch;
 

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

@@ -12,6 +12,7 @@
 using Elastic.Transport.Diagnostics.Auditing;
 using Elastic.Transport.Extensions;
 using Elastic.Transport.Products.Elasticsearch;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch;
 
@@ -176,7 +177,7 @@ private async Task<BulkAllResponse> BulkAsync(IList<T> buffer, long page, int ba
 			return await RetryDocumentsAsync(page, ++backOffRetries, retryableDocuments).ConfigureAwait(false);
 
 		if (retryableDocuments.Count > 0)
-			throw ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times");
+			throw ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times.");
 
 		request.BackPressure?.Release();
 

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

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Elastic.Transport;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch;
 
@@ -57,7 +58,6 @@ public BulkAllRequest(IEnumerable<T> documents)
 	RequestMetaData IHelperCallable.ParentMetaData { get => ParentMetaData; set => ParentMetaData = value; }
 }
 
-
 public sealed class BulkAllRequestDescriptor<T> : SerializableDescriptorBase<BulkAllRequestDescriptor<T>>, IBulkAllRequest<T>, IHelperCallable
 {
 	private readonly IEnumerable<T> _documents;
@@ -150,5 +150,3 @@ public BulkAllRequestDescriptor<T> RetryDocumentPredicate(Func<BulkResponseItemB
 	// This descriptor is not serializable and gets converted to a BullAllObservable
 	protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) => throw new NotImplementedException();
 }
-
-

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

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch;
 

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

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using Elastic.Clients.Elasticsearch.Core.Bulk;
 
 namespace Elastic.Clients.Elasticsearch
 {

src/Elastic.Clients.Elasticsearch/Serialization/ResponseItemConverterFactory.cs

@@ -5,6 +5,8 @@
 using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Elastic.Clients.Elasticsearch.Core.Get;
+using Elastic.Clients.Elasticsearch.Core.MGet;
 
 namespace Elastic.Clients.Elasticsearch
 {

src/Elastic.Clients.Elasticsearch/Serialization/UnionConverter.cs

@@ -17,7 +17,7 @@ internal sealed class UnionConverter : JsonConverterFactory
 	// found.
 	private static readonly HashSet<Type> TypesToSkip = new()
 	{
-		typeof(SourceConfig),
+		typeof(Core.Search.SourceConfig),
 		typeof(Script)
 	};
 

src/Elastic.Clients.Elasticsearch/Types/AsyncSearch/AsyncSearch.cs

@@ -14,7 +14,7 @@ public partial class AsyncSearch<TDocument>
 	/// Shortcut to the hits returned for this search.
 	/// </summary>
 	[JsonIgnore]
-	public IReadOnlyCollection<Hit<TDocument>> Hits => HitsMetadata.Hits;
+	public IReadOnlyCollection<Core.Search.Hit<TDocument>> Hits => HitsMetadata.Hits;
 
 	/// <summary>
 	/// The source documents from the matching hits.