1
0
mirror of synced 2024-11-21 17:03:50 +00:00

Merge branch 'release/3.0.1' into develop

This commit is contained in:
Mark van Renswoude 2023-03-30 14:16:48 +02:00
commit 8250a7181f

View File

@ -313,7 +313,7 @@ namespace Tapeti.Connection
} }
private static RabbitMQArguments? ConvertJsonArguments(IReadOnlyDictionary<string, JObject>? arguments) private static RabbitMQArguments? ConvertJsonArguments(IReadOnlyDictionary<string, JValue>? arguments)
{ {
if (arguments == null) if (arguments == null)
return null; return null;
@ -326,7 +326,7 @@ namespace Tapeti.Connection
{ {
JTokenType.Integer => pair.Value.Value<int>(), JTokenType.Integer => pair.Value.Value<int>(),
JTokenType.Float => pair.Value.Value<double>(), JTokenType.Float => pair.Value.Value<double>(),
JTokenType.String => Encoding.UTF8.GetBytes(pair.Value.Value<string>() ?? string.Empty), JTokenType.String => pair.Value.Value<string>() ?? string.Empty,
JTokenType.Boolean => pair.Value.Value<bool>(), JTokenType.Boolean => pair.Value.Value<bool>(),
_ => throw new ArgumentOutOfRangeException(nameof(arguments)) _ => throw new ArgumentOutOfRangeException(nameof(arguments))
}; };
@ -599,7 +599,7 @@ namespace Tapeti.Connection
public bool Exclusive { get; set; } public bool Exclusive { get; set; }
[JsonProperty("arguments")] [JsonProperty("arguments")]
public Dictionary<string, JObject>? Arguments { get; set; } public Dictionary<string, JValue>? Arguments { get; set; }
[JsonProperty("messages")] [JsonProperty("messages")]
public uint Messages { get; set; } public uint Messages { get; set; }