diff --git a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs index aefec42fd..6c1e5be88 100644 --- a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs +++ b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs @@ -1,112 +1,67 @@ +using bts; + +using mbts.utils; + using System; -using BCG; -//using BCG.Utilities; -using System.Text.RegularExpressions; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -using System.Text.Json; -using System.Text.Json.Nodes; -using System.Runtime.InteropServices; +using System.Text.RegularExpressions; -namespace BCG { - [JsonConverter(typeof(PubSubRouteJsonConverter))] - public class PubSubRoute : IComparable { - public string server_address; - public string tag_reg_exp; - //route names are used in intermediary code (i.e. while substations are being deployed) - //so that MC Hammer can advertise them. - public string name; - private Regex _regex = null; +namespace BCG; - public PubSubRoute() { } +public class PubSubRoute : IEquatable, IComparable, ICloneable { + [JsonPropertyName("server_address")] + public string? ServerAddress { get; set; } - public PubSubRoute(string the_server_address, string the_tag_reg_exp) { - server_address = the_server_address; - tag_reg_exp = the_tag_reg_exp; - } + [JsonPropertyName("tag")] + public string? TagRegExp { get; set; } + //route names are used in intermediary code (i.e. while substations are being deployed) + //so that MC Hammer can advertise them. + [JsonPropertyName("name")] + public string? Name { get; set; } - public string[] getAllPubSubs() { - return server_address.Split(';'); - } + static readonly IComparer comparer = new ComparerBuilder() { + p => p.ServerAddress, + p => p.TagRegExp, + }; - public Regex get_regex() { - return _regex ?? new Regex(tag_reg_exp); - } + Regex? myRegex; - #region IComparable Members + public PubSubRoute() { } - public int CompareTo(PubSubRoute other) { - return server_address == other.server_address ? tag_reg_exp.CompareTo(other.tag_reg_exp) - : server_address.CompareTo(other.server_address); - } - - #endregion - - public PubSubRoute Clone() => - new() { - server_address = server_address, - tag_reg_exp = tag_reg_exp, - name = name, - }; - - - public override bool Equals(object obj) { - if (!(obj is PubSubRoute) || obj == null) - return false; - else { - PubSubRoute other = obj as PubSubRoute; - return server_address.Equals(other.server_address) && - tag_reg_exp.Equals(other.tag_reg_exp); - } - } - - public override int GetHashCode() { - return base.GetHashCode(); - } - - public static PubSubRoute get_default_route() { - return new PubSubRoute("bluto://127.0.0.1:12345", ".*"); - } - - public override string ToString() { - return $"tag_reg_exp: {tag_reg_exp} server_address: {server_address}"; - } + public PubSubRoute(string theServerAddress, string theTagRegExp) { + ServerAddress = theServerAddress; + TagRegExp = theTagRegExp; } - public static class PubSubRouteExtensions { - public static bool IsMatch(this PubSubRoute route, string tag) => - route.get_regex().IsMatch(tag); + [MemberNotNull(nameof(TagRegExp), nameof(myRegex))] + public bool IsMatch(string tag) { + if (TagRegExp is null) { + throw new InvalidOperationException(); + } + myRegex ??= new Regex(TagRegExp); + return myRegex.IsMatch(tag); } - public class PubSubRouteJsonConverter : JsonConverter { - public override PubSubRoute? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - var json_obj = JsonSerializer.Deserialize(ref reader); - if (json_obj is null) { - return null; - } - var rv = new PubSubRoute(); - ReadString("name", ref rv.name); - ReadString("server_address", ref rv.server_address); - ReadString("tag", ref rv.tag_reg_exp); - return rv; + public PubSubRoute Clone() => + new() { + ServerAddress = ServerAddress, + TagRegExp = TagRegExp, + Name = Name, + }; - void ReadString(string key, ref string valueOut) { - if (json_obj.TryGetPropertyValue(key, out var valueJson)) { - var valueStr = valueJson?.GetValue(); - // Only (over)write valueOut if non-null - if (valueStr is not null) { - valueOut = valueStr; - } - } - } - } + public int CompareTo(PubSubRoute? other) => + other is null ? -1 : comparer.Compare(this, other); - public override void Write(Utf8JsonWriter writer, PubSubRoute value, JsonSerializerOptions options) { - var jsonObj = new JsonObject { - ["name"] = value.name, - ["server_address"] = value.server_address, - ["tag"] = value.tag_reg_exp, - }; - JsonSerializer.Serialize(writer, jsonObj); - } - } + public bool Equals(PubSubRoute? other) => + other is not null + && ServerAddress == other.ServerAddress + && TagRegExp == other.TagRegExp; + + public override bool Equals(object? obj) => + Equals(obj as PubSubRoute); + + public override int GetHashCode() => + HashCode.Combine(ServerAddress, TagRegExp); } diff --git a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs index 1f0c34bf9..0304c1411 100644 --- a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs +++ b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs @@ -48,7 +48,8 @@ namespace BCG { throw new ArgumentException($"Failed to find route for tag '{tag}'", nameof(tag)); } Log.Gen.info($"PubSubRouter.get_sub_url_for_tag tag: {tag} route: {route}"); - return RemoteConnectionInfo.parse_url(route.server_address); + ArgumentNullException.ThrowIfNull(route.ServerAddress); + return RemoteConnectionInfo.parse_url(route.ServerAddress); } public RemoteConnectionInfo get_sub_route_for_tag(string tag) { @@ -56,17 +57,18 @@ namespace BCG { throw new ArgumentException($"Failed to find route for tag '{tag}'", nameof(tag)); } Log.Gen.info($"PubSubRouter.get_sub_url_for_tag tag: {tag} route: {route}"); - return RemoteConnectionInfo.parse_url(route.server_address); + ArgumentNullException.ThrowIfNull(route.ServerAddress); + return RemoteConnectionInfo.parse_url(route.ServerAddress); } public List get_all_pubsub_sub_urls() => - _sub_routes.Select(r => r.server_address).ToList(); + _sub_routes.Select(r => r.ServerAddress ?? throw new InvalidOperationException("Route.ServerAddress is null")).ToList(); public List get_all_pubsub_pub_urlss() => - _pub_routes.Select(r => r.server_address).ToList(); + _pub_routes.Select(r => r.ServerAddress ?? throw new InvalidOperationException("Route.ServerAddress is null")).ToList(); - public event PubSubTagURLChangeDelegate onSubURLTagRouteChange; - public event PubSubTagURLChangeDelegate onPubURLTagRouteChange; + public event PubSubTagURLChangeDelegate? onSubURLTagRouteChange; + public event PubSubTagURLChangeDelegate? onPubURLTagRouteChange; #endregion @@ -77,7 +79,5 @@ namespace BCG { aVar = aVar + 2; } } - - } } diff --git a/src/DataStreamSuite/SharedStreams/System/PS3/PubsubRoutesStream.cs b/src/DataStreamSuite/SharedStreams/System/PS3/PubsubRoutesStream.cs index 738635b6b..05dcb1285 100644 --- a/src/DataStreamSuite/SharedStreams/System/PS3/PubsubRoutesStream.cs +++ b/src/DataStreamSuite/SharedStreams/System/PS3/PubsubRoutesStream.cs @@ -19,10 +19,10 @@ namespace BCG { BlueTable rows = new BlueTable(schema); var routes = _router.sub_routes(); foreach (var route in routes) { - IBlueRow nr = new BlueRow(schema, rows.Count, route.tag_reg_exp, route.server_address); + IBlueRow nr = new BlueRow(schema, rows.Count, route.TagRegExp, route.ServerAddress); rows.addRow(nr); } myFireEvent(new DataPacket(rows, rows, new BlueTable(schema))); } } -} \ No newline at end of file +}