From baa43cbecf56ae7a9c3dd852db29ecd554d4df4e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 28 Feb 2026 07:26:43 +0000 Subject: [PATCH] refactor: Enable nullability in Bts.Spark.Api --- src/client/spark/Daemons/MDDaemon.cs | 2 +- .../Trading/OpenOrders/OpenOrdersRowData.cs | 2 +- .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 1 - src/cs/Bts.Collections/ArrayUtils.cs | 2 +- .../Bts.Core/Diagnostics/ExceptionBuilder.cs | 2 +- src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs | 2 +- src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj | 1 + src/cs/Bts.Spark.Api/MarketData/Book.cs | 6 +- .../MarketData/Co2NativeMethods.cs | 2 +- src/cs/Bts.Spark.Api/MarketData/IntPrice.cs | 4 +- src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs | 4 + .../MarketData/MDConsumerHandle.cs | 2 +- src/cs/Bts.Spark.Api/MarketData/MDSource.cs | 2 +- .../MarketData/NativePriceSize.cs | 2 +- src/cs/Bts.Spark.Api/MarketData/PriceSize.cs | 4 +- .../Bts.Spark.Api/MarketData/TradesSource.cs | 3 - src/cs/Bts.Spark.Api/Orders/AccountTuple.cs | 19 +---- src/cs/Bts.Spark.Api/Orders/AlgoData.cs | 2 +- .../Orders/AlgoDefinitionMetadata.cs | 20 +++-- .../Orders/AlgoDefinitionPersistedMetadata.cs | 19 +++-- src/cs/Bts.Spark.Api/Orders/AlgoKey.cs | 20 +++-- .../Bts.Spark.Api/Orders/AlgoPersistedKey.cs | 4 +- .../Orders/AlgoTreeEnumerator.cs | 11 +-- src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs | 9 +-- src/cs/Bts.Spark.Api/Orders/FillTuple.cs | 4 +- .../Bts.Spark.Api/Orders/ManualFillTuple.cs | 2 +- .../Orders/OrderCollectionSummarizer.cs | 4 +- .../Bts.Spark.Api/Orders/OrderDataHelper.cs | 23 +++--- src/cs/Bts.Spark.Api/Orders/OrdersClient.cs | 1 - .../Bts.Spark.Api/Orders/OrdersExtensions.cs | 9 ++- .../Position/DayFillsDataSource.cs | 7 +- src/cs/Bts.Spark.Api/Position/PNLData.cs | 5 +- src/cs/Bts.Spark.Api/Position/PNLRowData.cs | 10 +-- .../Bts.Spark.Api/Position/PositionModel.cs | 2 +- .../Reactive/SecurityResolver.cs | 15 ++-- .../Services/CachedServiceProvider.cs | 1 - .../Services/SparkApiServices.cs | 1 - .../Services/SparkCredentials.cs | 1 - .../Services/SparkLoginService.cs | 1 - .../Services/UserDataPermissions.cs | 1 - src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs | 4 +- .../api/Channels/QuickBusClientChannel.cs | 32 ++++---- src/cs/Bts.Spark.Api/api/ClientChannel.cs | 4 +- .../api/ManagedQuickbusWrapper.cs | 1 - src/cs/Bts.Spark.Api/api/Result.cs | 18 ++--- src/cs/Bts.Spark.Api/api/ServerChannel.cs | 6 +- src/cs/Bts.Spark.Api/api/ServiceContext.cs | 9 +-- .../data/DisplayQuantityMultiplier.cs | 12 ++- src/cs/Bts.Spark.Api/data/ExpirationDate.cs | 2 +- .../data/QuantityConversionData.cs | 2 +- src/cs/Bts.Spark.Api/data/UserTuple.cs | 28 ++----- .../data/ticks/RegionalTickFactors.cs | 45 +++++++---- .../data/ticks/TickExtensions.cs | 78 ++++++++++--------- .../Bts.Spark.Api/data/ticks/TickFactors.cs | 8 +- .../data/ticks/TickFactorsFactory.cs | 10 +-- src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs | 39 ++++++---- .../security/ExchangeSpecificUtilities.cs | 15 ++-- src/cs/Bts.Spark.Api/security/Security.cs | 10 +-- .../security/SecurityComparer.cs | 4 +- .../security/SecurityEqualityComparer.cs | 4 +- .../security/SecurityFormatter.cs | 8 +- .../threading/ThreadSafeEvent.cs | 2 +- src/cs/Bts.Spark.Api/utils/ProtoHelper.cs | 16 ++-- .../utils/NullableExtensions.cs | 4 + .../templates/c#/client.pb.cs | 12 +-- .../templates/c#/server.pb.cs | 17 ++-- 66 files changed, 315 insertions(+), 307 deletions(-) diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index db735d80b..df30cb9cb 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -146,7 +146,7 @@ namespace bts { var qtyDisplay = meta.HasValue && meta.Value.HasQuantityDisplay ? meta.Value.QuantityDisplay : Security.Defaults.quantity_display_settingsi; if (sec.HasContractSpec) { var pd = priceDisplay.CloneToMutable(); - pd.TickFactors = TickUtils.get_tick(sec, 0).to_api_tick_factors(); + pd.TickFactors = sec.tick_factors().to_api_tick_factors(); priceDisplay = new(pd); if (sec.ContractSpec.QuantityInfos.TryGetFirst(out var qtyInfo)) { var qd = qtyDisplay.CloneToMutable(); diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs index f8d5b99f5..238774143 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs @@ -73,7 +73,7 @@ namespace Spark.Trading { meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi; if (security.HasValue) { rv = rv.with( - tick_factors: security.Value.regional_ticks().low_tick.to_api_tick_factors()); + tick_factors: security.Value.tick_factors().to_api_tick_factors()); } return rv; } diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index f099da8b2..cb737cc34 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -681,7 +681,6 @@ namespace mbts.spark { void _on_property_added(string prop_name, int target_field_number, OneofDescriptor oneof_descriptor, IProperty prop, Action assign_to_prop, T non_uniform_value, bool validate_on_changed, AlgoParamPermissions permissions) where T : struct { var target_field_desc = ProtoHelper.Descriptor().FindFieldByNumber(target_field_number); var param = new AlgoParamVM(prop_name, DisplayNameHelper.snake_to_title_case(prop_name), prop.Value) { permissions = permissions }; - var oneof_index = ProtoHelper.get_oneof_descriptor_index(oneof_descriptor); _algo_params.Add(param); _auto_props.Add(new AutoProp(prop_name, mval => { if (mval == null || !param.has_value) diff --git a/src/cs/Bts.Collections/ArrayUtils.cs b/src/cs/Bts.Collections/ArrayUtils.cs index 288460b23..adc8b6ade 100644 --- a/src/cs/Bts.Collections/ArrayUtils.cs +++ b/src/cs/Bts.Collections/ArrayUtils.cs @@ -27,7 +27,7 @@ namespace bts.utils { } } - public static TResult[] safe_convert(T[] array, Func convert) => + public static TResult[] safe_convert(T[]? array, Func convert) => array == null ? Array.Empty() : Array.ConvertAll(array, new Converter(convert)); public static TResult[] convert(ICollection source, Func convert) { diff --git a/src/cs/Bts.Core/Diagnostics/ExceptionBuilder.cs b/src/cs/Bts.Core/Diagnostics/ExceptionBuilder.cs index 98009ed3e..7e348a2c1 100644 --- a/src/cs/Bts.Core/Diagnostics/ExceptionBuilder.cs +++ b/src/cs/Bts.Core/Diagnostics/ExceptionBuilder.cs @@ -9,7 +9,7 @@ namespace Spark.Core.Diagnostics { public static ArgumentException unexpected_case(T value, string name) => new ArgumentException($"Unexpected {typeof(T)} '{value}.'", name); - public static ArgumentException not_of_type(string name, Type actual = null) => + public static ArgumentException not_of_type(string name, Type? actual = null) => actual is null ? not_of_type(name, typeof(T)) : not_of_type(name, typeof(T), actual); diff --git a/src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs b/src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs index d7d8b9deb..88824f112 100644 --- a/src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs +++ b/src/cs/Bts.Spark.Api/Analytics/GreeksTuple.cs @@ -45,7 +45,7 @@ namespace mbts.analytics { theta.Equals(other.theta) && rho.Equals(other.rho); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is GreeksTuple gt && Equals(gt); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj index 3334e3376..5966ad3a8 100644 --- a/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj +++ b/src/cs/Bts.Spark.Api/Bts.Spark.Api.csproj @@ -2,6 +2,7 @@ net8.0 true + enable x64 x64 true diff --git a/src/cs/Bts.Spark.Api/MarketData/Book.cs b/src/cs/Bts.Spark.Api/MarketData/Book.cs index 39b1db1d1..d48205326 100644 --- a/src/cs/Bts.Spark.Api/MarketData/Book.cs +++ b/src/cs/Bts.Spark.Api/MarketData/Book.cs @@ -2,10 +2,6 @@ namespace bts.md { using bts.api; using bts.api.core; - using mbts; - using mbts.co2; - using mbts.spark; - using System; using System.Collections.Generic; using System.Linq; @@ -40,7 +36,7 @@ namespace bts.md { bids.SequenceEqual(other.bids) && asks.SequenceEqual(other.asks); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is Book other && Equals(other); public override int GetHashCode() => security_id.GetHashCode(); diff --git a/src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs b/src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs index b09824e89..316a5b530 100644 --- a/src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs +++ b/src/cs/Bts.Spark.Api/MarketData/Co2NativeMethods.cs @@ -19,7 +19,7 @@ namespace mbts.co2 { [DllImport("libspark")] internal static extern IntPtr create_md_consumer( - [MarshalAs(UnmanagedType.LPArray)] UserSymbol[] symbols, uint count, bool shared); + [MarshalAs(UnmanagedType.LPArray)] UserSymbol[]? symbols, uint count, bool shared); [DllImport("libspark")] internal static extern void destroy_md_consumer(IntPtr consumer); diff --git a/src/cs/Bts.Spark.Api/MarketData/IntPrice.cs b/src/cs/Bts.Spark.Api/MarketData/IntPrice.cs index 27cec9411..04844fd8b 100644 --- a/src/cs/Bts.Spark.Api/MarketData/IntPrice.cs +++ b/src/cs/Bts.Spark.Api/MarketData/IntPrice.cs @@ -26,8 +26,8 @@ namespace mbts.co2 { public bool Equals(IntPrice other) => _exponent == other._exponent && _mantissa == other._mantissa; - public override bool Equals(object obj) => - base.Equals(obj); + public override bool Equals(object? obj) => + obj is IntPrice other && Equals(other); public override int GetHashCode() => _mantissa.GetHashCode(); diff --git a/src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs b/src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs index 2a70c4858..86044fe80 100644 --- a/src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs +++ b/src/cs/Bts.Spark.Api/MarketData/MDConsumer.cs @@ -43,6 +43,10 @@ namespace mbts.co2 { public IntPtr native_pointer() => _consumer; + [MemberNotNull(nameof(on_security))] + public IObservable> RequireSecurities() => + on_security ?? throw new InvalidOperationException("Securities not initialized"); + public MDConsumerHandle? try_get_handle(security_key key) => Co2NativeMethods.md_consumer_get_handle(_consumer, key, out var raw) ? new MDConsumerHandle(_consumer, null, raw) : null; diff --git a/src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs b/src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs index 4a9ccd404..74c87e5e4 100644 --- a/src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs +++ b/src/cs/Bts.Spark.Api/MarketData/MDConsumerHandle.cs @@ -18,7 +18,7 @@ internal MDConsumerHandle( IntPtr consumer, - Security security, + Security? security, Co2NativeMethods.BlitPointerTuple tuple) { _header = (ColdHeader*)tuple.cold_header.ToPointer(); _cold = (ColdEntry*)tuple.cold_data.ToPointer(); diff --git a/src/cs/Bts.Spark.Api/MarketData/MDSource.cs b/src/cs/Bts.Spark.Api/MarketData/MDSource.cs index 204c30942..0a6a2e375 100644 --- a/src/cs/Bts.Spark.Api/MarketData/MDSource.cs +++ b/src/cs/Bts.Spark.Api/MarketData/MDSource.cs @@ -39,7 +39,7 @@ namespace bts.md { _relay = new Co2RelayControl(consumer, relay_throttle); _relay.preload_securities((co2.MDRequest.Types.Flags)0xff).ignore(); - _securities_src = consumer.on_security + _securities_src = consumer.RequireSecurities() .Buffer(output_throttle) .Select(buffer => buffer.SelectMany(_ => _).Where(sec_filter)) .Where(buffer => buffer.Any()) diff --git a/src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs b/src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs index 231c48045..18b90cc1d 100644 --- a/src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs +++ b/src/cs/Bts.Spark.Api/MarketData/NativePriceSize.cs @@ -49,7 +49,7 @@ namespace mbts.co2 { public override string ToString() => $"{price} {size} ({implied_size})"; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is NativePriceSize p ? Equals(p) : base.Equals(obj); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/MarketData/PriceSize.cs b/src/cs/Bts.Spark.Api/MarketData/PriceSize.cs index 42d04c3af..cc5a8102a 100644 --- a/src/cs/Bts.Spark.Api/MarketData/PriceSize.cs +++ b/src/cs/Bts.Spark.Api/MarketData/PriceSize.cs @@ -28,14 +28,14 @@ namespace bts.md { implied_size = this.implied_size }; - public bool Equals(PriceSize other) => + public bool Equals(PriceSize? other) => other is not null && size == other.size && direct_size == other.direct_size && implied_size == other.implied_size && price == other.price; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => Equals(obj as PriceSize); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/MarketData/TradesSource.cs b/src/cs/Bts.Spark.Api/MarketData/TradesSource.cs index 832cd3936..1bd01e19d 100644 --- a/src/cs/Bts.Spark.Api/MarketData/TradesSource.cs +++ b/src/cs/Bts.Spark.Api/MarketData/TradesSource.cs @@ -91,9 +91,6 @@ readonly Dictionary _security_mds; long _cursor = 0; - public ChannelConsumer(MDConsumerChannel channel) => - _channel = channel; - public ChannelConsumer(MDConsumerChannel channel, IEnumerable security_mds) { _channel = channel; _security_mds = security_mds.ToDictionary(s => s.id, DuplicateKeyPolicy.Overwrite); diff --git a/src/cs/Bts.Spark.Api/Orders/AccountTuple.cs b/src/cs/Bts.Spark.Api/Orders/AccountTuple.cs index 84c147a46..b5cd7feed 100644 --- a/src/cs/Bts.Spark.Api/Orders/AccountTuple.cs +++ b/src/cs/Bts.Spark.Api/Orders/AccountTuple.cs @@ -1,32 +1,21 @@ using System; namespace bts { - public readonly struct AccountTuple : IEquatable, IComparable, IComparable { + public readonly record struct AccountTuple(uint id, string name = "") : IComparable, IComparable { public static readonly Func key_fn = a => a.id; public static readonly Func nullable_key_fn = a => a.HasValue ? a.Value.id : 0u; - public readonly uint id; - public readonly string name; - - public AccountTuple(uint id, string name) { - this.id = id; - this.name = name; - } - public int CompareTo(AccountTuple other) { int comp = string.Compare(name, other.name); return comp == 0 ? id.CompareTo(other.id) : comp; } - int IComparable.CompareTo(object obj) => + int IComparable.CompareTo(object? obj) => obj is AccountTuple other ? CompareTo(other) : 1; - public bool Equals(AccountTuple other) => other.id == id && other.name == name; - public override bool Equals(object obj) => obj is AccountTuple other && Equals(other); public override int GetHashCode() => id.GetHashCode(); - public override string ToString() => name; - public static bool operator ==(AccountTuple a, AccountTuple b) => a.Equals(b); - public static bool operator !=(AccountTuple a, AccountTuple b) => !a.Equals(b); + public override string ToString() => + name ?? string.Empty; } } diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoData.cs b/src/cs/Bts.Spark.Api/Orders/AlgoData.cs index 49cd55165..af5dc94fa 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoData.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoData.cs @@ -58,7 +58,7 @@ namespace mbts.spark { name == other.name && OrderEqualityComparer.custom_order_defi_comparer.Equals(value, other.value); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => EqualityComparer.equals_obj(in this, obj); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs index f1fd9552f..e03342427 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionMetadata.cs @@ -15,9 +15,9 @@ namespace mbts.spark { public static readonly Func key_fn = m => m.id; public readonly AlgoKey id, default_template; - readonly AlgoKey[] _favorite_templates; + readonly AlgoKey[]? _favorite_templates; public readonly bool is_favorite, is_hidden; - public readonly string abbreviation; + public readonly string? abbreviation; public readonly uint? badge_color; public AlgoDefinitionMetadata(AlgoKey id) @@ -26,10 +26,10 @@ namespace mbts.spark { public AlgoDefinitionMetadata( AlgoKey id, AlgoKey default_template, - AlgoKey[] favorite_templates, + AlgoKey[]? favorite_templates, bool is_favorite, bool is_hidden, - string abbreviation, + string? abbreviation, uint? badge_color ) { this.id = id; @@ -51,7 +51,15 @@ namespace mbts.spark { favorite_templates.Where(t => t.mode == AlgoKey.Mode.Persisted).Select(t => new AlgoPersistedKey(t.persisted)).ToArray(), is_favorite, is_hidden, abbreviation, new NullableColorProto(badge_color)); - public AlgoDefinitionMetadata with(AlgoKey? id = null, AlgoKey? default_template = null, IEnumerable favorite_templates = null, bool? is_favorite = null, bool? is_hidden = null, string abbreviation = null, NullableColorProto? badge_color = null) => + public AlgoDefinitionMetadata with( + AlgoKey? id = null, + AlgoKey? default_template = null, + IEnumerable? favorite_templates = null, + bool? is_favorite = null, + bool? is_hidden = null, + string? abbreviation = null, + NullableColorProto? badge_color = null + ) => new AlgoDefinitionMetadata( id ?? this.id, default_template ?? this.default_template, @@ -70,7 +78,7 @@ namespace mbts.spark { badge_color == other.badge_color && favorite_templates.SequenceEqual(other.favorite_templates); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => EqualityComparer.equals_obj(in this, obj); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs index dbd58b64f..862e7ce71 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoDefinitionPersistedMetadata.cs @@ -21,20 +21,20 @@ namespace bts.persist.algo { [ProtoMember(2)] public readonly AlgoPersistedKey default_template; [ProtoMember(3)] - readonly AlgoPersistedKey[] _favorite_templates; + readonly AlgoPersistedKey[]? _favorite_templates; [ProtoMember(4)] public readonly bool is_favorite; [ProtoMember(5)] public readonly bool is_hidden; [ProtoMember(6)] - public readonly string abbreviation; + public readonly string? abbreviation; [ProtoMember(7)] public readonly NullableColorProto badge_color; public AlgoDefinitionPersistedMetadata(AlgoPersistedKey id) : this(id, default, default, default, default, default, default) { } - public AlgoDefinitionPersistedMetadata(AlgoPersistedKey id, AlgoPersistedKey default_template, AlgoPersistedKey[] favorite_templates, bool is_favorite, bool is_hidden, string abbreviation, NullableColorProto badge_color) { + public AlgoDefinitionPersistedMetadata(AlgoPersistedKey id, AlgoPersistedKey default_template, AlgoPersistedKey[]? favorite_templates, bool is_favorite, bool is_hidden, string? abbreviation, NullableColorProto badge_color) { this.id = id; this.default_template = default_template; _favorite_templates = favorite_templates; @@ -49,7 +49,14 @@ namespace bts.persist.algo { public AlgoDefinitionMetadata to_definition_data() => new AlgoDefinitionMetadata(id.to_algo_key(), default_template.to_algo_key(), ArrayHelper.safe_convert(_favorite_templates, k => k.to_algo_key()), is_favorite, is_hidden, abbreviation, badge_color.value); - public AlgoDefinitionPersistedMetadata with(AlgoPersistedKey? default_template = null, IEnumerable favorite_templates = null, bool? is_favorite = null, bool? is_hidden = null, string abbreviation = null, NullableColorProto? badge_color = null) => + public AlgoDefinitionPersistedMetadata with( + AlgoPersistedKey? default_template = null, + IEnumerable? favorite_templates = null, + bool? is_favorite = null, + bool? is_hidden = null, + string? abbreviation = null, + NullableColorProto? badge_color = null + ) => new AlgoDefinitionPersistedMetadata(id, default_template ?? this.default_template, favorite_templates == null ? _favorite_templates : favorite_templates.ToArray(), @@ -67,7 +74,7 @@ namespace bts.persist.algo { badge_color == other.badge_color && favorite_templates.SequenceEqual(other.favorite_templates); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => EqualityComparer.equals_obj(in this, obj); public override int GetHashCode() => @@ -77,7 +84,7 @@ namespace bts.persist.algo { is_favorite.GetHashCode(), is_hidden.GetHashCode(), abbreviation == null ? 0 : abbreviation.GetHashCode(), - EqualityComparer.aggregate_hash_limited(_favorite_templates)); + EqualityComparer.aggregate_hash_limited(_favorite_templates ?? [])); public static bool operator ==(AlgoDefinitionPersistedMetadata a, AlgoDefinitionPersistedMetadata b) => a.Equals(b); public static bool operator !=(AlgoDefinitionPersistedMetadata a, AlgoDefinitionPersistedMetadata b) => !a.Equals(b); diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoKey.cs b/src/cs/Bts.Spark.Api/Orders/AlgoKey.cs index a810f0bcb..8e64d5033 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoKey.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoKey.cs @@ -6,6 +6,8 @@ using mbts.utils; using ProtoBuf; using Spark.Api.Orders; +using Spark.Core; +using Spark.Core.Diagnostics; using System; using System.Linq; @@ -18,7 +20,7 @@ namespace mbts.spark { [ProtoMember(1)] readonly CustomOrderDefinition.CustomOneofCase? _factory_key; [ProtoMember(2)] - readonly string _dynamic_key; + readonly string? _dynamic_key; [ProtoMember(3)] readonly uint? _persisted_key; @@ -77,7 +79,7 @@ namespace mbts.spark { _dynamic_key == other._dynamic_key && _persisted_key == other._persisted_key; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is AlgoID other && Equals(other); public override int GetHashCode() => @@ -93,7 +95,7 @@ namespace mbts.spark { public readonly struct AlgoKey : IEquatable { readonly uint? _composite_key; readonly Guid? _unpersisted; - readonly string _dynamic_type; + readonly string? _dynamic_type; readonly CustomOrderDefinition.CustomOneofCase? _factory_type; AlgoKey(Guid id_guid) { @@ -135,10 +137,10 @@ namespace mbts.spark { public bool is_persisted => mode == Mode.Persisted; public bool is_composite => _composite_key.HasValue || _unpersisted.HasValue; - public uint persisted => _composite_key.Value; - public Guid unpersisted => _unpersisted.Value; - public CustomOrderDefinition.CustomOneofCase factory => _factory_type.Value; - public string dynamic_type => _dynamic_type; + public uint persisted => _composite_key.RequireValue(); + public Guid unpersisted => _unpersisted.RequireValue(); + public CustomOrderDefinition.CustomOneofCase factory => _factory_type.RequireValue(); + public string dynamic_type => ExceptionAssert.NotNull(_dynamic_type); public Mode mode { get { @@ -192,7 +194,9 @@ namespace mbts.spark { return false; } - public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj); + public override bool Equals(object? obj) => + EqualityComparer.equals_obj(this, obj); + public override int GetHashCode() { int hash, phase_mult; switch (mode) { diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs b/src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs index f14c7701f..831b01d4d 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoPersistedKey.cs @@ -8,7 +8,7 @@ namespace bts.persist.algo { [ProtoContract] public readonly struct AlgoPersistedKey : IEquatable { [ProtoMember(1)] - readonly string _id_string; + readonly string? _id_string; [ProtoMember(2)] readonly uint? _id_uint; @@ -56,7 +56,7 @@ namespace bts.persist.algo { return false; } - public override bool Equals(object obj) => + public override bool Equals(object? obj) => EqualityComparer.equals_obj(in this, obj); public override int GetHashCode() { diff --git a/src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs b/src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs index 7c826362d..c3e1c5a75 100644 --- a/src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs +++ b/src/cs/Bts.Spark.Api/Orders/AlgoTreeEnumerator.cs @@ -1,4 +1,5 @@ namespace Spark.Api.Orders { + using bts; using bts.api.orderman; using Google.Protobuf; @@ -15,7 +16,7 @@ namespace Spark.Api.Orders { static readonly IReadOnlyDictionary _algo_type_case_index; static readonly IReadOnlyDictionary _algo_type_case_descriptor_data; static readonly OneofDescriptor _oneof_desc = - CustomOrderDefinition.Descriptor.Oneofs.FirstOrDefault(fd => fd.Name == "custom"); + Log.notnull(CustomOrderDefinition.Descriptor.Oneofs.FirstOrDefault(fd => fd.Name == "custom")); static AlgoTreeEnumerator() { var algo_type_case_index = new Dictionary(); @@ -82,9 +83,9 @@ namespace Spark.Api.Orders { } } - public static IEnumerable<(OrderType type, string dyn, uint studio, uint spreader_sec)> enumerate_algo_structure( + public static IEnumerable<(OrderType type, string? dyn, uint studio, uint spreader_sec)> enumerate_algo_structure( CustomOrderDefinitionImmutable custom_defi) { - string dyn = null; + string? dyn = null; uint studio = 0, spreader_sec = 0; foreach (var cd in get_hierarchy(custom_defi.CloneToMutable())) { switch (cd.CustomCase) { @@ -146,7 +147,7 @@ namespace Spark.Api.Orders { dyn.OrderParams.GetOrAdd(kv.Key, k => new DynamicOrderParam()).AsOrderDef = child; } }, - def => def.Dynamic.OrderParams.TryGetValue(kv.Key, out DynamicOrderParam param) && + def => def.Dynamic.OrderParams.TryGetValue(kv.Key, out var param) && param.ValueCase == DynamicOrderParam.ValueOneofCase.AsOrderDef ? param.AsOrderDef : null, (def, child) => def.Dynamic.OrderParams.GetOrAdd( @@ -164,7 +165,7 @@ namespace Spark.Api.Orders { } public static IReadOnlyList get_child(OrderType algo_type) => - _algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? + _algo_type_case_descriptor_data.TryGetValue(algo_type, out var d) ? d.child_algo_data : Array.Empty(); } } diff --git a/src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs b/src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs index 7a90859aa..aac3f111c 100644 --- a/src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs +++ b/src/cs/Bts.Spark.Api/Orders/ChildAlgoNode.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Orders { using bts.api.orderman; @@ -8,16 +7,16 @@ namespace Spark.Api.Orders { public readonly struct ChildAlgoNode { public readonly string name; - public readonly Func get_child_from_impl; + public readonly Func get_child_from_impl; public readonly Action assign_child_to_impl; - public readonly Func get_child; + public readonly Func get_child; public readonly Action assign_child; public ChildAlgoNode( string name, - Func get_child_from_impl, + Func get_child_from_impl, Action assign_child_to_impl, - Func get_child, + Func get_child, Action assign_child ) { this.name = name; diff --git a/src/cs/Bts.Spark.Api/Orders/FillTuple.cs b/src/cs/Bts.Spark.Api/Orders/FillTuple.cs index 10e6ab127..e1feed897 100644 --- a/src/cs/Bts.Spark.Api/Orders/FillTuple.cs +++ b/src/cs/Bts.Spark.Api/Orders/FillTuple.cs @@ -68,13 +68,13 @@ namespace mbts.spark { public bool is_aggressor => fill.FillAggressorFlag == FillAggressorFlag.Aggressor; - public bool Equals(FillTuple other) => + public bool Equals(FillTuple? other) => other != null && _order_tuple.Equals(other._order_tuple) && security.HasValue == other.security.HasValue && fill.Equals(other.fill); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => Equals(obj as FillTuple); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs b/src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs index 4e4868640..480c856ea 100644 --- a/src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs +++ b/src/cs/Bts.Spark.Api/Orders/ManualFillTuple.cs @@ -29,7 +29,7 @@ namespace bts { EqualityComparer.nullable_equals(account, other.account) && EqualityComparer.nullable_equals(user, other.user); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is ManualFillTuple other && Equals(other); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs b/src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs index 080cd35f2..021f0f86e 100644 --- a/src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs +++ b/src/cs/Bts.Spark.Api/Orders/OrderCollectionSummarizer.cs @@ -10,7 +10,7 @@ namespace Spark.Api.Orders { double best_price, double best_price_volume, double total_volume, - Func fmt_qty = null) => + Func? fmt_qty = null) => order_collection_summary( best_price, best_price_volume, @@ -23,7 +23,7 @@ namespace Spark.Api.Orders { double best_price_volume, double total_volume, ContractSpecificationImmutable spec, - Func fmt_qty = null) { + Func? fmt_qty = null) { if (total_volume == 0) return string.Empty; fmt_qty ??= v => v.ToString(); diff --git a/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs b/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs index d0bc6c432..c71415f14 100644 --- a/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs +++ b/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs @@ -24,16 +24,16 @@ using OrderState = bts.api.orderman.OrderState; namespace mbts.spark.utilities { public readonly struct ChildAlgoData { public readonly string name; - public readonly Func get_child_from_impl; + public readonly Func get_child_from_impl; public readonly Action assign_child_to_impl; - public readonly Func get_child; + public readonly Func get_child; public readonly Action assign_child; public ChildAlgoData( string name, - Func get_child_from_impl, + Func get_child_from_impl, Action assign_child_to_impl, - Func get_child, + Func get_child, Action assign_child) { // this.name = name; @@ -64,7 +64,7 @@ namespace mbts.spark.utilities { const string _primary_child_field = "child"; // algo-type-case maps // Note: obv this will break if we change the name of the 'CustomOneofCase' field - static readonly OneofDescriptor _oneof_desc = CustomOrderDefinition.Descriptor.Oneofs.FirstOrDefault(fd => fd.Name == "custom"); + static readonly OneofDescriptor _oneof_desc = CustomOrderDefinition.Descriptor.Oneofs.First(fd => fd.Name == "custom"); static readonly IReadOnlyDictionary _algo_type_case_index; static readonly IReadOnlyDictionary _algo_type_case_descriptor_data; @@ -110,8 +110,8 @@ namespace mbts.spark.utilities { throw new ArgumentException( $"Failed to find descriptor data for algo type '{algo_type}'", nameof(algo_type)); - public static IEnumerable<(CustomOrderDefinition.CustomOneofCase type, string dyn, uint studio, uint spreader_sec)> enumerate_algo_structure(CustomOrderDefinitionImmutable custom_defi) { - string dyn = null; + public static IEnumerable<(CustomOrderDefinition.CustomOneofCase type, string? dyn, uint studio, uint spreader_sec)> enumerate_algo_structure(CustomOrderDefinitionImmutable custom_defi) { + string? dyn = null; uint studio = 0, spreader_sec = 0; foreach (var cd in enumerate_algo_hierarchy(custom_defi.CloneToMutable())) { switch (cd.CustomCase) { @@ -206,7 +206,7 @@ namespace mbts.spark.utilities { } public static IReadOnlyList get_child_algo_data(CustomOrderDefinition.CustomOneofCase algo_type) => - _algo_type_case_descriptor_data.TryGetValue(algo_type, out AlgoTypeCaseDescriptorData d) ? d.child_algo_data : Array.Empty(); + _algo_type_case_descriptor_data.GetValueOrDefault(algo_type)?.child_algo_data ?? Array.Empty(); #endregion public static string abbreviate_algo_type(CustomOrderDefinition.CustomOneofCase algo_type) { @@ -289,10 +289,10 @@ namespace mbts.spark.utilities { }; public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray(); - public static void copy_values(CustomOrderDefinitionImmutable source, ref CustomOrderDefinition target) => + public static void copy_values(CustomOrderDefinitionImmutable source, ref CustomOrderDefinition? target) => copy_values(source.CloneToMutable(), ref target); - public static void copy_values(CustomOrderDefinition source, ref CustomOrderDefinition target) { + public static void copy_values(CustomOrderDefinition? source, ref CustomOrderDefinition? target) { if (source == null || target == null || source.CustomCase != target.CustomCase) return; var desc_data = _algo_type_case_descriptor_data[source.CustomCase]; @@ -314,8 +314,7 @@ namespace mbts.spark.utilities { public static void setup_generic_custom_order( CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) { - var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(), - BindingFlags.Instance | BindingFlags.Public); + var prop = ExceptionAssert.NotNull(typeof(CustomOrderDefinition).GetProperty(type.ToString(), BindingFlags.Instance | BindingFlags.Public)); var rt = prop.PropertyType; var rtt = Activator.CreateInstance(rt); diff --git a/src/cs/Bts.Spark.Api/Orders/OrdersClient.cs b/src/cs/Bts.Spark.Api/Orders/OrdersClient.cs index 2dad35af1..565a22abd 100644 --- a/src/cs/Bts.Spark.Api/Orders/OrdersClient.cs +++ b/src/cs/Bts.Spark.Api/Orders/OrdersClient.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Orders { using bts; diff --git a/src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs b/src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs index 32ff61188..aaeaf16c5 100644 --- a/src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs +++ b/src/cs/Bts.Spark.Api/Orders/OrdersExtensions.cs @@ -226,7 +226,7 @@ namespace Spark.Api.Orders { public static string display_name( this OrderRecordImmutable order, AlgoData? algo, SecurityImmutable? security = null) { if (order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader && security.HasValue) - return security.Value.ToString(); + return security.Value.ToString() ?? string.Empty; if (algo.HasValue) { return algo.Value.name; } else if (order.HasDef && order.Def.HasCustomDef) { @@ -321,7 +321,7 @@ namespace Spark.Api.Orders { return sb.ToString(); } - public static string update_description( + public static string? update_description( OrderRecordImmutable order, double? new_price = null, double? new_quantity = null, @@ -442,7 +442,8 @@ namespace Spark.Api.Orders { void impl(StringBuilder sb, CustomOrderDefinition mdef) { sb.Append(abbreviate(mdef.CustomCase)); foreach (var cad in AlgoTreeEnumerator.get_child(def.CloneToMutable())) { - var child = cad.get_child(mdef); + var child = cad.get_child(mdef) + ?? throw new Exception($"Failed to get algo child '{mdef.CustomCase}.{cad.name}'"); sb.Append(".["); impl(sb, child); sb.Append("]"); @@ -455,7 +456,7 @@ namespace Spark.Api.Orders { .ToDictionary(kv => Enum.Parse(kv.Key), kv => kv.Value); public static string abbreviate(this CustomOrderDefinition.CustomOneofCase type) => - _abbreviated_exchange_types.TryGetValue(type, out string result) ? result : type.ToString(); + _abbreviated_exchange_types.TryGetValue(type, out var result) ? result : type.ToString(); public static string abbreviate_algo_type(this CustomOrderDefinition.CustomOneofCase algo_type) { switch (algo_type) { diff --git a/src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs b/src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs index 8bb6dfd75..6d19bb0aa 100644 --- a/src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs +++ b/src/cs/Bts.Spark.Api/Position/DayFillsDataSource.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Trading { using bts; using bts.api.core; @@ -28,7 +27,7 @@ namespace Spark.Trading { ISecurityResolver sec_resolver) => // join pnl data w/ security and user pnl_data_source - .Select(d => d.day_trades + .Select(d => (d.day_trades ?? []) .Select(DayFillsRowData.from_trade) .ToDictionary(DayFillsRowData.key_fn)) .Table(DayFillsRowData.key_fn) @@ -37,8 +36,8 @@ namespace Spark.Trading { .LeftJoin( inverse_users, DayFillsRowData.key_fn, - user => user.name, - row_data => row_data.user_name, + user => user.name ?? string.Empty, + row_data => row_data.user_name ?? string.Empty, (row_data, row_key, user, user_name) => new DayFillsRowData( row_data.trade, row_data.security, user.id), (row_data, row_key, user_name) => row_data, diff --git a/src/cs/Bts.Spark.Api/Position/PNLData.cs b/src/cs/Bts.Spark.Api/Position/PNLData.cs index 1e0abcef1..daa59bef7 100644 --- a/src/cs/Bts.Spark.Api/Position/PNLData.cs +++ b/src/cs/Bts.Spark.Api/Position/PNLData.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; - namespace mbts.analytics { public class PNLData { // keyed on account, sec - internal IEnumerable position_data { get; init; } + internal IEnumerable? position_data { get; init; } // List of day trades - internal IEnumerable day_trades { get; init; } + internal IEnumerable? day_trades { get; init; } } } diff --git a/src/cs/Bts.Spark.Api/Position/PNLRowData.cs b/src/cs/Bts.Spark.Api/Position/PNLRowData.cs index c603b74a4..7a100ebe5 100644 --- a/src/cs/Bts.Spark.Api/Position/PNLRowData.cs +++ b/src/cs/Bts.Spark.Api/Position/PNLRowData.cs @@ -38,7 +38,7 @@ namespace bts.shell.pnl { public readonly SecurityImmutable? security; public readonly QuantityConversionData qty_conversion; public readonly uint account_id; - public readonly string account_name; + public readonly string? account_name; public readonly PNLCalculationType calc_type; public readonly PositionPriceSizeWithGreeks sod; public readonly PositionPriceSizeWithGreeks day; @@ -67,7 +67,7 @@ namespace bts.shell.pnl { WorkingOrderData? working = null, SecurityImmutable? security = null, uint account_id = 0, - string account_name = null, + string? account_name = null, PNLCalculationType calc_type = PNLCalculationType.Mid, QuantityConversionData? qty_conversion = null) { // @@ -89,7 +89,7 @@ namespace bts.shell.pnl { this.qty_conversion = qty_conversion ?? new(); } - public AccountTuple account => new(account_id, account_name); + public AccountTuple account => new(account_id, account_name ?? string.Empty); public string symbol => security?.pnl_symbol() ?? string.Empty; public ExpirationDate expiration => security?.normal_expirations()?.MinOrDefault(ExpirationDate.None) ?? ExpirationDate.None; @@ -237,7 +237,7 @@ namespace bts.shell.pnl { public PNLRowData with( SecurityImmutable? security = null, uint? account_id = null, - string account_name = null, + string? account_name = null, WorkingOrderData? working = null, PNLCalculationType? calc_type = null, double? bid_price = null, @@ -285,7 +285,7 @@ namespace bts.shell.pnl { working.summary == other.working.summary && qty_conversion == other.qty_conversion; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is PNLRowData other && Equals(other); // assuming callers will not combine different values with the same key, diff --git a/src/cs/Bts.Spark.Api/Position/PositionModel.cs b/src/cs/Bts.Spark.Api/Position/PositionModel.cs index c7e72a1c3..01577003e 100644 --- a/src/cs/Bts.Spark.Api/Position/PositionModel.cs +++ b/src/cs/Bts.Spark.Api/Position/PositionModel.cs @@ -75,7 +75,7 @@ namespace Spark.Trading { DayFillsDataSource.create(users, pnlDataSource, sec_resolver).Cache().ToObservable()); pnl = pnlDataSource - .Select(d => d.position_data.ToDictionary(u => u.id(), PNLRowData.from_pnl_unit)) + .Select(d => d.position_data?.ToDictionary(u => u.id(), PNLRowData.from_pnl_unit) ?? []) .Table(PNLRowData.key_fn) .LeftJoin( mdClient.Books(), diff --git a/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs b/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs index 0cb435fed..1cee75439 100644 --- a/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs +++ b/src/cs/Bts.Spark.Api/Reactive/SecurityResolver.cs @@ -6,6 +6,7 @@ using bts.collections; using bts.md; using Spark.Api.MarketData; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; @@ -22,8 +23,8 @@ using security_key = System.UInt32; namespace Spark.Api.Reactive { public class SecurityResolver : ISecurityResolver, IDisposable { readonly MarketDataRelay _md; - IDisposable _dispose; - IReadOnlyDictionary _live_securities; + IDisposable? _dispose; + IReadOnlyDictionary? _live_securities; readonly ConcurrentDictionary _cache = new ConcurrentDictionary(); readonly Subject> _cache_subject = new Subject>(); @@ -40,7 +41,7 @@ namespace Spark.Api.Reactive { IObservable> on_securities; - SecurityImmutable? try_get_local(security_key key, IReadOnlyDictionary live = null) { + SecurityImmutable? try_get_local(security_key key, IReadOnlyDictionary? live = null) { // Try live securities first live = live ?? _live_securities; if (live != null) { @@ -57,7 +58,7 @@ namespace Spark.Api.Reactive { return null; } - async Task get_security(security_key key, IReadOnlyDictionary live) { + async Task get_security(security_key key, IReadOnlyDictionary? live) { var local_sec = try_get_local(key, live); if (local_sec.HasValue) { return local_sec; @@ -80,7 +81,7 @@ namespace Spark.Api.Reactive { return null; } - async Task> get_securities(IEnumerable keys, IReadOnlyDictionary live) { + async Task> get_securities(IEnumerable keys, IReadOnlyDictionary? live) { var result = new Dictionary(); var missing = new SecurityKeyList(); foreach (var key in keys) { @@ -190,7 +191,7 @@ namespace Spark.Api.Reactive { var state = ImmutableDictionary.Empty; var gate = new object(); // We get thie function from the first source update - Func<(SecurityImmutable?, T t), TKey> rowkeyfn = null; + Func<(SecurityImmutable?, T t), TKey>? rowkeyfn = null; void on_securities_updated(object ambiguous) { if (rowkeyfn == null) return; @@ -283,7 +284,7 @@ namespace Spark.Api.Reactive { join( source, get_sec_key, - t => (t.Index.Values, t.AddedItems, t.Changes, t.RemovedItems, t.KeySelector), + t => (t.Index.Values, t.AddedItems, t.Changes, t.RemovedItems, ExceptionAssert.NotNull(t.KeySelector)), (state, added, changes, removed, key) => new TableUpdate<(SecurityImmutable?, T), TKey>( state, added, changes, removed, key)); diff --git a/src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs b/src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs index a6316a01d..a29d09ff1 100644 --- a/src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs +++ b/src/cs/Bts.Spark.Api/Services/CachedServiceProvider.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Services; using bts.api.core; diff --git a/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs b/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs index 0959d925f..60de348e1 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkApiServices.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Services; using bts; diff --git a/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs b/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs index cbeb114fc..7145f31f8 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkCredentials.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Services; public class SparkCredentials { diff --git a/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs b/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs index 51ead0afc..b6a1ed477 100644 --- a/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs +++ b/src/cs/Bts.Spark.Api/Services/SparkLoginService.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Services; using bts; diff --git a/src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs b/src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs index 9e8e213f9..fdb4c8725 100644 --- a/src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs +++ b/src/cs/Bts.Spark.Api/Services/UserDataPermissions.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Api.Services; using bts; diff --git a/src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs b/src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs index fdc18ed0c..ef207fa15 100644 --- a/src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs +++ b/src/cs/Bts.Spark.Api/api/ApiNativeMethods.cs @@ -11,7 +11,7 @@ namespace bts.api.core { static class ApiNativeMethods { [DllImport("libspark")] - internal static extern IntPtr api_create_quickbus(byte[] qbconfig, long length); + internal static extern IntPtr api_create_quickbus(byte[]? qbconfig, long length); [DllImport("libspark")] internal static extern void api_destroy_quickbus(IntPtr qbus); @@ -64,7 +64,7 @@ namespace bts.api.core { internal static extern void api_client_send(IntPtr nchannel, byte[] buffer, int length, raw_pb_callback p, IntPtr extra); [DllImport("libspark")] - internal static extern IntPtr api_client_subscribe(IntPtr client, string method, string qualifier, raw_subscription_callback cb, IntPtr extra); + internal static extern IntPtr api_client_subscribe(IntPtr client, string method, string? qualifier, raw_subscription_callback cb, IntPtr extra); [DllImport("libspark")] internal static extern void api_client_unsubscribe(IntPtr client, IntPtr subscription); diff --git a/src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs b/src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs index cf87e1284..bd2c00cfd 100644 --- a/src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs +++ b/src/cs/Bts.Spark.Api/api/Channels/QuickBusClientChannel.cs @@ -1,17 +1,12 @@ -using Google.Protobuf.WellKnownTypes; -using Google.Protobuf; +using Google.Protobuf; + using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Reactive.Linq; using System.IO; -using System.Reactive.Disposables; -using mbts; -using System.Threading; +using System.Reactive.Linq; using System.Runtime.InteropServices; - +using System.Threading.Tasks; +using System.Threading; namespace bts.api.core { @@ -69,7 +64,7 @@ namespace bts.api.core { }); } - public override IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter) { + public override IObservable> subscribe(int method_id, string method, string? qualifier, MessageParser parser, Func? converter) { var result = Observable.Create>(async observer => { IntPtr temp_subscription = IntPtr.Zero; void unsubscribe_temp_sub() { @@ -79,7 +74,7 @@ namespace bts.api.core { // 'tcs' and 'temp_callback' are defined in the same scope as 'temp_subscription' // (rather than in the 'while loop' scope) to prevent premature garbage collection - TaskCompletionSource tcs = null; + TaskCompletionSource? tcs = null; ApiNativeMethods.raw_subscription_callback temp_callback = (event_type, changes, change_count, unused) => { tcs?.TrySetResult(true); @@ -115,21 +110,23 @@ namespace bts.api.core { // is disposed GC.KeepAlive(temp_callback); GC.KeepAlive(tcs); - return SubscribeNative(method, qualifier, parser, converter, observer); + return subscribeNative(method, qualifier, parser, converter, observer); }); Log.QBus.diag($"Subscribing for sub: '{method}/{qualifier}'"); return result; } - private Task> check_stream_access(int method_id, string qualifier) { + private Task> check_stream_access(int method_id, string? qualifier) { var request = new StreamAccessRequest() { Qualifier = qualifier ?? "" }; return send(method_id, request); } - private unsafe IDisposable SubscribeNative(string method, string qualifier, MessageParser parser, Func converter, IObserver> observer) where TParse : IMessage { + unsafe IDisposable subscribeNative( + string method, string? qualifier, MessageParser parser, Func? converter, IObserver> observer) where TParse : IMessage { + converter ??= p => (TOut)(object)p; bool first_update = true; // Memory optimization. There is only one update per subscription. RawUpdate the_update = new RawUpdate(); - ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + ApiNativeMethods.raw_subscription_callback? cb = (event_type, changes, change_count, unused) => { the_update.Clear(); try { if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { @@ -177,7 +174,8 @@ namespace bts.api.core { } private class FinalizeableAnonymousDisposable : IDisposable { - private Action _action; + Action? _action; + public FinalizeableAnonymousDisposable(Action dispose) { _action = dispose; } diff --git a/src/cs/Bts.Spark.Api/api/ClientChannel.cs b/src/cs/Bts.Spark.Api/api/ClientChannel.cs index 9624c9b93..d0312d93a 100644 --- a/src/cs/Bts.Spark.Api/api/ClientChannel.cs +++ b/src/cs/Bts.Spark.Api/api/ClientChannel.cs @@ -13,7 +13,9 @@ namespace bts.api.core { public abstract void Dispose(); public abstract Task> send(int method_id, Request request) where Request: IImmutableMessage where Response : class,IMessage,new(); - public abstract IObservable> subscribe(int method_id, string method, string qualifier, MessageParser parser, Func converter=null) + + public abstract IObservable> subscribe( + int method_id, string method, string? qualifier, MessageParser parser, Func? converter = null) where TParse : IMessage; public abstract bool is_sync_call_ok(); diff --git a/src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs b/src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs index 0bdadf6f1..011c46b01 100644 --- a/src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs +++ b/src/cs/Bts.Spark.Api/api/ManagedQuickbusWrapper.cs @@ -1,4 +1,3 @@ -#nullable enable namespace Spark.Core; using bts.api.core; diff --git a/src/cs/Bts.Spark.Api/api/Result.cs b/src/cs/Bts.Spark.Api/api/Result.cs index 5680ffaed..a4060b909 100644 --- a/src/cs/Bts.Spark.Api/api/Result.cs +++ b/src/cs/Bts.Spark.Api/api/Result.cs @@ -2,7 +2,7 @@ namespace bts.api.core { public readonly struct Result { - readonly T _result; + readonly T? _result; public Result(T v) { _result = v; @@ -15,17 +15,10 @@ namespace bts.api.core { _result = default; } - public T value { - get { - if (success) { - return _result; - } - if (typeof(T).IsValueType) { - throw new ApiException(error_message); - } - return default; - } - } + public T value => + success + ? _result ?? throw new ApiException("Response code is Success but value is null") + : throw new ApiException(error_message); public bool success => code == ApiError.Success; @@ -43,7 +36,6 @@ namespace bts.api.core { _ => "Unknown error", }; - public override string ToString() => error_message.is_null_or_empty() ? code.ToString() : $"{code}: {error_message}"; } diff --git a/src/cs/Bts.Spark.Api/api/ServerChannel.cs b/src/cs/Bts.Spark.Api/api/ServerChannel.cs index a16c3d4b4..8884960fd 100644 --- a/src/cs/Bts.Spark.Api/api/ServerChannel.cs +++ b/src/cs/Bts.Spark.Api/api/ServerChannel.cs @@ -32,10 +32,10 @@ namespace bts.api.core { public void dispatch(RequestHeader header, Stream request, Action on_response) { on_request?.Invoke(header, request, on_response); } - public Action> on_request; + public Action>? on_request; - public IntPtr create_table(string method, string qualifier) { - return ApiNativeMethods.api_server_create_table(_server, method, qualifier); + public IntPtr create_table(string method, string? qualifier) { + return ApiNativeMethods.api_server_create_table(_server, method, qualifier ?? string.Empty); } public void Dispose() { diff --git a/src/cs/Bts.Spark.Api/api/ServiceContext.cs b/src/cs/Bts.Spark.Api/api/ServiceContext.cs index 9e37f34e9..841792f5c 100644 --- a/src/cs/Bts.Spark.Api/api/ServiceContext.cs +++ b/src/cs/Bts.Spark.Api/api/ServiceContext.cs @@ -1,5 +1,4 @@ -#nullable enable -namespace bts.api.core { +namespace bts.api.core { using bts.api.user; using System; @@ -87,8 +86,8 @@ namespace bts.api.core { var auth_service = locate(); var result = await auth_service.authenticate_login_async( new AuthenticateLoginRequest() { - Login = username ?? string.Empty, - Password = password ?? string.Empty + Login = username, + Password = password, }); if (result.success) { if (result.value.IsValid) { @@ -132,7 +131,7 @@ namespace bts.api.core { } } - internal ServerChannel publish(T service, string service_type, string qualifier) where T : IApiServer { + internal ServerChannel publish(T service, string service_type, string? qualifier) where T : IApiServer { var ch = new ServerChannel(this, service_type, qualifier ?? ""); ch.on_request += service.dispatch; return ch; diff --git a/src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs b/src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs index 850d64f28..8676788fc 100644 --- a/src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs +++ b/src/cs/Bts.Spark.Api/data/DisplayQuantityMultiplier.cs @@ -1,7 +1,5 @@ namespace Spark.Api.Data; -using mbts.ui; - using System; using System.Collections.Generic; using System.Numerics; @@ -13,9 +11,9 @@ public class DisplayQuantityMultiplier : IDisplayTranslator where T : stru QuantityConversionData _conversion_data; public DisplayQuantityMultiplier( - Func, T, T> to_display, - Func, T, T> from_display, - IEqualityComparer comparer = null, + Func, T, T>? to_display, + Func, T, T>? from_display, + IEqualityComparer? comparer = null, T actual_value = default, QuantityConversionData conversion_data = default) { // @@ -26,7 +24,7 @@ public class DisplayQuantityMultiplier : IDisplayTranslator where T : stru _conversion_data = conversion_data; } - public event Action value_changed; + public event Action? value_changed; public T actual_value { get => _actual_value; @@ -58,7 +56,7 @@ public class OptionalDisplayQuantityMultiplier : IDisplayTranslator where T? _actual_value; QuantityConversionData _conversion_data; - public event Action value_changed; + public event Action? value_changed; public T? actual_value { get => _actual_value; diff --git a/src/cs/Bts.Spark.Api/data/ExpirationDate.cs b/src/cs/Bts.Spark.Api/data/ExpirationDate.cs index 84492017c..c62f8649a 100644 --- a/src/cs/Bts.Spark.Api/data/ExpirationDate.cs +++ b/src/cs/Bts.Spark.Api/data/ExpirationDate.cs @@ -36,7 +36,7 @@ public readonly struct ExpirationDate : IEquatable, IComparable< public bool Equals(ExpirationDate other) => Value == other.Value && Type == other.Type; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is ExpirationDate other && Equals(other); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/data/QuantityConversionData.cs b/src/cs/Bts.Spark.Api/data/QuantityConversionData.cs index 83ba67e95..657c7b427 100644 --- a/src/cs/Bts.Spark.Api/data/QuantityConversionData.cs +++ b/src/cs/Bts.Spark.Api/data/QuantityConversionData.cs @@ -29,7 +29,7 @@ public readonly struct QuantityConversionData : IEquatable + public override bool Equals(object? obj) => obj is QuantityConversionData other && Equals(other); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/data/UserTuple.cs b/src/cs/Bts.Spark.Api/data/UserTuple.cs index c51bb9dc4..c0131b1b6 100644 --- a/src/cs/Bts.Spark.Api/data/UserTuple.cs +++ b/src/cs/Bts.Spark.Api/data/UserTuple.cs @@ -1,25 +1,16 @@ using System; namespace bts { - public readonly struct UserTuple : IEquatable, IComparable, IComparable { + public readonly record struct UserTuple( + uint id = 0, + string name = "", + UserTuple.Permissions permissions = UserTuple.Permissions.Regular + ) : IComparable, IComparable { const string _admin_name = "bts"; public static readonly Func key_fn = u => u.id; public static UserTuple admin => new UserTuple(0, _admin_name, Permissions.Admin); - public readonly uint id; - public readonly string name; - public readonly Permissions permissions; - - public UserTuple(uint id, string name) - : this(id, name, name == _admin_name ? Permissions.Admin : Permissions.Regular) { } - - public UserTuple(uint id, string name, Permissions permissions) { - this.id = id; - this.name = name; - this.permissions = permissions; - } - public enum Permissions { Regular, Admin @@ -32,16 +23,13 @@ namespace bts { return comp == 0 ? id.CompareTo(other.id) : comp; } - int IComparable.CompareTo(object obj) => + int IComparable.CompareTo(object? obj) => obj is UserTuple other ? CompareTo(other) : 1; - public bool Equals(UserTuple other) => other.id == id && other.name == name; - public override bool Equals(object obj) => obj is UserTuple other && Equals(other); public override int GetHashCode() => id.GetHashCode(); - public override string ToString() => name; - public static bool operator ==(UserTuple a, UserTuple b) => a.Equals(b); - public static bool operator !=(UserTuple a, UserTuple b) => !a.Equals(b); + public override string ToString() => + name ?? string.Empty; } public static class UserTupleExtensions { diff --git a/src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs b/src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs index fd9f8993c..cd9ddcc5f 100644 --- a/src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs +++ b/src/cs/Bts.Spark.Api/data/ticks/RegionalTickFactors.cs @@ -1,25 +1,30 @@ using bts.utils; using ProtoBuf; + +using Spark.Core.Collections; +using Spark.Core.Diagnostics; + using System; using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; namespace mbts.user.settings { [ProtoContract] public class RegionalTickFactors : IEquatable { [ProtoMember(1)] - readonly TickFactors _low_tick; + readonly TickFactors? _low_tick; [ProtoMember(2)] - readonly TickFactors _high_tick; + readonly TickFactors? _high_tick; [ProtoMember(3), DefaultValue(double.NaN)] readonly double _low_tick_inclusive_end; public RegionalTickFactors() : this(new TickFactors(), new TickFactors(), double.MinValue) { } - public RegionalTickFactors(TickFactors tick) + public RegionalTickFactors(TickFactors? tick) : this(tick, tick, double.PositiveInfinity) { } - public RegionalTickFactors(TickFactors low_tick, TickFactors high_tick, double low_tick_inclusive_end) { + public RegionalTickFactors(TickFactors? low_tick, TickFactors? high_tick, double low_tick_inclusive_end) { _low_tick = low_tick; _high_tick = high_tick; _low_tick_inclusive_end = low_tick_inclusive_end; @@ -28,17 +33,25 @@ namespace mbts.user.settings { public static RegionalTickFactors Default => new(new(10000, 1), new(10000, 1), double.MaxValue); - public TickFactors low_tick => _low_tick; - public TickFactors high_tick => _high_tick; + public TickFactors? low_tick => _low_tick; + public TickFactors? high_tick => _high_tick; public double low_tick_inclusive_end => _low_tick_inclusive_end; - public bool Equals(RegionalTickFactors other) => + [MemberNotNull(nameof(low_tick))] + public TickFactors RequireLowTick() => + ExceptionAssert.MemberNotNull(low_tick); + + [MemberNotNull(nameof(high_tick))] + public TickFactors RequireHighTick() => + ExceptionAssert.MemberNotNull(high_tick); + + public bool Equals(RegionalTickFactors? other) => other != null && - other._low_tick == _low_tick && - other._high_tick == _high_tick && + NullCheckEqualityComparer.Equals(other._low_tick, _low_tick) && + NullCheckEqualityComparer.Equals(other._high_tick, _high_tick) && MathUtils.epsilon_equals(other._low_tick_inclusive_end, _low_tick_inclusive_end); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => Equals(obj as RegionalTickFactors); public override int GetHashCode() { @@ -53,12 +66,16 @@ namespace mbts.user.settings { x_not_null._high_tick == y_not_null._high_tick && x_not_null._low_tick_inclusive_end == y_not_null._low_tick_inclusive_end; - public static bool operator ==(RegionalTickFactors x, RegionalTickFactors y) { - if ((object)x == null) return (object)y == null; - if ((object)y == null) return false; + public static bool operator ==(RegionalTickFactors? x, RegionalTickFactors? y) { + if (x is null) { + return y is null; + } + if (y is null) { + return false; + } return _equals(x, y); } - public static bool operator !=(RegionalTickFactors x, RegionalTickFactors y) => !(x == y); + public static bool operator !=(RegionalTickFactors? x, RegionalTickFactors? y) => !(x == y); } } diff --git a/src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs b/src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs index 18a996471..3c3d07d04 100644 --- a/src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs +++ b/src/cs/Bts.Spark.Api/data/ticks/TickExtensions.cs @@ -7,6 +7,7 @@ namespace mbts { using mbts.user.settings; using Spark.Core; + using Spark.Core.Diagnostics; using Spark.Core.Math; using System; @@ -15,7 +16,7 @@ namespace mbts { using System.Numerics; public static class TickExtensions { - static string _nan_text => TickDisplaySettings.Default.nan_text; + static string _nan_text => TickDisplaySettings.Default.nan_text ?? string.Empty; public static TickFactors to_tick_factors( this bts.api.domain.TickFactorsImmutable api_tick_factors) => @@ -68,7 +69,7 @@ namespace mbts { } public static bool is_valid(this RegionalTickFactors regional_tick) => - regional_tick.low_tick.is_valid() && regional_tick.high_tick.is_valid(); + (regional_tick.low_tick?.is_valid() ?? false) && (regional_tick.high_tick?.is_valid() ?? false); public static bool is_integer(this TickFactors tick) { if (tick.tick_unit == tick.tick_base) { @@ -81,7 +82,7 @@ namespace mbts { return false; } - public static TickFactors tick_factors(this RegionalTickFactors regional_tick, double value) => + public static TickFactors? tick_factors(this RegionalTickFactors regional_tick, double value) => value > regional_tick.low_tick_inclusive_end ? regional_tick.high_tick : regional_tick.low_tick; @@ -143,7 +144,7 @@ namespace mbts { (a, b) => tick_equals(tick, a, b, rounding_mode), x => (int)MathUtils.round_fractional_units(x, tick.tick_unit_frac(), rounding_mode)); - public static TickFactors get_tick_for(this RegionalTickFactors rtick, double value) => + public static TickFactors? get_tick_for(this RegionalTickFactors rtick, double value) => value > rtick.low_tick_inclusive_end ? rtick.high_tick : rtick.low_tick; public static string format_without_decimal_part(this TickFactors tick, double value) => @@ -162,23 +163,25 @@ namespace mbts { public static string format(this TickDisplaySettings settings, T value) where T : IFloatingPointIeee754 => - format(settings.tick_factors, value, settings); + settings.tick_factors?.format(value, settings) + ?? value.ToString() + ?? string.Empty; public static string format( this bts.api.domain.TickDisplaySettingsImmutable settings, T value) where T : IFloatingPointIeee754 => settings.to_tick_display_settings().format(value); - public static string format(this TickFactors tick, T value, TickDisplaySettings settings) + public static string format(this TickFactors tick, T value, TickDisplaySettings? settings) where T : IFloatingPoint { if (settings is null) { settings = TickDisplaySettings.Default; } if (T.IsNaN(value)) { - return settings.nan_text; + return settings.nan_text ?? string.Empty; } if (T.IsInfinity(value)) { - return value.ToString(); + return value.ToString() ?? string.Empty; } return _format_tick(tick, value, settings); } @@ -192,8 +195,10 @@ namespace mbts { bool show_decimal_part = true ) where T : IFloatingPointIeee754 { var value_d = NumericCastConverter.convert(value); - return regional_tick.tick_factors(value_d) - .format(value, display_multiplier, show_commas, nan_text, show_decimal_part); + var tick = regional_tick.tick_factors(value_d); + return tick?.format(value, display_multiplier, show_commas, nan_text, show_decimal_part) + ?? value.ToString() + ?? string.Empty; } public static string format( @@ -212,25 +217,23 @@ namespace mbts { nan_text: nan_text, show_decimal_part: show_decimal_part)); - public static string format_without_decimal_part(this RegionalTickFactors regional_tick, double value) => - format_without_decimal_part( - value <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick : regional_tick.high_tick, - value); + public static string format_without_decimal_part(this RegionalTickFactors regional_tick, double value) { + var tick = get_tick_for(regional_tick, value); + return tick is null + ? value.ToString() ?? string.Empty + : format_without_decimal_part(tick, value); + } - public static string format(this RegionalTickFactors regional_tick, double value, TickDisplaySettings settings = null) => - format( - value <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick : regional_tick.high_tick, - value, - settings); + public static string format(this RegionalTickFactors regional_tick, double value, TickDisplaySettings? settings = null) => + regional_tick.tick_factors(value)?.format(value, settings) + ?? value.ToString() + ?? string.Empty; public static string format(this RegionalTickFactors regional_tick, double value, double display_multiplier, bool show_commas, string nan_text) => - format( - value <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick : regional_tick.high_tick, - value, - display_multiplier, - show_commas, nan_text); + regional_tick.tick_factors(value)?.format(value, display_multiplier, show_commas, nan_text) + ?? value.ToString() + ?? string.Empty; -#nullable enable public static string format(this TickDisplaySettingsTuple tick_disp_tup, double value) { if (tick_disp_tup.factors is null) { throw new ArgumentException($"{nameof(tick_disp_tup.factors)} is null", nameof(tick_disp_tup)); @@ -279,12 +282,17 @@ namespace mbts { } public static double parse(this TickDisplaySettings display_settings, string text) => - parse(display_settings.tick_factors, text, display_settings); + display_settings.tick_factors?.parse(text, display_settings) + ?? double.Parse(text); public static T parse(this TickDisplaySettings display_settings, string text) - where T : IFloatingPointIeee754 => - parse(display_settings.tick_factors, text, display_settings); -#nullable disable + where T : IFloatingPointIeee754 { + var tick = display_settings.tick_factors; + if (tick is null) { + return T.Parse(text, null); + } + return tick.parse(text, display_settings); + } public static double parse(this TickFactors tick, string text, TickDisplaySettings display_settings) => parse(tick, text, display_settings); @@ -405,18 +413,18 @@ namespace mbts { T tuf; T ltie = regional_tick.low_tick_inclusive_end.as_type(); if (input < ltie) { - tuf = regional_tick.low_tick.tick_unit_frac(); + tuf = regional_tick.RequireLowTick().tick_unit_frac(); var ieeer = T.Ieee754Remainder(input, tuf); input -= ieeer; if (ieeer < -precision) count--; val = input + tuf * count.as_type(); if (val > ltie) { count -= MathUtils.round_up((ltie - input) / tuf, precision).as_type(); - tuf = regional_tick.high_tick.tick_unit_frac(); + tuf = regional_tick.RequireHighTick().tick_unit_frac(); val = ltie + tuf * count.as_type(); } } else { - tuf = regional_tick.high_tick.tick_unit_frac(); + tuf = regional_tick.RequireHighTick().tick_unit_frac(); var ieeer = T.Ieee754Remainder(input, tuf); input -= ieeer; if (ieeer < -precision) count--; @@ -491,7 +499,7 @@ namespace mbts { T tuf; T low_tick_inclusive_end = TFromDouble.convert(regional_tick.low_tick_inclusive_end); if (input > low_tick_inclusive_end) { - tuf = regional_tick.high_tick.tick_unit_frac(); + tuf = regional_tick.RequireHighTick().tick_unit_frac(); var ieeer = T.Ieee754Remainder(input, tuf); input -= ieeer; if (ieeer > precision) count--; @@ -499,11 +507,11 @@ namespace mbts { if (val < low_tick_inclusive_end) { count -= TToUInt16.convert(MathUtils.round_up( (input - low_tick_inclusive_end) / tuf, precision)); - tuf = regional_tick.low_tick.tick_unit_frac(); + tuf = regional_tick.RequireLowTick().tick_unit_frac(); val = low_tick_inclusive_end - tuf * TFromDouble.convert(count); } } else { - tuf = regional_tick.low_tick.tick_unit_frac(); + tuf = regional_tick.RequireLowTick().tick_unit_frac(); var ieeer = T.Ieee754Remainder(input, tuf); input -= ieeer; if (ieeer > precision) count--; diff --git a/src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs b/src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs index 4d7abd197..86cd2c858 100644 --- a/src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs +++ b/src/cs/Bts.Spark.Api/data/ticks/TickFactors.cs @@ -37,12 +37,12 @@ public TickFactors Clone() => new(tick_base, tick_unit); - public bool Equals(TickFactors other) => + public bool Equals(TickFactors? other) => other is not null && tick_base.Equals(other.tick_base) && tick_unit.Equals(other.tick_unit); - public override bool Equals(object obj) => + public override bool Equals(object? obj) => Equals(obj as TickFactors); public override int GetHashCode() => @@ -55,10 +55,10 @@ object ICloneable.Clone() => Clone(); - public static bool operator ==(TickFactors x, TickFactors y) => + public static bool operator ==(TickFactors? x, TickFactors? y) => x.safe_equals(y); - public static bool operator !=(TickFactors x, TickFactors y) => + public static bool operator !=(TickFactors? x, TickFactors? y) => !(x == y); } } diff --git a/src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs b/src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs index b8185e3f5..191eee2ba 100644 --- a/src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs +++ b/src/cs/Bts.Spark.Api/data/ticks/TickFactorsFactory.cs @@ -31,10 +31,10 @@ namespace bts.data.ticks { _default_rtf; static RegionalTickFactors _create_rtf(SecurityImmutable? security) { - var meta = SecurityMetadataStore.instance.get(security.Value); + var meta = security.HasValue ? SecurityMetadataStore.instance.get(security.Value) : null; return meta?.PriceRules?.Any() ?? false ? _create_rtf(meta.Value.PriceRules.ToList()) : - _create_rtf(new SpecKey(security.Value.spec_or_default())); + _create_rtf(new SpecKey(security.spec_or_default())); } static RegionalTickFactors _create_rtf( @@ -93,7 +93,7 @@ namespace bts.data.ticks { /// The raw tick-size. /// The raw tick-base. /// Well-defined TickFactors - static TickFactors _try_create_tf(double tick_size, double tick_base, uint display_digits_override) { + static TickFactors? _try_create_tf(double tick_size, double tick_base, uint display_digits_override) { var tf = _try_create_tf(tick_size, tick_base); if (tf != null && display_digits_override > 0) { int display_digit_diff = (int)display_digits_override - tf.display_digits(); @@ -110,7 +110,7 @@ namespace bts.data.ticks { /// The raw tick-size. /// The smallest acceptable tick-base. /// Well-defined TickFactors - static TickFactors _try_create_tf(double tick_size, double reduced_target_base) { + static TickFactors? _try_create_tf(double tick_size, double reduced_target_base) { if (!_check_tick_size(tick_size)) return null; double raw_base = 1 / tick_size; @@ -163,7 +163,7 @@ namespace bts.data.ticks { high_tick == other.high_tick && price_break == other.price_break; - public override bool Equals(object obj) => + public override bool Equals(object? obj) => obj is SpecKey sk && Equals(sk); public override int GetHashCode() => diff --git a/src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs b/src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs index df081f58e..94b220786 100644 --- a/src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs +++ b/src/cs/Bts.Spark.Api/data/ticks/TickUtils.cs @@ -6,6 +6,7 @@ using bts.utils; using mbts.user.settings; using Spark.Core; +using Spark.Core.Diagnostics; using Spark.Core.Math; using System; @@ -19,7 +20,7 @@ namespace mbts.spark { const double _precision_const = 0.00000001; [ThreadStatic] - static TickFactorsFactory _exchange_ticks_backing; + static TickFactorsFactory? _exchange_ticks_backing; static TickFactorsFactory _exchange_ticks => _exchange_ticks_backing ?? (_exchange_ticks_backing = new TickFactorsFactory()); @@ -55,8 +56,8 @@ namespace mbts.spark { } public static double ticksize(this RegionalTickFactors rtick, double price) { - var low_tick = rtick.low_tick.tick_unit_frac(); - var high_tick = rtick.high_tick.tick_unit_frac(); + var low_tick = ExceptionAssert.NotNull(rtick.low_tick).tick_unit_frac(); + var high_tick = ExceptionAssert.NotNull(rtick.high_tick).tick_unit_frac(); var price_break = rtick.low_tick_inclusive_end; if (!low_tick.is_real_positive()) { return high_tick; @@ -74,10 +75,10 @@ namespace mbts.spark { _get(spec).format_without_decimal_part(price / spec.ticksize(price)) : _get(spec).format(price); - public static string format(this ContractSpecificationImmutable spec, double price, TickDisplaySettings settings = null) => + public static string format(this ContractSpecificationImmutable spec, double price, TickDisplaySettings? settings = null) => _get(spec).format(price, settings); - public static string format(this ContractSpecificationImmutable? spec, double price, TickDisplaySettings settings = null) => + public static string format(this ContractSpecificationImmutable? spec, double price, TickDisplaySettings? settings = null) => spec.spec_or_default().format(price, settings); public static string format(this ContractSpecificationImmutable spec, double price, double display_multiplier, bool show_commas, string nan_text) => @@ -136,9 +137,12 @@ namespace mbts.spark { } public static TickFactors deduce_ticks(IEnumerable securities) { - var ticks = new HashSet(securities.Select(_get).SelectMany(rtf => new[] { rtf.low_tick, rtf.high_tick })); + var ticks = securities.Select(_get) + .SelectMany(rtf => new[] { rtf.low_tick, rtf.high_tick }) + .ExceptNull() + .ToHashSet(); switch (ticks.Count) { - case 0: return _exchange_ticks.default_rtf.low_tick; + case 0: return ExceptionAssert.NotNull(_exchange_ticks.default_rtf.low_tick); case 1: return ticks.First(); default: double tick_base_lcm = MathUtils.lcm(ticks.Select(t => (int)t.tick_base)); @@ -148,7 +152,7 @@ namespace mbts.spark { } public static TickFactors tick_factors(this SecurityImmutable sec) => - _get(sec).low_tick; + ExceptionAssert.NotNull(_get(sec).low_tick); public static double tickup(this ContractSpecificationImmutable spec, double value) => _get(spec).tickup(value); @@ -242,9 +246,9 @@ namespace mbts.spark { public static long? count_ticks(this RegionalTickFactors rtick, double value, RoundingMode rounding_mode = RoundingMode.AbsDown) { var rounded_value = rtick.round_to_tick(value, rounding_mode); var n = _count_ticks( - rtick.low_tick.tick_unit_frac(), + rtick.RequireLowTick().tick_unit_frac(), rtick.low_tick_inclusive_end, - rtick.high_tick.tick_unit_frac(), + rtick.RequireHighTick().tick_unit_frac(), 0, rounded_value); return n; @@ -259,17 +263,20 @@ namespace mbts.spark { public static RegionalTickFactors get_regional_ticks(SecurityImmutable? security) => _exchange_ticks.get(security); - public static TickFactors get_tick(SecurityImmutable? security, double value) { + public static TickFactors? get_tick(SecurityImmutable? security, double value) { var rtick = get_regional_ticks(security); var tick = rtick.low_tick_inclusive_end > value ? rtick.high_tick : rtick.low_tick; return tick; } - public static RegionalTickFactors multiply_tick_size(RegionalTickFactors spec, uint factor) => - new( - new(spec.low_tick.tick_base, spec.low_tick.tick_unit * factor), - new(spec.high_tick.tick_base, spec.high_tick.tick_unit * factor), - spec.low_tick_inclusive_end); + public static RegionalTickFactors multiply_tick_size(RegionalTickFactors spec, uint factor) { + return new(Multiply(spec.low_tick), Multiply(spec.high_tick), spec.low_tick_inclusive_end); + + TickFactors? Multiply(TickFactors? tick) => + tick is null + ? null + : new(tick.tick_base, tick.tick_unit * factor); + } public static double normalize_price(RegionalTickFactors rtick, double price) { var maybe_ticks = rtick.count_ticks(price); diff --git a/src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs b/src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs index 8397cf006..8ed82e85c 100644 --- a/src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs +++ b/src/cs/Bts.Spark.Api/security/ExchangeSpecificUtilities.cs @@ -94,7 +94,7 @@ static class ExchangeSpecificUtilities{ bool ice_lots = is_ice_lots(security.Value), tas = is_tas(security.Value); return String.Format("{0}{1}{2}{3}{4}", - security?.Symbol, + security.Value.Symbol, ice_lots? " ICE Lots" : String.Empty, tas ? " TAS" : String.Empty, String.Compare(security.Value.Ice.HubAlias, _default_hub,true)==0 ? String.Empty : @@ -119,10 +119,13 @@ static class ExchangeSpecificUtilities{ return sec.Symbol; } - public static string format_security(SecurityImmutable? security){ - if(security?.HasIce == true) - return ICE.format_security(security); - return security?.ToString(); - } + public static string? format_security(SecurityImmutable? security) => + security.HasValue + ? format_security(security.Value) + : null; + public static string format_security(SecurityImmutable security) => + security.HasIce + ? ICE.format_security(security) + : security.ToString() ?? string.Empty; }} diff --git a/src/cs/Bts.Spark.Api/security/Security.cs b/src/cs/Bts.Spark.Api/security/Security.cs index d5df005b6..38ce477c9 100644 --- a/src/cs/Bts.Spark.Api/security/Security.cs +++ b/src/cs/Bts.Spark.Api/security/Security.cs @@ -1,8 +1,4 @@ -using mbts.spark; - -using Microsoft.VisualBasic; - -using System; +using System; using System.Collections.Generic; using System.Linq; @@ -92,13 +88,13 @@ namespace bts.api { } partial struct SecurityImmutable : IComparable, IComparable, IJsonFormatter { - public int CompareTo(object obj) => + public int CompareTo(object? obj) => obj is SecurityImmutable ? CompareTo((SecurityImmutable)obj) : -1; public int CompareTo(SecurityImmutable other) => SecurityComparer.compare(this, other); - partial void ToStringOverride(ref bool didrun, ref string result) { + partial void ToStringOverride(ref bool didrun, ref string? result) { result = SecurityFormatter.format(this); didrun = true; } diff --git a/src/cs/Bts.Spark.Api/security/SecurityComparer.cs b/src/cs/Bts.Spark.Api/security/SecurityComparer.cs index 96826de87..7b4443b11 100644 --- a/src/cs/Bts.Spark.Api/security/SecurityComparer.cs +++ b/src/cs/Bts.Spark.Api/security/SecurityComparer.cs @@ -10,7 +10,7 @@ namespace bts.api { public static IComparer instance { get; } = _instance; public static IComparer instance_immutable { get; } = _instance; - public static int compare(Security x, Security y) { + public static int compare(Security? x, Security? y) { if (ReferenceEquals(x, y)) { return 0; } @@ -44,7 +44,7 @@ namespace bts.api { return 0; } - int IComparer.Compare(Security x, Security y) => + int IComparer.Compare(Security? x, Security? y) => compare(x, y); int IComparer.Compare(SecurityImmutable x, SecurityImmutable y) => diff --git a/src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs b/src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs index e1074d26d..924693c95 100644 --- a/src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs +++ b/src/cs/Bts.Spark.Api/security/SecurityEqualityComparer.cs @@ -8,7 +8,7 @@ namespace bts.api { public static IEqualityComparer instance { get; } = _instance; public static IEqualityComparer instance_immutable { get; } = _instance; - public static bool equals(Security x, Security y) => + public static bool equals(Security? x, Security? y) => x?.Id == y?.Id; public static bool equals(SecurityImmutable x, SecurityImmutable y) => @@ -20,7 +20,7 @@ namespace bts.api { public static int get_hash_code([DisallowNull] SecurityImmutable security) => (int)security.Id; - bool IEqualityComparer.Equals(Security x, Security y) => + bool IEqualityComparer.Equals(Security? x, Security? y) => equals(x, y); bool IEqualityComparer.Equals(SecurityImmutable x, SecurityImmutable y) => diff --git a/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs b/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs index 3479070d0..404e537a5 100644 --- a/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs +++ b/src/cs/Bts.Spark.Api/security/SecurityFormatter.cs @@ -19,16 +19,16 @@ return string.Join("", _format_legs(future_legs)); } - public static string format_future(string symbol, DateTime exp) => + public static string format_future(string? symbol, DateTime exp) => format_future(symbol, (uint)exp.Year, (uint)exp.Month, (uint)exp.Day); - public static string format_future(string symbol, uint exp_year, uint exp_month, uint exp_day) => + public static string format_future(string? symbol, uint exp_year, uint exp_month, uint exp_day) => $"{symbol}{format_expiration(new((int)exp_year, (int)exp_month, (int)exp_day))}"; - public static string format_future(string symbol, FutureContractImmutable future) => + public static string format_future(string? symbol, FutureContractImmutable future) => format_future(symbol, future.ExpirationYear, future.ExpirationMonth, future.ExpirationDay); - public static string format_future(string symbol, string exch_desc, FutureContractImmutable future) => + public static string format_future(string? symbol, string exch_desc, FutureContractImmutable future) => string.IsNullOrEmpty(exch_desc) ? format_future(symbol, future) : exch_desc; public static string format_option(string symbol, uint exp_year, uint exp_month, uint exp_day, double strike, PutOrCall call_put) { diff --git a/src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs b/src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs index f926d0cbb..1abe62f64 100644 --- a/src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs +++ b/src/cs/Bts.Spark.Api/threading/ThreadSafeEvent.cs @@ -41,7 +41,7 @@ namespace bts.threading { } } - event Action _action; + event Action? _action; public void Invoke(T value) => _action?.Invoke(value); diff --git a/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs b/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs index b4d3d81d7..a85f8b9b7 100644 --- a/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs +++ b/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs @@ -26,7 +26,7 @@ namespace bts.utils { public static OneofDescriptor get_oneof_descriptor(string prop_name) where T : IMessage, new() { prop_name = prop_name.iremove_suffix(_case_suffix); - return Descriptor().Oneofs.FirstOrDefault(d => d.Name.iequals(prop_name)); + return Descriptor().Oneofs.First(d => d.Name.iequals(prop_name)); } public static IReadOnlyDictionary get_oneof_descriptor_index(string prop_name) @@ -34,8 +34,8 @@ namespace bts.utils { where TOneofCase : struct => _DescriptorImpl.OneofImpl.get_descriptor_case_index(prop_name); - public static FieldDescriptor get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { - string oneof_name = oneof_case.ToString(); + public static FieldDescriptor? get_oneof_field_descriptor(TOneofCase oneof_case) where T : IMessage, new() where TOneofCase : struct { + var oneof_name = oneof_case.ToString(); return Descriptor().Fields.InFieldNumberOrder().FirstOrDefault(fd => fd.Name.Replace("_", "").iequals(oneof_name)); } @@ -58,21 +58,21 @@ namespace bts.utils { } public static TImmutable immutable_factory(TMutable m) where TMutable : IMessage, new() where TImmutable : IImmutableMessage => - (TImmutable)Activator.CreateInstance(typeof(TImmutable), m); + (TImmutable)Activator.CreateInstance(typeof(TImmutable), m)!; public static IMessage mutable_factory(Type type) => MutableFactoryStore.get(type)(); static class MutableFactoryStore { [ThreadStatic] - static Dictionary> _factories_backing; + static Dictionary>? _factories_backing; static Dictionary> _factories => _factories_backing ?? (_factories_backing = new Dictionary>()); public static Func get(Type type) => _factories.GetOrAdd(type, - t => typeof(MutableFactory<>).MakeGenericType(t) + t => (Func)typeof(MutableFactory<>).MakeGenericType(t) .GetField(nameof(MutableFactory.anonymous_factory), BindingFlags.Static | BindingFlags.Public) - .GetValue(null) as Func); + !.GetValue(null)!); } static class MutableFactory where T : IMessage, new() { @@ -118,7 +118,7 @@ namespace bts.utils { public static IReadOnlyDictionary get_descriptor_case_index(string prop_name) { /// Use local copy because is updated atomically. var dci = _descriptor_case_indices; - if (!dci.TryGetValue(prop_name, out IReadOnlyDictionary rv)) { + if (!dci.TryGetValue(prop_name, out var rv)) { /// Update atomically (lock-free). /// 1) clone the local copy. /// 2) add the new KeyValue to the clone. diff --git a/src/cs/Bts.Spark.Core/utils/NullableExtensions.cs b/src/cs/Bts.Spark.Core/utils/NullableExtensions.cs index 5209b41f6..774463dd1 100644 --- a/src/cs/Bts.Spark.Core/utils/NullableExtensions.cs +++ b/src/cs/Bts.Spark.Core/utils/NullableExtensions.cs @@ -1,9 +1,13 @@ #nullable enable namespace Spark.Core { using System; + using System.Runtime.CompilerServices; public static class NullableExtensions { public static T assert_value(this T? nullable) where T : struct => nullable ?? throw new ArgumentNullException(nameof(nullable)); + + public static T RequireValue(this T? nullable, [CallerArgumentExpression(nameof(nullable))] string name = "") where T : struct => + nullable ?? throw new ArgumentNullException(name); } } diff --git a/src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs b/src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs index 3d2412ce4..ad25343c5 100644 --- a/src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs +++ b/src/lib_spark/spark/api/service_compiler/templates/c#/client.pb.cs @@ -27,17 +27,17 @@ namespace {{package}} { readonly Lazy>> _{{name}}_tablei_src; // {{comment}} - public IObservable> subscribe_{{name}}(string qualifier = null) => + public IObservable> subscribe_{{name}}(string? qualifier = null) => _channel.subscribe<{{output_type_full}}, {{output_type_full}}>( {{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a => a) .reconstitute(_key); - public IObservable> subscribei_{{name}}(string qualifier = null) => + public IObservable> subscribei_{{name}}(string? qualifier = null) => _channel.subscribe<{{output_type_full}}, {{output_type_full}}Immutable>( - {{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a => ({{output_type_full}}Immutable)a) + {{@index}}, "{{name}}", qualifier, {{output_type_full}}.Parser, a => ({{output_type_full}}Immutable)a!) .reconstitute(_key); - public IObservable> subscribei_{{name}}_table(string qualifier = null) => + public IObservable> subscribei_{{name}}_table(string? qualifier = null) => _{{name}}_tablei_src.Value; static {{key_type.cstype}} _key({{output_type_full}} row) => @@ -61,7 +61,7 @@ namespace {{package}} { // {{comment}} public {{output_type_full}} {{name}}({{input_type_full}} request) { if (_channel.is_sync_call_ok()) { - return {{name}}_async(request).Result.value; + return {{name}}_async(request).Result.value ?? throw new InvalidOperationException("Response is null"); } throw new ApiException( "API blocking call cannot be made on this thread. Please use {{name}}_async instead."); @@ -69,7 +69,7 @@ namespace {{package}} { internal {{output_type_full}} {{name}}({{input_type_full}}Immutable request) { if (_channel.is_sync_call_ok()) { - return {{name}}_async(request).Result.value; + return {{name}}_async(request).Result.value ?? throw new InvalidOperationException("Response is null"); } throw new ApiException( "API blocking call cannot be made on this thread. Please use {{name}}_async instead."); diff --git a/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs b/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs index 388d30155..98062ae41 100644 --- a/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs +++ b/src/lib_spark/spark/api/service_compiler/templates/c#/server.pb.cs @@ -17,7 +17,7 @@ namespace {{package}} { abstract class Authenticated{{name}}Base : ApiServer, IDisposable { readonly ServerChannel _channel; - public Authenticated{{name}}Base(ServiceContext context, string qualifier = "") => + public Authenticated{{name}}Base(ServiceContext context, string? qualifier = null) => _channel = context.publish(this, "{{name}}", qualifier); enum ServiceMethods { @@ -66,7 +66,7 @@ namespace {{package}} { {{#each method}} {{#if server_streaming}} public virtual Task allow_{{name}}( - AuthTokenImmutable? token, string qualifier) { + AuthTokenImmutable? token, string? qualifier) { var r = new StreamAccessResponse() { Authorized = true }; return Task.FromResult(r); } @@ -75,7 +75,7 @@ namespace {{package}} { row.{{camel key_field}}; //{{comment}} - protected {{cap name}}Publisher make_{{name}}_publisher(string qualifier = null) { + protected {{cap name}}Publisher make_{{name}}_publisher(string? qualifier = null) { var table = _channel.create_table("{{name}}", qualifier); return new {{cap name}}Publisher(table); } @@ -97,9 +97,9 @@ namespace {{package}} { } public void publish( - List<{{output_type_full}}> added = null, - HashSet<{{key_type.cstype}}> removed = null, - List<{{output_type_full}}> changed = null) { + List<{{output_type_full}}>? added = null, + HashSet<{{key_type.cstype}}>? removed = null, + List<{{output_type_full}}>? changed = null) { int add_count = added is null ? 0 : added.Count; int change_count = changed is null ? 0 : changed.Count; int remove_count = removed is null ? 0 : removed.Count; @@ -112,8 +112,7 @@ namespace {{package}} { if (added is not null) { foreach (var a in added) { var key = {{name}}_key(a); - var is_change = removed == null ? false : removed.Contains(key); - if (is_change) { removed.Remove(key); } + var is_change = removed?.Remove(key) ?? false; changes[change_index++] = _pack(a, is_change, pinned_buffers); } } @@ -190,7 +189,7 @@ namespace {{package}} { // {{comment}} abstract class {{name}}Base : Authenticated{{name}}Base , IDisposable { - public {{name}}Base(ServiceContext context, string qualifier="") + public {{name}}Base(ServiceContext context, string? qualifier = null) : base(context, qualifier) { } {{#each method}} {{#unless server_streaming}}