Skip to content

Commit b966121

Browse files
teo-tsirpanisteo-tsirpanis
committed
Use UTF-8 literals in JsonEncodedText.Encode.
Will save a conversion from UTF-16. The generator will have to be updated accordingly.
1 parent dbc650e commit b966121

File tree

8 files changed

+61
-61
lines changed

8 files changed

+61
-61
lines changed

‎src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/JoinFieldConverter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace Elastic.Clients.Elasticsearch.Json;
1212

1313
public sealed class JoinFieldConverter : JsonConverter<JoinField>
1414
{
15-
private static readonly JsonEncodedText PropName = JsonEncodedText.Encode("name");
16-
private static readonly JsonEncodedText PropParent = JsonEncodedText.Encode("parent");
15+
private static readonly JsonEncodedText PropName = JsonEncodedText.Encode("name"u8);
16+
private static readonly JsonEncodedText PropParent = JsonEncodedText.Encode("parent"u8);
1717

1818
public override JoinField? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
1919
{

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkCreateOperation.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
2020
[JsonConverter(typeof(JsonIncompatibleConverter))]
2121
public sealed class BulkCreateOperation<T> : BulkOperation
2222
{
23-
private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
24-
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
25-
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
26-
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
27-
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
28-
private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
29-
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
30-
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
31-
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
32-
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
23+
private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates"u8);
24+
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
25+
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
26+
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
27+
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
28+
private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline"u8);
29+
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
30+
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
31+
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
32+
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
3333

3434
/// <summary>
3535
/// Creates an instance of <see cref="BulkCreateOperation{T}"/> with the provided <typeparamref name="T"/> document serialized

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkDeleteOperation.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
1616
public class BulkDeleteOperation :
1717
BulkOperation
1818
{
19-
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
20-
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
21-
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
22-
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
23-
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
24-
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
25-
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
19+
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
20+
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
21+
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
22+
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
23+
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
24+
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
25+
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
2626

2727
public BulkDeleteOperation(Id id) => Id = id;
2828

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkIndexOperation.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
1717
[JsonConverter(typeof(JsonIncompatibleConverter))]
1818
public sealed class BulkIndexOperation<T> : BulkOperation
1919
{
20-
private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates");
21-
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
22-
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
23-
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
24-
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
25-
private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline");
26-
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
27-
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
28-
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
29-
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
20+
private static readonly System.Text.Json.JsonEncodedText PropDynamicTemplates = System.Text.Json.JsonEncodedText.Encode("dynamic_templates"u8);
21+
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
22+
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
23+
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
24+
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
25+
private static readonly System.Text.Json.JsonEncodedText PropPipeline = System.Text.Json.JsonEncodedText.Encode("pipeline"u8);
26+
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
27+
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
28+
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
29+
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
3030

3131
/// <summary>
3232
/// Creates an instance of <see cref="BulkIndexOperation{T}"/> with the provided <typeparamref name="T"/> document serialized

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkResponseItemConverter.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk.Json;
1212

1313
public sealed class BulkResponseItemConverter : JsonConverter<ResponseItem>
1414
{
15-
private static readonly JsonEncodedText PropError = JsonEncodedText.Encode("error");
16-
private static readonly JsonEncodedText PropForcedRefresh = JsonEncodedText.Encode("forced_refresh");
17-
private static readonly JsonEncodedText PropGet = JsonEncodedText.Encode("get");
18-
private static readonly JsonEncodedText PropId = JsonEncodedText.Encode("_id");
19-
private static readonly JsonEncodedText PropIndex = JsonEncodedText.Encode("_index");
20-
private static readonly JsonEncodedText PropPrimaryTerm = JsonEncodedText.Encode("_primary_term");
21-
private static readonly JsonEncodedText PropResult = JsonEncodedText.Encode("result");
22-
private static readonly JsonEncodedText PropSeqNo = JsonEncodedText.Encode("_seq_no");
23-
private static readonly JsonEncodedText PropShards = JsonEncodedText.Encode("_shards");
24-
private static readonly JsonEncodedText PropStatus = JsonEncodedText.Encode("status");
25-
private static readonly JsonEncodedText PropVersion = JsonEncodedText.Encode("_version");
15+
private static readonly JsonEncodedText PropError = JsonEncodedText.Encode("error"u8);
16+
private static readonly JsonEncodedText PropForcedRefresh = JsonEncodedText.Encode("forced_refresh"u8);
17+
private static readonly JsonEncodedText PropGet = JsonEncodedText.Encode("get"u8);
18+
private static readonly JsonEncodedText PropId = JsonEncodedText.Encode("_id"u8);
19+
private static readonly JsonEncodedText PropIndex = JsonEncodedText.Encode("_index"u8);
20+
private static readonly JsonEncodedText PropPrimaryTerm = JsonEncodedText.Encode("_primary_term"u8);
21+
private static readonly JsonEncodedText PropResult = JsonEncodedText.Encode("result"u8);
22+
private static readonly JsonEncodedText PropSeqNo = JsonEncodedText.Encode("_seq_no"u8);
23+
private static readonly JsonEncodedText PropShards = JsonEncodedText.Encode("_shards"u8);
24+
private static readonly JsonEncodedText PropStatus = JsonEncodedText.Encode("status"u8);
25+
private static readonly JsonEncodedText PropVersion = JsonEncodedText.Encode("_version"u8);
2626

2727
public override ResponseItem Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
2828
{

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/Core/Bulk/BulkUpdateOperation.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ namespace Elastic.Clients.Elasticsearch.Core.Bulk;
1717
public abstract class BulkUpdateOperation :
1818
BulkOperation
1919
{
20-
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id");
21-
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term");
22-
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no");
23-
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index");
24-
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias");
25-
private static readonly System.Text.Json.JsonEncodedText PropRetryOnConflict = System.Text.Json.JsonEncodedText.Encode("retry_on_conflict");
26-
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing");
27-
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version");
28-
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type");
20+
private static readonly System.Text.Json.JsonEncodedText PropId = System.Text.Json.JsonEncodedText.Encode("_id"u8);
21+
private static readonly System.Text.Json.JsonEncodedText PropIfPrimaryTerm = System.Text.Json.JsonEncodedText.Encode("if_primary_term"u8);
22+
private static readonly System.Text.Json.JsonEncodedText PropIfSeqNo = System.Text.Json.JsonEncodedText.Encode("if_seq_no"u8);
23+
private static readonly System.Text.Json.JsonEncodedText PropIndex = System.Text.Json.JsonEncodedText.Encode("_index"u8);
24+
private static readonly System.Text.Json.JsonEncodedText PropRequireAlias = System.Text.Json.JsonEncodedText.Encode("require_alias"u8);
25+
private static readonly System.Text.Json.JsonEncodedText PropRetryOnConflict = System.Text.Json.JsonEncodedText.Encode("retry_on_conflict"u8);
26+
private static readonly System.Text.Json.JsonEncodedText PropRouting = System.Text.Json.JsonEncodedText.Encode("routing"u8);
27+
private static readonly System.Text.Json.JsonEncodedText PropVersion = System.Text.Json.JsonEncodedText.Encode("version"u8);
28+
private static readonly System.Text.Json.JsonEncodedText PropVersionType = System.Text.Json.JsonEncodedText.Encode("version_type"u8);
2929

3030
protected internal BulkUpdateOperation() : base()
3131
{

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoBoundsConverter.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ public sealed class GeoBoundsConverter :
1616
{
1717
// Coordinates.
1818

19-
private static readonly JsonEncodedText PropBottom = JsonEncodedText.Encode("bottom");
20-
private static readonly JsonEncodedText PropLeft = JsonEncodedText.Encode("left");
21-
private static readonly JsonEncodedText PropRight = JsonEncodedText.Encode("right");
22-
private static readonly JsonEncodedText PropTop = JsonEncodedText.Encode("top");
19+
private static readonly JsonEncodedText PropBottom = JsonEncodedText.Encode("bottom"u8);
20+
private static readonly JsonEncodedText PropLeft = JsonEncodedText.Encode("left"u8);
21+
private static readonly JsonEncodedText PropRight = JsonEncodedText.Encode("right"u8);
22+
private static readonly JsonEncodedText PropTop = JsonEncodedText.Encode("top"u8);
2323

2424
// TopLeftBottomRight.
2525

26-
private static readonly JsonEncodedText PropBottomRight = JsonEncodedText.Encode("bottom_right");
27-
private static readonly JsonEncodedText PropTopLeft = JsonEncodedText.Encode("top_left");
26+
private static readonly JsonEncodedText PropBottomRight = JsonEncodedText.Encode("bottom_right"u8);
27+
private static readonly JsonEncodedText PropTopLeft = JsonEncodedText.Encode("top_left"u8);
2828

2929
// TopRightBottomLeft.
3030

31-
private static readonly JsonEncodedText PropBottomLeft = JsonEncodedText.Encode("bottom_left");
32-
private static readonly JsonEncodedText PropTopRight = JsonEncodedText.Encode("top_right");
31+
private static readonly JsonEncodedText PropBottomLeft = JsonEncodedText.Encode("bottom_left"u8);
32+
private static readonly JsonEncodedText PropTopRight = JsonEncodedText.Encode("top_right"u8);
3333

3434
// WKT.
3535

36-
private static readonly JsonEncodedText PropWkt = JsonEncodedText.Encode("wkt");
36+
private static readonly JsonEncodedText PropWkt = JsonEncodedText.Encode("wkt"u8);
3737

3838
public override GeoBounds? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
3939
{

‎src/Elastic.Clients.Elasticsearch/_Shared/Types/GeoLocationConverter.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public sealed class GeoLocationConverter :
1515
{
1616
// LatitudeLongitude.
1717

18-
private static readonly JsonEncodedText PropLat = JsonEncodedText.Encode("lat");
19-
private static readonly JsonEncodedText PropLon = JsonEncodedText.Encode("lon");
18+
private static readonly JsonEncodedText PropLat = JsonEncodedText.Encode("lat"u8);
19+
private static readonly JsonEncodedText PropLon = JsonEncodedText.Encode("lon"u8);
2020

2121
// GeoHash.
2222

23-
private static readonly JsonEncodedText PropGeoHash = JsonEncodedText.Encode("geohash");
23+
private static readonly JsonEncodedText PropGeoHash = JsonEncodedText.Encode("geohash"u8);
2424

2525
public override GeoLocation? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
2626
{

0 commit comments

Comments
 (0)