Skip to content

Update generated code with fixes from 8.6 specification #7146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ public sealed partial class MultiTermLookup
[JsonInclude]
[JsonPropertyName("field")]
public Elastic.Clients.Elasticsearch.Field Field { get; set; }

[JsonInclude]
[JsonPropertyName("missing")]
public FieldValue? Missing { get; set; }
}

public sealed partial class MultiTermLookupDescriptor<TDocument> : SerializableDescriptor<MultiTermLookupDescriptor<TDocument>>
Expand All @@ -41,6 +45,8 @@ public MultiTermLookupDescriptor() : base()

private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }

private FieldValue? MissingValue { get; set; }

public MultiTermLookupDescriptor<TDocument> Field(Elastic.Clients.Elasticsearch.Field field)
{
FieldValue = field;
Expand All @@ -53,11 +59,23 @@ public MultiTermLookupDescriptor<TDocument> Field<TValue>(Expression<Func<TDocum
return Self;
}

public MultiTermLookupDescriptor<TDocument> Missing(FieldValue? missing)
{
MissingValue = missing;
return Self;
}

protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
{
writer.WriteStartObject();
writer.WritePropertyName("field");
JsonSerializer.Serialize(writer, FieldValue, options);
if (MissingValue is not null)
{
writer.WritePropertyName("missing");
JsonSerializer.Serialize(writer, MissingValue, options);
}

writer.WriteEndObject();
}
}
Expand All @@ -71,6 +89,8 @@ public MultiTermLookupDescriptor() : base()

private Elastic.Clients.Elasticsearch.Field FieldValue { get; set; }

private FieldValue? MissingValue { get; set; }

public MultiTermLookupDescriptor Field(Elastic.Clients.Elasticsearch.Field field)
{
FieldValue = field;
Expand All @@ -89,11 +109,23 @@ public MultiTermLookupDescriptor Field<TDocument>(Expression<Func<TDocument, obj
return Self;
}

public MultiTermLookupDescriptor Missing(FieldValue? missing)
{
MissingValue = missing;
return Self;
}

protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings)
{
writer.WriteStartObject();
writer.WritePropertyName("field");
JsonSerializer.Serialize(writer, FieldValue, options);
if (MissingValue is not null)
{
writer.WritePropertyName("missing");
JsonSerializer.Serialize(writer, MissingValue, options);
}

writer.WriteEndObject();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -500,60 +500,24 @@ public override void Write(Utf8JsonWriter writer, ShardRoutingState value, JsonS
}
}

[JsonConverter(typeof(StorageTypeConverter))]
public enum StorageType
[JsonConverter(typeof(EnumStructConverter<StorageType>))]
public readonly partial struct StorageType
{
[EnumMember(Value = "niofs")]
Niofs,
[EnumMember(Value = "mmapfs")]
Mmapfs,
[EnumMember(Value = "hybridfs")]
Hybridfs,
[EnumMember(Value = "fs")]
Fs
}

internal sealed class StorageTypeConverter : JsonConverter<StorageType>
{
public override StorageType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var enumString = reader.GetString();
switch (enumString)
{
case "niofs":
return StorageType.Niofs;
case "mmapfs":
return StorageType.Mmapfs;
case "hybridfs":
return StorageType.Hybridfs;
case "fs":
return StorageType.Fs;
}

ThrowHelper.ThrowJsonException();
return default;
}

public override void Write(Utf8JsonWriter writer, StorageType value, JsonSerializerOptions options)
{
switch (value)
{
case StorageType.Niofs:
writer.WriteStringValue("niofs");
return;
case StorageType.Mmapfs:
writer.WriteStringValue("mmapfs");
return;
case StorageType.Hybridfs:
writer.WriteStringValue("hybridfs");
return;
case StorageType.Fs:
writer.WriteStringValue("fs");
return;
}

writer.WriteNullValue();
}
public StorageType(string value) => Value = value;
public readonly string Value { get; }

public static StorageType Niofs { get; } = new StorageType("niofs");
public static StorageType Mmapfs { get; } = new StorageType("mmapfs");
public static StorageType Hybridfs { get; } = new StorageType("hybridfs");
public static StorageType Fs { get; } = new StorageType("fs");
public override string ToString() => Value ?? string.Empty;
public static implicit operator string(StorageType storageType) => storageType.Value;
public static implicit operator StorageType(string value) => new(value);
public override int GetHashCode() => Value.GetHashCode();
public override bool Equals(object obj) => obj is StorageType other && this.Equals(other);
public bool Equals(StorageType other) => Value == other.Value;
public static bool operator ==(StorageType a, StorageType b) => a.Equals(b);
public static bool operator !=(StorageType a, StorageType b) => !(a == b);
}

[JsonConverter(typeof(TranslogDurabilityConverter))]
Expand Down