Disable extensions that do not exist for serverless (yet)

Author: flobernd

src/Elastic.Clients.Elasticsearch.Shared/Api/Eql/EqlGetResponse.cs

@@ -2,14 +2,14 @@
 // 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.
 
+// TODO: Move away from shared project
+
+#if !ELASTICSEARCH_SERVERLESS
+
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.Eql;
-#else
 namespace Elastic.Clients.Elasticsearch.Eql;
-#endif
 
 public partial class EqlGetResponse<TEvent>
 {
@@ -28,3 +28,5 @@ public partial class EqlGetResponse<TEvent>
 	[JsonIgnore]
 	public long Total => Hits?.Total.Value ?? -1;
 }
+
+#endif

src/Elastic.Clients.Elasticsearch.Shared/Api/IndexManagement/GetFieldMappingResponse.cs

@@ -2,21 +2,17 @@
 // 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.
 
+// TODO: Move away from shared project
+
+#if !ELASTICSEARCH_SERVERLESS
+
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Text.Json.Serialization;
-#if ELASTICSEARCH_SERVERLESS
-using Elastic.Clients.Elasticsearch.Serverless.Mapping;
-#else
 using Elastic.Clients.Elasticsearch.Mapping;
-#endif
 
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
-#else
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
-#endif
 
 public partial class GetFieldMappingResponse
 {
@@ -98,3 +94,5 @@ private IReadOnlyDictionary<Field, FieldMapping> MappingsFor(IndexName index)
 		return indexMapping.Mappings;
 	}
 }
+
+#endif

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

@@ -2,25 +2,25 @@
 // 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.
 
+#if !ELASTICSEARCH_SERVERLESS
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
 
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless;
-#else
 namespace Elastic.Clients.Elasticsearch;
-#endif
 
 public partial class ElasticsearchClient
 {
 	public virtual BulkAllObservable<T> BulkAll<T>(IEnumerable<T> documents, Action<BulkAllRequestDescriptor<T>> configure, CancellationToken cancellationToken = default)
-    {
-        var descriptor = new BulkAllRequestDescriptor<T>(documents);
-        configure?.Invoke(descriptor);
-        return BulkAll<T>(descriptor, cancellationToken);
-    }
+	{
+		var descriptor = new BulkAllRequestDescriptor<T>(documents);
+		configure?.Invoke(descriptor);
+		return BulkAll<T>(descriptor, cancellationToken);
+	}
 
-    public virtual BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default) =>
-        new(this, request, cancellationToken);
+	public virtual BulkAllObservable<T> BulkAll<T>(IBulkAllRequest<T> request, CancellationToken cancellationToken = default) =>
+		new(this, request, cancellationToken);
 }
+
+#endif

src/Elastic.Clients.Elasticsearch.Shared/Client/IndicesNamespace.cs

@@ -2,15 +2,15 @@
 // 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.
 
+// TODO: Move away from shared project
+
+#if !ELASTICSEARCH_SERVERLESS
+
 using System.Threading.Tasks;
 using System.Threading;
 using System;
 
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless.IndexManagement;
-#else
 namespace Elastic.Clients.Elasticsearch.IndexManagement;
-#endif
 
 public partial class IndicesNamespacedClient
 {
@@ -57,3 +57,5 @@ public virtual Task<GetAliasResponse> GetAliasAsync(Indices indicies, Action<Get
 		return DoRequestAsync<GetAliasRequestDescriptor, GetAliasResponse, GetAliasRequestParameters>(descriptor, cancellationToken);
 	}
 }
+
+#endif

src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/DocumentPath/DocumentPath.cs

@@ -22,7 +22,11 @@ internal interface IDocumentPath
 // TODO - REVIEW THIS
 internal sealed class DocumentPath<T> : IEquatable<DocumentPath<T>>, IDocumentPath
 {
+#if ELASTICSEARCH_SERVERLESS
+	public DocumentPath(T document) : this(Elasticsearch.Serverless.Id.From(document)) => Document = document;
+#else
 	public DocumentPath(T document) : this(Elasticsearch.Id.From(document)) => Document = document;
+#endif
 
 	public DocumentPath(Id id)
 	{

src/Elastic.Clients.Elasticsearch.Shared/Core/Static/Infer.cs

@@ -44,7 +44,11 @@ public static class Infer
 
 	public static Names Names(IEnumerable<string> names) => string.Join(",", names);
 
+#if ELASTICSEARCH_SERVERLESS
+	public static Id Id<T>(T document) where T : class => Elasticsearch.Serverless.Id.From(document);
+#else
 	public static Id Id<T>(T document) where T : class => Elasticsearch.Id.From(document);
+#endif
 
 	public static Fields Fields<T>(params Expression<Func<T, object?>>[] fields) where T : class =>
 		new(fields.Select(f => new Field(f)));

src/Elastic.Clients.Elasticsearch.Shared/CrossPlatform/RuntimeInformation.cs

@@ -7,7 +7,11 @@
 using System.Linq;
 using System.Reflection;
 
+#if ELASTICSEARCH_SERVERLESS
+namespace Elastic.Clients.Elasticsearch.Serverless
+#else
 namespace Elastic.Clients.Elasticsearch
+#endif
 {
 	internal static class RuntimeInformation
 	{

src/Elastic.Clients.Elasticsearch.Shared/Helpers/BlockingSubscribeExtensions.cs

@@ -2,15 +2,11 @@
 // 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.
 
+#if !ELASTICSEARCH_SERVERLESS
 
 using System;
 using System.Threading;
-
-#if ELASTICSEARCH_SERVERLESS
-namespace Elastic.Clients.Elasticsearch.Serverless;
-#else
 namespace Elastic.Clients.Elasticsearch;
-#endif
 
 public static class BlockingSubscribeExtensions
 {
@@ -47,3 +43,5 @@ Func<Action<Exception>, Action, TObserver> factory
 		return observer;
 	}
 }
+
+#endif