Skip to content

Commit ced079e

Browse files
stevejgordonstevejgordon
committed
Respond to refactoring in transport
1 parent 2223150 commit ced079e

File tree

75 files changed

+468
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+468
-466
lines changed

‎readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Alternatively, simply search for `NEST` in the package manager UI.
175175

176176
### Connecting
177177

178-
You can connect to your Elasticsearch cluster via a single node, or by specifying multiple nodes using a connection pool. Using a connection pool has a few advantages over a single node connection, such as load balancing and cluster failover support.
178+
You can connect to your Elasticsearch cluster via a single node, or by specifying multiple nodes using a node pool. Using a node pool has a few advantages over a single node, such as load balancing and cluster failover support.
179179

180180
**Connecting to a single node**
181181

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Elastic.Clients.JsonNetSerializer
1515
{
16-
public abstract partial class ConnectionSettingsAwareSerializerBase : SourceSerializerBase
16+
public abstract partial class ConnectionSettingsAwareSerializer : SourceSerializer
1717
{
1818
// Default buffer size of StreamWriter, which is private :(
1919
internal const int DefaultBufferSize = 1024;

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.PropertyMappingProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Elastic.Clients.JsonNetSerializer
1212
{
13-
public abstract partial class ConnectionSettingsAwareSerializerBase : IPropertyMappingProvider
13+
public abstract partial class ConnectionSettingsAwareSerializer : IPropertyMappingProvider
1414
{
1515
protected readonly ConcurrentDictionary<string, PropertyMapping> Properties = new();
1616

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Serializer.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
namespace Elastic.Clients.JsonNetSerializer
1414
{
15-
public abstract partial class ConnectionSettingsAwareSerializerBase
15+
public abstract partial class ConnectionSettingsAwareSerializer
1616
{
17-
protected ConnectionSettingsAwareSerializerBase(SerializerBase builtinSerializer, IElasticsearchClientSettings connectionSettings)
17+
protected ConnectionSettingsAwareSerializer(Serializer builtinSerializer, IElasticsearchClientSettings connectionSettings)
1818
: this(builtinSerializer, connectionSettings, null, null, null) { }
1919

20-
internal ConnectionSettingsAwareSerializerBase(
21-
SerializerBase builtinSerializer,
20+
internal ConnectionSettingsAwareSerializer(
21+
Serializer builtinSerializer,
2222
IElasticsearchClientSettings connectionSettings,
2323
Func<JsonSerializerSettings> jsonSerializerSettingsFactory,
2424
Action<ConnectionSettingsAwareContractResolver> modifyContractResolver,
@@ -40,7 +40,7 @@ IEnumerable<JsonConverter> contractJsonConverters
4040
_collapsedSerializer = CreateSerializer(SerializationFormatting.None);
4141
}
4242

43-
protected SerializerBase BuiltinSerializer { get; }
43+
protected Serializer BuiltinSerializer { get; }
4444

4545
protected IElasticsearchClientSettings ConnectionSettings { get; }
4646
protected IEnumerable<JsonConverter> ContractJsonConverters { get; }

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public class HandleNestTypesOnSourceJsonConverter : JsonConverter
2727
//typeof(CartesianPoint),
2828
};
2929

30-
private readonly SerializerBase _builtInSerializer;
30+
private readonly Serializer _builtInSerializer;
3131
private readonly IMemoryStreamFactory _memoryStreamFactory;
3232

33-
public HandleNestTypesOnSourceJsonConverter(SerializerBase builtInSerializer, IMemoryStreamFactory memoryStreamFactory
33+
public HandleNestTypesOnSourceJsonConverter(Serializer builtInSerializer, IMemoryStreamFactory memoryStreamFactory
3434
)
3535
{
3636
_builtInSerializer = builtInSerializer;
@@ -47,7 +47,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
4747
: SerializationFormatting.None;
4848

4949
using (var ms = _memoryStreamFactory.Create())
50-
using (var streamReader = new StreamReader(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding))
50+
using (var streamReader = new StreamReader(ms, ConnectionSettingsAwareSerializer.ExpectedEncoding))
5151
using (var reader = new JsonTextReader(streamReader))
5252
{
5353
_builtInSerializer.Serialize(value, ms, formatting);

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/JTokenExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ namespace Elastic.Clients.JsonNetSerializer
1212
internal static class JTokenExtensions
1313
{
1414
/// <summary>
15-
/// Writes a <see cref="JToken" /> to a <see cref="MemoryStream" /> using <see cref="ConnectionSettingsAwareSerializerBase.ExpectedEncoding" />
15+
/// Writes a <see cref="JToken" /> to a <see cref="MemoryStream" /> using <see cref="ConnectionSettingsAwareSerializer.ExpectedEncoding" />
1616
/// </summary>
1717
public static MemoryStream ToStream(this JToken token, IMemoryStreamFactory memoryStreamFactory)
1818
{
1919
var ms = memoryStreamFactory.Create();
20-
using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializerBase.ExpectedEncoding,
21-
ConnectionSettingsAwareSerializerBase.DefaultBufferSize, true))
20+
using (var streamWriter = new StreamWriter(ms, ConnectionSettingsAwareSerializer.ExpectedEncoding,
21+
ConnectionSettingsAwareSerializer.DefaultBufferSize, true))
2222
using (var writer = new JsonTextWriter(streamWriter))
2323
{
2424
token.WriteTo(writer);

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/JsonNetSerializer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
namespace Elastic.Clients.JsonNetSerializer
1212
{
13-
public class JsonNetSerializer : ConnectionSettingsAwareSerializerBase
13+
public class JsonNetSerializer : ConnectionSettingsAwareSerializer
1414
{
1515
public JsonNetSerializer(
16-
SerializerBase builtinSerializer,
16+
Serializer builtinSerializer,
1717
IElasticsearchClientSettings connectionSettings,
1818
Func<JsonSerializerSettings> jsonSerializerSettingsFactory = null,
1919
Action<ConnectionSettingsAwareContractResolver> modifyContractResolver = null,
2020
IEnumerable<JsonConverter> contractJsonConverters = null
2121
)
2222
: base(builtinSerializer, connectionSettings, jsonSerializerSettingsFactory, modifyContractResolver, contractJsonConverters) { }
2323

24-
public static JsonNetSerializer Default(SerializerBase builtin, IElasticsearchClientSettings values) => new(builtin, values);
24+
public static JsonNetSerializer Default(Serializer builtin, IElasticsearchClientSettings values) => new(builtin, values);
2525
}
2626
}

‎src/Elastic.Clients.Elasticsearch.JsonNetSerializer/packages.lock.json‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
},
3636
"Microsoft.Bcl.AsyncInterfaces": {
3737
"type": "Transitive",
38-
"resolved": "5.0.0",
39-
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
38+
"resolved": "6.0.0",
39+
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
4040
"dependencies": {
4141
"System.Threading.Tasks.Extensions": "4.5.4"
4242
}
@@ -68,8 +68,8 @@
6868
},
6969
"System.Diagnostics.DiagnosticSource": {
7070
"type": "Transitive",
71-
"resolved": "5.0.0",
72-
"contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==",
71+
"resolved": "5.0.1",
72+
"contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ==",
7373
"dependencies": {
7474
"System.Memory": "4.5.4",
7575
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
@@ -92,28 +92,30 @@
9292
},
9393
"System.Runtime.CompilerServices.Unsafe": {
9494
"type": "Transitive",
95-
"resolved": "5.0.0",
96-
"contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
95+
"resolved": "6.0.0",
96+
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
9797
},
9898
"System.Text.Encodings.Web": {
9999
"type": "Transitive",
100-
"resolved": "5.0.0",
101-
"contentHash": "EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==",
100+
"resolved": "6.0.0",
101+
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
102102
"dependencies": {
103-
"System.Memory": "4.5.4"
103+
"System.Buffers": "4.5.1",
104+
"System.Memory": "4.5.4",
105+
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
104106
}
105107
},
106108
"System.Text.Json": {
107109
"type": "Transitive",
108-
"resolved": "5.0.0",
109-
"contentHash": "+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==",
110+
"resolved": "6.0.1",
111+
"contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==",
110112
"dependencies": {
111-
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
113+
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
112114
"System.Buffers": "4.5.1",
113115
"System.Memory": "4.5.4",
114116
"System.Numerics.Vectors": "4.5.0",
115-
"System.Runtime.CompilerServices.Unsafe": "5.0.0",
116-
"System.Text.Encodings.Web": "5.0.0",
117+
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
118+
"System.Text.Encodings.Web": "6.0.0",
117119
"System.Threading.Tasks.Extensions": "4.5.4",
118120
"System.ValueTuple": "4.5.0"
119121
}
@@ -142,8 +144,8 @@
142144
"dependencies": {
143145
"Microsoft.CSharp": "4.7.0",
144146
"System.Buffers": "4.5.1",
145-
"System.Diagnostics.DiagnosticSource": "5.0.0",
146-
"System.Text.Json": "5.0.0",
147+
"System.Diagnostics.DiagnosticSource": "5.0.1",
148+
"System.Text.Json": "6.0.1",
147149
"System.Threading.Tasks.Extensions": "4.5.4"
148150
}
149151
}
@@ -188,8 +190,8 @@
188190
},
189191
"Microsoft.Bcl.AsyncInterfaces": {
190192
"type": "Transitive",
191-
"resolved": "5.0.0",
192-
"contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
193+
"resolved": "6.0.0",
194+
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
193195
"dependencies": {
194196
"System.Threading.Tasks.Extensions": "4.5.4"
195197
}
@@ -226,8 +228,8 @@
226228
},
227229
"System.Diagnostics.DiagnosticSource": {
228230
"type": "Transitive",
229-
"resolved": "5.0.0",
230-
"contentHash": "tCQTzPsGZh/A9LhhA6zrqCRV4hOHsK90/G7q3Khxmn6tnB1PuNU0cRaKANP2AWcF9bn0zsuOoZOSrHuJk6oNBA==",
231+
"resolved": "5.0.1",
232+
"contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ==",
231233
"dependencies": {
232234
"System.Memory": "4.5.4",
233235
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
@@ -326,8 +328,8 @@
326328
},
327329
"System.Runtime.CompilerServices.Unsafe": {
328330
"type": "Transitive",
329-
"resolved": "5.0.0",
330-
"contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
331+
"resolved": "6.0.0",
332+
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
331333
},
332334
"System.Text.Encoding": {
333335
"type": "Transitive",
@@ -341,23 +343,25 @@
341343
},
342344
"System.Text.Encodings.Web": {
343345
"type": "Transitive",
344-
"resolved": "5.0.0",
345-
"contentHash": "EEslUvHKll1ftizbn20mX3Ix/l4Ygk/bdJ2LY6/X6FlGaP0RIhKMo9nS6JIGnKKT6KBP2PGj6JC3B9/ZF6ErqQ==",
346+
"resolved": "6.0.0",
347+
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
346348
"dependencies": {
347-
"System.Memory": "4.5.4"
349+
"System.Buffers": "4.5.1",
350+
"System.Memory": "4.5.4",
351+
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
348352
}
349353
},
350354
"System.Text.Json": {
351355
"type": "Transitive",
352-
"resolved": "5.0.0",
353-
"contentHash": "+luxMQNZ2WqeffBU7Ml6njIvxc8169NW2oU+ygNudXQGZiarjE7DOtN7bILiQjTZjkmwwRZGTtLzmdrSI/Ustw==",
356+
"resolved": "6.0.1",
357+
"contentHash": "X3cTdM+jna1YyfTUzToW7aVgINFv7R1W4+1+3hua/YCyLjApPoR8fd+2Cep9DbfYjbv+rBx4K6dlmAWEJr9AHg==",
354358
"dependencies": {
355-
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
359+
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
356360
"System.Buffers": "4.5.1",
357361
"System.Memory": "4.5.4",
358362
"System.Numerics.Vectors": "4.5.0",
359-
"System.Runtime.CompilerServices.Unsafe": "5.0.0",
360-
"System.Text.Encodings.Web": "5.0.0",
363+
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
364+
"System.Text.Encodings.Web": "6.0.0",
361365
"System.Threading.Tasks.Extensions": "4.5.4"
362366
}
363367
},
@@ -392,8 +396,8 @@
392396
"dependencies": {
393397
"Microsoft.CSharp": "4.7.0",
394398
"System.Buffers": "4.5.1",
395-
"System.Diagnostics.DiagnosticSource": "5.0.0",
396-
"System.Text.Json": "5.0.0",
399+
"System.Diagnostics.DiagnosticSource": "5.0.1",
400+
"System.Text.Json": "6.0.1",
397401
"System.Threading.Tasks.Extensions": "4.5.4"
398402
}
399403
}

‎src/Elastic.Clients.Elasticsearch/Api/IndexRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public IndexRequest() : this(typeof(TDocument)) { }
2424

2525
[JsonIgnore] private Id? Id => Self.RouteValues.Get<Id>("id");
2626

27-
void ICustomJsonWriter.WriteJson(Utf8JsonWriter writer, SerializerBase sourceSerializer) => SourceSerialisation.Serialize(Document, writer, sourceSerializer);
27+
void ICustomJsonWriter.WriteJson(Utf8JsonWriter writer, Serializer sourceSerializer) => SourceSerialisation.Serialize(Document, writer, sourceSerializer);
2828

2929
internal static HttpMethod GetHttpMethod(IndexRequest<TDocument> request) =>
3030
request.Id?.StringOrLongValue != null || request.Self.RouteValues.ContainsId ? HttpMethod.PUT : HttpMethod.POST;
@@ -47,7 +47,7 @@ public sealed partial class IndexRequestDescriptor<TDocument> : ICustomJsonWrite
4747

4848
internal Id _id;
4949

50-
public void WriteJson(Utf8JsonWriter writer, SerializerBase sourceSerializer) => SourceSerialisation.Serialize(DocumentValue, writer, sourceSerializer);
50+
public void WriteJson(Utf8JsonWriter writer, Serializer sourceSerializer) => SourceSerialisation.Serialize(DocumentValue, writer, sourceSerializer);
5151

5252
// TODO: Codegen for optional params
5353
public IndexRequestDescriptor<TDocument> Id(Id id) => Assign(id, (a, v) => a.RouteValues.Optional("id", v));

0 commit comments

Comments
 (0)