refactor: Let caller specify nullability of T in json parse fn

This commit is contained in:
John Colvin committed 2024-02-09 01:06:34 -06:00
1 parent 6b7c115779
commit 0116a0cfe5
4 files changed
+41 -59

No files matched your search

@@ -70,15 +70,14 @@ namespace bts.websocket_core {
}
}
public static bool TryParse<T>(JObject filter, string key, out T[]? list, out string error) where T : struct {
public static bool TryParse<T>(JObject filter, string key, out T[]? list, out string error) {
T[] values = new T[] { };
list = null;
ListWrapper? wrap;
if (TryParse<ListWrapper>(filter, key, out wrap, out error)) {
if (TryParse(filter, key, out ListWrapper? wrap, out error)) {
if (wrap != null) {
foreach (var item in wrap) {
T? obj;
if (TryParse<T>(item, key, out obj, out error) && obj != null) {
if (TryParse(item, key, out obj, out error) && obj != null) {
values = values.ToList().Append<T>((T)obj).ToArray();
} else {
return false;
@@ -91,10 +90,11 @@ namespace bts.websocket_core {
return false;
}
public static bool TryParse<T>(string value, string key, [NotNullWhen(true)] out T? obj, [NotNull] out string error) where T : struct {
public static bool TryParse<T>(
string value, string key, [MaybeNullWhen(false)] out T obj, [NotNullWhen(false)] out string error) {
error = "";
if (typeof(T).IsEnum && Enum.TryParse<T>(value, true, out var result)) {
obj = result;
if (typeof(T).IsEnum && Enum.TryParse(typeof(T), value, true, out var result)) {
obj = (T)result;
return true;
}
if (typeof(T) == typeof(double) && double.TryParse(value, out var d)) {
@@ -129,18 +129,18 @@ namespace bts.websocket_core {
}
error = $"{key} is not in the correct format";
obj = null;
obj = default;
return false;
}
public static bool TryParse<T>(JObject filter, string key, out T? obj, [NotNullWhen(false)] out string error) where T : struct {
obj = null;
public static bool TryParse<T>(
JObject filter, string key, [MaybeNull]out T obj, [NotNullWhen(false)] out string error) {
obj = default;
var value = filter.GetValueOrDefault(key)?.ToString();
if (value == null) {
error = $"{key} not present";
return true;
}
return TryParse<T>(value, key, out obj, out error);
return TryParse(value, key, out obj, out error);
}
}
}
}
@@ -35,17 +35,12 @@ namespace bts.websocket_core {
message = $"Incorrect Json: {ex.Path}";
return false;
}
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(
request,
"id",
out WebsocketJsonParsers.StringWrapper? message_id,
out message)
if (!WebsocketJsonParsers.TryParse(request, "id", out string? message_id, out message)
|| message_id == null) {
return false;
}
_message_id = message_id.Value.Val ?? "missing";
REQUEST_TYPES? rt;
if (!WebsocketJsonParsers.TryParse<REQUEST_TYPES>(request, "method", out rt, out message)) {
_message_id = message_id ?? "missing";
if (!WebsocketJsonParsers.TryParse(request, "method", out REQUEST_TYPES? rt, out message)) {
return false;
}
type = rt ?? REQUEST_TYPES.UNKOWN;
@@ -78,4 +73,4 @@ namespace bts.websocket_core {
(parameters, type) = (para, other.type);
}
}
}
}
@@ -18,7 +18,7 @@ namespace bts.websocket_core {
string status = "";
CustomOrderDefinition customdef;
JObject? custom = req.parameters["custom"] as JObject;
if (!WebsocketJsonParsers.TryParse<CustomOrderDefinition.CustomOneofCase>(
if (!WebsocketJsonParsers.TryParse(
req.parameters,
"order_type",
out CustomOrderDefinition.CustomOneofCase? order_type,
@@ -46,8 +46,7 @@ namespace bts.websocket_core {
if (custom == null) {
return (false, null, "custom not present");
}
double? sq;
if (!WebsocketJsonParsers.TryParse<double>(custom, "show_quantity", out sq, out status) || sq == null) {
if (!WebsocketJsonParsers.TryParse(custom, "show_quantity", out double? sq, out status) || sq == null) {
return (false, null, status);
}
customdef = new CustomOrderDefinition() {
@@ -64,7 +63,7 @@ namespace bts.websocket_core {
if (custom == null) {
return (false, null, "custom not present");
}
if (!WebsocketJsonParsers.TryParse<uint>(
if (!WebsocketJsonParsers.TryParse(
custom,
"hedge_ticks",
out uint? ht,
@@ -72,7 +71,7 @@ namespace bts.websocket_core {
|| ht == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<bool>(
if (!WebsocketJsonParsers.TryParse(
custom,
"cancel_on_external_hedge_cancel",
out bool? coehc,
@@ -80,7 +79,7 @@ namespace bts.websocket_core {
|| coehc == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<bool>(
if (!WebsocketJsonParsers.TryParse(
custom,
"cancel_hedges_on_cancel",
out bool? choc,
@@ -88,7 +87,7 @@ namespace bts.websocket_core {
|| choc == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<bool>(
if (!WebsocketJsonParsers.TryParse(
custom,
"detach_hedges",
out bool? dh,
@@ -128,19 +127,11 @@ namespace bts.websocket_core {
if (req.parameters == null) {
return (false, null, "parameters not present");
}
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(
req.parameters,
"user",
out WebsocketJsonParsers.StringWrapper? usr,
out string status)
if (!WebsocketJsonParsers.TryParse(req.parameters, "user", out string? usr, out string status)
|| usr == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(
req.parameters,
"account",
out WebsocketJsonParsers.StringWrapper? act,
out status)
if (!WebsocketJsonParsers.TryParse(req.parameters, "account", out string? act, out status)
|| act == null) {
return (false, null, status);
}
@@ -151,8 +142,8 @@ namespace bts.websocket_core {
return (false, null, adminResult.error_message);
}
AdminData admin = adminResult.value;
string username = usr.Value.Val;
string accountname = act.Value.Val;
string username = usr!;
string accountname = act!;
BTSUser? user = admin.Users.FirstOrDefault(x => username != null ? x.Name.ToLowerInvariant() == username.ToLowerInvariant() : true);
if (user == null) {
return (false, null, "user not correct");
@@ -163,25 +154,22 @@ namespace bts.websocket_core {
return (false, null, "account not corrent");
}
account_id = (uint)account.Id;
if (!WebsocketJsonParsers.TryParse<Side>(
req.parameters,
"side",
out Side? side,
out status)
if (!WebsocketJsonParsers.TryParse(req.parameters, "side", out Side? side, out status)
|| side == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(req.parameters, "exchange_securty_name", out WebsocketJsonParsers.StringWrapper? exchange_securty_name, out status) || exchange_securty_name == null) {
if (!WebsocketJsonParsers.TryParse(
req.parameters, "exchange_securty_name", out string? exchange_securty_name, out status) || exchange_securty_name == null) {
return (false, null, status);
}
if (!WebsocketJsonParsers.TryParse<Venue>(req.parameters, "venue", out Venue? exchange, out status) || exchange == null) {
if (!WebsocketJsonParsers.TryParse(req.parameters, "venue", out Venue? exchange, out status) || exchange == null) {
return (false, null, status);
}
var _securites = securities;
if (!_securites.Values.TryGetFirst(sc_md =>
(
sc_md.security.Exchange == exchange &&
sc_md.security.ToString() == exchange_securty_name.Value.Val),
sc_md.security.ToString() == exchange_securty_name),
out SecurityMD sc_md
)) {
return (false, null, "security not found");
@@ -204,7 +192,7 @@ namespace bts.websocket_core {
if (req.parameters == null) {
return (false, "parameters not present");
}
if (!WebsocketJsonParsers.TryParse<uint>(req.parameters, "order_id", out uint? key, out string status) || key == null) {
if (!WebsocketJsonParsers.TryParse(req.parameters, "order_id", out uint? key, out string status) || key == null) {
return (false, status);
}
Response res = await oc.TryDeleteOrderAsync((uint)key);
@@ -215,7 +203,7 @@ namespace bts.websocket_core {
if (request.parameters == null) {
return (false, "parameters not present");
}
if (!WebsocketJsonParsers.TryParse<uint>(request.parameters, "order_id", out uint? key, out string status) || key == null) {
if (!WebsocketJsonParsers.TryParse(request.parameters, "order_id", out uint? key, out string status) || key == null) {
return (false, status);
}
if (!WebsocketJsonParsers.TryParse(request.parameters, "quantity", out double? quantity, out status) || quantity == null) {
@@ -187,12 +187,10 @@ namespace bts.websocket_core {
return false;
}
// string[]? symbols = (string[]?)(filter.GetValueOrDefault("symbol")?.ToString()?.Split(",").Select(s => s.ToUpper()));
WebsocketJsonParsers.ListWrapper? symbols;
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.ListWrapper>(filter, "symbol", out symbols, out message)) {
if (!WebsocketJsonParsers.TryParse(filter, "symbol", out WebsocketJsonParsers.ListWrapper?symbols, out message)) {
return false;
}
WebsocketJsonParsers.ListWrapper? names;
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.ListWrapper>(filter, "name", out names, out message)) {
if (!WebsocketJsonParsers.TryParse(filter, "name", out WebsocketJsonParsers.ListWrapper? names, out message)) {
return false;
}
// filter.GetValueOrDefault("symbol")?.ToString()?.Split(",");
@@ -223,11 +221,12 @@ namespace bts.websocket_core {
out string status) {
hdlr = null;
SUBSCRIPTION_TYPE? type;
if (!WebsocketJsonParsers.TryParse<SUBSCRIPTION_TYPE>(req.parameters, "type", out type, out status) || status != "") {
if (!WebsocketJsonParsers.TryParse(
req.parameters, "type", out SUBSCRIPTION_TYPE? type, out status) || status != "") {
return false;
}
if (!WebsocketJsonParsers.TryParse<WebsocketJsonParsers.StringWrapper>(req.parameters, "subscription_id", out WebsocketJsonParsers.StringWrapper? id, out status) || id == null) {
if (!WebsocketJsonParsers.TryParse(
req.parameters, "subscription_id", out string? id, out status) || id == null) {
return false;
}
Action<WebsocketSubscriptionHandler> sub;
@@ -287,7 +286,7 @@ namespace bts.websocket_core {
return false;
}
}
hdlr = new WebsocketSubscriptionHandler(id.Value.Val, md, oc, sm, sub);
hdlr = new WebsocketSubscriptionHandler(id!, md, oc, sm, sub);
status = $"{req.id.ToString()}";
return true;
}