From aacd22d496aad42e522ce6e2f71a5eb429ee727b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 11 Jan 2026 11:01:26 -0500 Subject: [PATCH] refactor: Move Exception utils to Spark.Core.Diagnostics ns --- .../Join/Proximity/ProximityJoinStream.cs | 3 +-- .../DataStream/Primitives/Map/MapStream.cs | 2 +- .../Primitives/Map/SuperMapStream.cs | 2 +- .../TextFileStreams/TextWriterStream.cs | 11 +++++------ .../DataStreamCore/ViewStreamExtensions.cs | 3 +-- .../PubSub/Client/Routing/PubSubRouter.cs | 12 ++++++++---- .../ManagedTCP/AsyncTCPConnection_APM.cs | 18 ++++++------------ .../PubSub/Server/PubSubState.cs | 18 +++++++----------- .../Market/TimeAndSales/TimeAndSalesVM.cs | 1 + .../Market/TimeAndSales/TimeAndSalesWindow.cs | 2 +- .../Spreader/ExecutionStrategyEditor.xaml.cs | 1 + .../spark/Modules/Spreader/SpreaderModel.cs | 1 + .../Spreader/VM/ParameterRows/RowModel.cs | 3 ++- .../Modules/Spreader/VM/SyntheticEditorVM.cs | 1 + .../Model/AlgoStudioFlatDefinitionModel.cs | 3 +-- .../Modules/Trading/DayFills/DayFillsVM.cs | 1 + .../Modules/Trading/Ladder/LadderWindow.cs | 1 + .../Trading/Ladder/View/LadderPriceList.cs | 2 +- .../Trading/Ladder/View/LadderView.xaml.cs | 1 + .../Modules/Trading/OpenOrders/OpenOrdersVM.cs | 1 + .../Modules/Trading/OrderBook/OrderBookVM.cs | 1 + .../spark/Modules/Trading/PNL/PNLWindow.cs | 1 + .../spark/Modules/Trading/PNL/VM/PNLVM.cs | 1 + .../Modules/Trading/PNL/View/PNLView.xaml.cs | 1 + .../ReconcileReport/ReconcileReportVM.cs | 4 +--- .../Orders/OrderTypeVMs/DynamicOrderVM.cs | 1 + .../Orders/OrderTypeVMs/GenericOrderVM.cs | 1 + .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 3 ++- src/client/spark/Orders/OrdersModel.cs | 4 +--- .../core/Collections/ObservableAutoWrapper.cs | 1 + .../core/GlobalExtensions/GlobalExtensions.cs | 2 +- .../spark/core/data/Proto/ColorOpacityProto.cs | 3 ++- .../view/Controls/Adorners/PopupAdorner.cs | 7 +------ .../DIYGrid/Columns/DIYGridColumnData.cs | 3 ++- .../spark/view/Controls/DIYGrid/DIYGrid.cs | 1 + .../Filters/IAutoFocusTargetProvider.cs | 2 +- .../DataGridEx/Filters/VM/FilterVMBase.cs | 2 +- .../DataGridEx/Filters/VM/TupleFilterVM.cs | 3 ++- .../Extensions/TextElement/TextBoxBehavior.cs | 2 +- src/client/spark/view/Extensions/TreeViewEx.cs | 3 +-- .../view/Extensions/WPFAttachedBehavior.cs | 3 +-- .../spark/view/Extensions/WPFExtensions.cs | 1 + .../spark/view/Shell/Login/LoginView.xaml.cs | 3 ++- .../spark/view/Spark/Utilities/WorkLoop.cs | 3 +-- .../view/Utility/Frozen/FrozenBrushCache.cs | 5 +++-- .../view/Utility/Frozen/FrozenPenCache.cs | 7 +++++-- .../Utility/IRequestBindingSourceUpdate.cs | 3 +-- .../spark/view/Utility/MDDisplayHelper.cs | 4 ++-- src/client/spark/view/Utility/MouseHelper.cs | 4 +++- .../spark/view/Utility/TextBoxInputFilter.cs | 3 ++- .../view/Utility/ThreadedWindowLauncher.cs | 3 ++- src/client/spark/view/Utility/WPFHelper.cs | 1 + src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs | 3 ++- .../Bts.Spark.Api/Orders/WorkingOrderData.cs | 3 ++- src/cs/Bts.Spark.Api/utils/ProtoHelper.cs | 3 ++- .../Collections/CircularBuffer.cs | 2 +- .../Extensions/EnumerableExtensions.cs | 3 +-- .../Collections/Extensions/ListExtensions.cs | 3 +-- .../Collections/KeyedCollection.cs | 5 +++-- .../Collections/ObservableSortedCollection.cs | 3 ++- .../Bts.Spark.Core/Collections/OffsetList.cs | 2 +- .../Collections/ReadOnlyListSubRangeWrapper.cs | 3 ++- .../ExceptionAssert.cs | 2 +- .../ExceptionBuilder.cs | 2 +- src/cs/Bts.Spark.Core/utils/ArrayUtils.cs | 3 ++- src/cs/Bts.Spark.Core/utils/EnumHelper.cs | 2 +- 66 files changed, 113 insertions(+), 99 deletions(-) rename src/cs/Bts.Spark.Core/{utils/Exceptions => Diagnostics}/ExceptionAssert.cs (99%) rename src/cs/Bts.Spark.Core/{utils/Exceptions => Diagnostics}/ExceptionBuilder.cs (99%) diff --git a/src/DataStreamSuite/DataStream/Primitives/Join/Proximity/ProximityJoinStream.cs b/src/DataStreamSuite/DataStream/Primitives/Join/Proximity/ProximityJoinStream.cs index 568314b82..f2db3b30c 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Join/Proximity/ProximityJoinStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Join/Proximity/ProximityJoinStream.cs @@ -2,8 +2,7 @@ namespace bts { using BCG; using BCG.Utilities.General; - using mbts.utils; - + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs index 0a7e54e2b..1d1e39787 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/MapStream.cs @@ -2,7 +2,7 @@ using bts; using Bts.DataStreamCore; -using mbts.utils; +using Spark.Core.Diagnostics; using System; diff --git a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs index 79b65d166..06ca8185a 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Map/SuperMapStream.cs @@ -1,6 +1,6 @@ using Bts.DataStreamCore; -using mbts.utils; +using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs b/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs index 445bfb35e..1082e49fd 100644 --- a/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/TextFileStreams/TextWriterStream.cs @@ -1,12 +1,11 @@ -using System; -using System.Diagnostics; -using System.IO; - -using BCG.Utilities.General; +using BCG.Utilities.General; using bts; -using mbts.utils; +using Spark.Core.Diagnostics; + +using System; +using System.IO; namespace BCG { diff --git a/src/DataStreamSuite/DataStreamCore/ViewStreamExtensions.cs b/src/DataStreamSuite/DataStreamCore/ViewStreamExtensions.cs index 156f75132..381deaf86 100644 --- a/src/DataStreamSuite/DataStreamCore/ViewStreamExtensions.cs +++ b/src/DataStreamSuite/DataStreamCore/ViewStreamExtensions.cs @@ -3,8 +3,7 @@ namespace Bts.DataStreamCore; using BCG; -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs index f0685ac08..ecaf97c57 100644 --- a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs +++ b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRouter.cs @@ -3,10 +3,10 @@ using bts; using Bts.PubSub; using Bts.PubSub.Routing; -using mbts.utils; - using Microsoft.Extensions.Options; +using Spark.Core.Diagnostics; + using System; using System.Collections.Generic; using System.Linq; @@ -49,7 +49,9 @@ namespace BCG { public RemoteConnectionInfo get_pub_route_for_tag(string tag) { if (!_pub_routes.TryGetFirst(r => r?.IsMatch(tag) ?? false, out var route)) { - Log.assert(false, $"Failed to find route for tag '{tag}'", nameof(tag)); + var msg = $"Failed to find route for tag '{tag}'"; + Log.assert(false, msg); + throw new ArgumentException(msg, nameof(tag)); } Log.Gen.info($"PubSubRouter.get_sub_url_for_tag tag: {tag} route: {JsonSerializer.Serialize(route)}"); ArgumentNullException.ThrowIfNull(route.ServerAddress); @@ -58,7 +60,9 @@ namespace BCG { public RemoteConnectionInfo get_sub_route_for_tag(string tag) { if (!_sub_routes.TryGetFirst(r => r?.IsMatch(tag) ?? false, out var route)) { - Log.assert(false, $"Failed to find route for tag '{tag}'", nameof(tag)); + var msg = $"Failed to find route for tag '{tag}'"; + Log.assert(false, msg); + throw new ArgumentException(msg, nameof(tag)); } Log.Gen.info($"PubSubRouter.get_sub_url_for_tag tag: {tag} route: {JsonSerializer.Serialize(route)}"); ArgumentNullException.ThrowIfNull(route.ServerAddress); diff --git a/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnection_APM.cs b/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnection_APM.cs index eee1e3f8b..930dafeb1 100644 --- a/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnection_APM.cs +++ b/src/DataStreamSuite/PubSub/ManagedTCP/AsyncTCPConnection_APM.cs @@ -20,23 +20,17 @@ /// to detect it. /// +using BCG; +using BCG.Utilities.General; + +using Spark.Core.Diagnostics; + using System; using System.Collections.Generic; -using System.Text; -using System.Net; -using System.Net.Sockets; using System.IO; -using BCG.Utilities.General; -using System.Runtime.InteropServices; -using BCG; +using System.Net.Sockets; using System.Threading; -using System.Threading.Tasks; -using System.Linq; -using Bts.PubSub; -using Spark.Core; -using mbts.utils; - namespace bts { public class AsyncTCPConnection_APM : ITCPConnection, IWorker, IDisposable diff --git a/src/DataStreamSuite/PubSub/Server/PubSubState.cs b/src/DataStreamSuite/PubSub/Server/PubSubState.cs index 8ddc44ae1..df4a5aea6 100644 --- a/src/DataStreamSuite/PubSub/Server/PubSubState.cs +++ b/src/DataStreamSuite/PubSub/Server/PubSubState.cs @@ -1,18 +1,14 @@ -using System; -//using System.Messaging; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.IO; - -using mbts; -using System.Linq.Expressions; using bts; -using mbts.utils; -using bts.collections; using Bts.PubSub; using Bts.PubSub.Server; +using mbts; + +using Spark.Core.Diagnostics; + +using System; +using System.Collections.Generic; + namespace BCG { /// /// Mantains all the state that there is in the server. diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index c3b453336..c8aa30cef 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -17,6 +17,7 @@ using Spark.Core; using Spark.Core.Collections; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reflection; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 133d8aa31..1763a985d 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -5,7 +5,6 @@ using bts.spark; using bts.view; - using mbts; using mbts.co2; using mbts.persist; using mbts.spark; @@ -15,6 +14,7 @@ using mbts.ui.utility; using mbts.utils; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reactive; diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs index 0c3c3a2aa..c7e9dbd7e 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml.cs @@ -9,6 +9,7 @@ using mbts.user.settings; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index 04ec1f9bd..a2de8b386 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -8,6 +8,7 @@ using bts.spark; using mbts.utils; using Spark.Core; +using Spark.Core.Diagnostics; using Spark.Core.Reactive; using System; diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs index 12f5ca399..cdf05b40b 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs @@ -1,6 +1,7 @@ using mbts.ui.shell; using mbts.ui.spark; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index ff06eba43..e54370556 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -11,6 +11,7 @@ using mbts.user.settings; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.ViewModel.Commands; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs index e62390a04..c32858c07 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs @@ -3,8 +3,7 @@ using bts.api.core; using bts.api.orderman.algo; using bts.spark; -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reactive; diff --git a/src/client/spark/Modules/Trading/DayFills/DayFillsVM.cs b/src/client/spark/Modules/Trading/DayFills/DayFillsVM.cs index 8e5f4fda9..03a4cfccb 100644 --- a/src/client/spark/Modules/Trading/DayFills/DayFillsVM.cs +++ b/src/client/spark/Modules/Trading/DayFills/DayFillsVM.cs @@ -19,6 +19,7 @@ namespace Spark.Trading { using Spark.Core.Collections; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindow.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindow.cs index 362951821..aa9cadd6a 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindow.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindow.cs @@ -13,6 +13,7 @@ namespace mbts.spark { using mbts.utils; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Trading; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderPriceList.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderPriceList.cs index f23420400..10e5ef867 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderPriceList.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderPriceList.cs @@ -1,7 +1,7 @@ using bts.api; using bts.utils; -using mbts.utils; +using Spark.Core.Diagnostics; using System; using System.Collections; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs index 3bec5e7ab..eccabfd0d 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs @@ -7,6 +7,7 @@ using mbts.ui.extensions; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs index ed33b4b02..e30eddc63 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs @@ -18,6 +18,7 @@ namespace Spark.Trading { using Spark.Core.Collections; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index c0633d4ef..8525e531c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -23,6 +23,7 @@ using Spark.Api.Domain; using Spark.Api.Orders; using Spark.Core.Collections; using Spark.Core.Data; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reactive; using Spark.Trading; diff --git a/src/client/spark/Modules/Trading/PNL/PNLWindow.cs b/src/client/spark/Modules/Trading/PNL/PNLWindow.cs index 59abdf7ce..95a5e3e49 100644 --- a/src/client/spark/Modules/Trading/PNL/PNLWindow.cs +++ b/src/client/spark/Modules/Trading/PNL/PNLWindow.cs @@ -19,6 +19,7 @@ namespace bts.shell { using mbts.utils; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Trading; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index ce0cc7e13..795e6e122 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -21,6 +21,7 @@ namespace bts.shell.pnl { using Spark.Core; using Spark.Core.Collections; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reflection; using Spark.Trading; diff --git a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs index 03494a5a8..b79917782 100644 --- a/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs +++ b/src/client/spark/Modules/Trading/PNL/View/PNLView.xaml.cs @@ -11,6 +11,7 @@ namespace bts.shell.pnl { using mbts.utils; using Spark.Core.Collections; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs index aafd49e3a..1761eb0dd 100644 --- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs +++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportVM.cs @@ -1,9 +1,7 @@ #nullable enable namespace Spark.Trading { using bts; - using bts.api; using bts.api.core; - using bts.api.position; using bts.collections; using bts.utils; @@ -17,10 +15,10 @@ namespace Spark.Trading { using mbts.ui.settings; using mbts.ui.shell; using mbts.ui.utility; - using mbts.utils; using Spark.Core.Collections; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.ViewModel.Commands; diff --git a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs index c98c7b64d..7a34be650 100644 --- a/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/DynamicOrderVM.cs @@ -9,6 +9,7 @@ using mbts.ui.utility; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs index 8e318c570..1855d45db 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderVM.cs @@ -11,6 +11,7 @@ using mbts.ui.utility; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index 6e801dfff..2dd214a64 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -2,7 +2,8 @@ using bts.utils; using mbts.ui.utility; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 3955509ed..3dcfbf3e2 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -6,19 +6,17 @@ namespace mbts.spark { using bts.api.position; using bts.collections; using bts.md; - using bts.shell.pnl; using bts.spark; using bts.utils; using mbts.config; using mbts.spark.utilities; - using mbts.ui; using mbts.utils; using Spark.Api.Orders; - using Spark.Api.Position; using Spark.Api.Reactive; using Spark.Core.Data; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reactive; using Spark.Model.Trading; diff --git a/src/client/spark/core/Collections/ObservableAutoWrapper.cs b/src/client/spark/core/Collections/ObservableAutoWrapper.cs index 29786c1d0..c8eb81e3d 100644 --- a/src/client/spark/core/Collections/ObservableAutoWrapper.cs +++ b/src/client/spark/core/Collections/ObservableAutoWrapper.cs @@ -6,6 +6,7 @@ using mbts.utils; using NUnit.Framework; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reflection; diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index fda68ddcd..89dac5c98 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -4,6 +4,7 @@ using bts.collections; using mbts.utils; using Spark.Core; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; @@ -14,7 +15,6 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; -using System.Windows.Threading; namespace mbts { public static class GlobalExtensions { diff --git a/src/client/spark/core/data/Proto/ColorOpacityProto.cs b/src/client/spark/core/data/Proto/ColorOpacityProto.cs index 17781c9bb..b7a20126b 100644 --- a/src/client/spark/core/data/Proto/ColorOpacityProto.cs +++ b/src/client/spark/core/data/Proto/ColorOpacityProto.cs @@ -1,10 +1,11 @@ using bts.utils; using mbts.ui; -using mbts.utils; using ProtoBuf; +using Spark.Core.Diagnostics; + using System; using System.Windows.Media; diff --git a/src/client/spark/view/Controls/Adorners/PopupAdorner.cs b/src/client/spark/view/Controls/Adorners/PopupAdorner.cs index ef980ea1a..7a5249699 100644 --- a/src/client/spark/view/Controls/Adorners/PopupAdorner.cs +++ b/src/client/spark/view/Controls/Adorners/PopupAdorner.cs @@ -1,9 +1,4 @@ -using bts; -using bts.utils; - -using mbts.ui.extensions; -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/DIYGridColumnData.cs b/src/client/spark/view/Controls/DIYGrid/Columns/DIYGridColumnData.cs index 84c6f6687..23222b9fe 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/DIYGridColumnData.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/DIYGridColumnData.cs @@ -2,7 +2,8 @@ namespace mbts.ui.controls { using mbts.spark.filters; using mbts.ui.utility; - using mbts.utils; + + using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs index dfca7f834..73c15efe8 100644 --- a/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs +++ b/src/client/spark/view/Controls/DIYGrid/DIYGrid.cs @@ -11,6 +11,7 @@ namespace mbts.ui.controls { using mbts.utils; using Spark.Core.Collections; + using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.Core.Reflection; diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/IAutoFocusTargetProvider.cs b/src/client/spark/view/Controls/DataGridEx/Filters/IAutoFocusTargetProvider.cs index 4450f4067..84fe2edee 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/IAutoFocusTargetProvider.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/IAutoFocusTargetProvider.cs @@ -1,4 +1,4 @@ -using mbts.utils; +using Spark.Core.Diagnostics; using System; using System.Linq; diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs index 9efdfd462..10e285131 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs @@ -1,7 +1,7 @@ using mbts.ui; using mbts.ui.shell; -using mbts.utils; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs index 2b0291d94..1313b99e6 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs @@ -2,7 +2,8 @@ using mbts.ui; using mbts.ui.shell; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Windows.Input; diff --git a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs index 4ab0c4791..b4c9c4f1c 100644 --- a/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs +++ b/src/client/spark/view/Extensions/TextElement/TextBoxBehavior.cs @@ -1,7 +1,7 @@ using mbts.ui.controls.adorners; using mbts.ui.converters; -using mbts.utils; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Extensions/TreeViewEx.cs b/src/client/spark/view/Extensions/TreeViewEx.cs index a01255333..6f0740a08 100644 --- a/src/client/spark/view/Extensions/TreeViewEx.cs +++ b/src/client/spark/view/Extensions/TreeViewEx.cs @@ -1,6 +1,5 @@ -using mbts.utils; +using Spark.Core.Diagnostics; -using System; using System.Windows; using System.Windows.Controls; diff --git a/src/client/spark/view/Extensions/WPFAttachedBehavior.cs b/src/client/spark/view/Extensions/WPFAttachedBehavior.cs index 7439510f4..743cefe13 100644 --- a/src/client/spark/view/Extensions/WPFAttachedBehavior.cs +++ b/src/client/spark/view/Extensions/WPFAttachedBehavior.cs @@ -1,7 +1,6 @@ using bts.utils; -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.ViewModel.Commands; diff --git a/src/client/spark/view/Extensions/WPFExtensions.cs b/src/client/spark/view/Extensions/WPFExtensions.cs index 6732012d3..31601becd 100644 --- a/src/client/spark/view/Extensions/WPFExtensions.cs +++ b/src/client/spark/view/Extensions/WPFExtensions.cs @@ -5,6 +5,7 @@ using bts.utils; using mbts.utils; using Spark.Core.Collections; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using Spark.ViewModel.Commands; diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml.cs b/src/client/spark/view/Shell/Login/LoginView.xaml.cs index b7e767a61..590d17dcc 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml.cs +++ b/src/client/spark/view/Shell/Login/LoginView.xaml.cs @@ -2,7 +2,8 @@ using mbts.ui.converters; using mbts.ui.native; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Linq; diff --git a/src/client/spark/view/Spark/Utilities/WorkLoop.cs b/src/client/spark/view/Spark/Utilities/WorkLoop.cs index 59a17b6aa..fdc26f8a8 100644 --- a/src/client/spark/view/Spark/Utilities/WorkLoop.cs +++ b/src/client/spark/view/Spark/Utilities/WorkLoop.cs @@ -1,7 +1,6 @@ using bts; -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Utility/Frozen/FrozenBrushCache.cs b/src/client/spark/view/Utility/Frozen/FrozenBrushCache.cs index d28d5b5e0..4aa535270 100644 --- a/src/client/spark/view/Utility/Frozen/FrozenBrushCache.cs +++ b/src/client/spark/view/Utility/Frozen/FrozenBrushCache.cs @@ -1,4 +1,5 @@ -using mbts.utils; +using Spark.Core.Diagnostics; + using System; using System.Collections.Generic; using System.Windows.Media; @@ -58,4 +59,4 @@ namespace mbts.ui { return brush; } } -} \ No newline at end of file +} diff --git a/src/client/spark/view/Utility/Frozen/FrozenPenCache.cs b/src/client/spark/view/Utility/Frozen/FrozenPenCache.cs index 99a09a682..9f68d8e17 100644 --- a/src/client/spark/view/Utility/Frozen/FrozenPenCache.cs +++ b/src/client/spark/view/Utility/Frozen/FrozenPenCache.cs @@ -1,6 +1,9 @@ using bts.utils; + using mbts.ui.dpi; -using mbts.utils; + +using Spark.Core.Diagnostics; + using System; using System.Collections.Generic; using System.Windows.Media; @@ -56,4 +59,4 @@ namespace mbts.ui { return pen; } } -} \ No newline at end of file +} diff --git a/src/client/spark/view/Utility/IRequestBindingSourceUpdate.cs b/src/client/spark/view/Utility/IRequestBindingSourceUpdate.cs index 38f568c1c..1e68ffc06 100644 --- a/src/client/spark/view/Utility/IRequestBindingSourceUpdate.cs +++ b/src/client/spark/view/Utility/IRequestBindingSourceUpdate.cs @@ -1,5 +1,4 @@ -using mbts.utils; - +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Utility/MDDisplayHelper.cs b/src/client/spark/view/Utility/MDDisplayHelper.cs index 250f697be..61cc1ba16 100644 --- a/src/client/spark/view/Utility/MDDisplayHelper.cs +++ b/src/client/spark/view/Utility/MDDisplayHelper.cs @@ -5,13 +5,13 @@ using bts.utils; using mbts.co2; using mbts.spark; using mbts.ui.shell; -using mbts.utils; using ProtoBuf; +using Spark.Core.Diagnostics; + using System; using System.Collections.Generic; -using System.Linq; using System.Text; namespace mbts.ui.spark { diff --git a/src/client/spark/view/Utility/MouseHelper.cs b/src/client/spark/view/Utility/MouseHelper.cs index dfc712ceb..a2f259dac 100644 --- a/src/client/spark/view/Utility/MouseHelper.cs +++ b/src/client/spark/view/Utility/MouseHelper.cs @@ -1,5 +1,7 @@ using mbts.ui.dpi; -using mbts.utils; + +using Spark.Core.Diagnostics; + using System.Windows; using System.Windows.Input; diff --git a/src/client/spark/view/Utility/TextBoxInputFilter.cs b/src/client/spark/view/Utility/TextBoxInputFilter.cs index 765061cb2..53218368f 100644 --- a/src/client/spark/view/Utility/TextBoxInputFilter.cs +++ b/src/client/spark/view/Utility/TextBoxInputFilter.cs @@ -1,5 +1,6 @@ using mbts.ui.extensions; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Text.RegularExpressions; diff --git a/src/client/spark/view/Utility/ThreadedWindowLauncher.cs b/src/client/spark/view/Utility/ThreadedWindowLauncher.cs index 86d3ea848..5d4b70bb9 100644 --- a/src/client/spark/view/Utility/ThreadedWindowLauncher.cs +++ b/src/client/spark/view/Utility/ThreadedWindowLauncher.cs @@ -1,7 +1,8 @@ using bts; using mbts.ui.shell; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Diagnostics; diff --git a/src/client/spark/view/Utility/WPFHelper.cs b/src/client/spark/view/Utility/WPFHelper.cs index b9c0686ca..8edb846ca 100644 --- a/src/client/spark/view/Utility/WPFHelper.cs +++ b/src/client/spark/view/Utility/WPFHelper.cs @@ -3,6 +3,7 @@ using bts.utils; using mbts.ui.dpi; using mbts.utils; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System; diff --git a/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs b/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs index 2423b18d6..d0bc6c432 100644 --- a/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs +++ b/src/cs/Bts.Spark.Api/Orders/OrderDataHelper.cs @@ -10,7 +10,8 @@ using Google.Protobuf.Reflection; using Google.Protobuf.WellKnownTypes; using mbts.ui.utility; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs b/src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs index 8685848aa..8c0349678 100644 --- a/src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs +++ b/src/cs/Bts.Spark.Api/Orders/WorkingOrderData.cs @@ -4,12 +4,13 @@ using bts.api; using bts.api.orderman; using mbts.spark; -using mbts.utils; using Spark.Api.Data; using Spark.Api.Orders; using Spark.Api.Position; +using Spark.Core.Diagnostics; + using System.Collections.Generic; using System.Linq; diff --git a/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs b/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs index 4f77533f9..b4d3d81d7 100644 --- a/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs +++ b/src/cs/Bts.Spark.Api/utils/ProtoHelper.cs @@ -7,7 +7,8 @@ using Google.Protobuf.Reflection; using mbts; using mbts.ui.utilities; using mbts.ui.utility; -using mbts.utils; + +using Spark.Core.Diagnostics; using System; using System.Collections.Generic; diff --git a/src/cs/Bts.Spark.Core/Collections/CircularBuffer.cs b/src/cs/Bts.Spark.Core/Collections/CircularBuffer.cs index cec8ddc86..5313fc1a0 100644 --- a/src/cs/Bts.Spark.Core/Collections/CircularBuffer.cs +++ b/src/cs/Bts.Spark.Core/Collections/CircularBuffer.cs @@ -6,7 +6,7 @@ using bts; using bts.collections; using bts.utils; -using mbts.utils; +using Spark.Core.Diagnostics; using System; using System.Collections; diff --git a/src/cs/Bts.Spark.Core/Collections/Extensions/EnumerableExtensions.cs b/src/cs/Bts.Spark.Core/Collections/Extensions/EnumerableExtensions.cs index 174bf1c44..2adaa90e5 100644 --- a/src/cs/Bts.Spark.Core/Collections/Extensions/EnumerableExtensions.cs +++ b/src/cs/Bts.Spark.Core/Collections/Extensions/EnumerableExtensions.cs @@ -2,10 +2,9 @@ namespace System.Collections.Generic { using bts.utils; - using mbts.utils; - using Spark.Core; using Spark.Core.Collections; + using Spark.Core.Diagnostics; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/cs/Bts.Spark.Core/Collections/Extensions/ListExtensions.cs b/src/cs/Bts.Spark.Core/Collections/Extensions/ListExtensions.cs index 781fe4a1a..f6d5731bc 100644 --- a/src/cs/Bts.Spark.Core/Collections/Extensions/ListExtensions.cs +++ b/src/cs/Bts.Spark.Core/Collections/Extensions/ListExtensions.cs @@ -1,9 +1,8 @@ namespace bts.collections { using bts.utils; - using mbts.utils; - using Spark.Core.Collections; + using Spark.Core.Diagnostics; using System; using System.Collections; diff --git a/src/cs/Bts.Spark.Core/Collections/KeyedCollection.cs b/src/cs/Bts.Spark.Core/Collections/KeyedCollection.cs index 3c28e781c..0bb54df6d 100644 --- a/src/cs/Bts.Spark.Core/Collections/KeyedCollection.cs +++ b/src/cs/Bts.Spark.Core/Collections/KeyedCollection.cs @@ -1,4 +1,5 @@ -using mbts.utils; +using Spark.Core.Diagnostics; + using System; using System.Collections; using System.Collections.Generic; @@ -150,4 +151,4 @@ namespace bts.collections { void _assert_key_match(KeyValuePair kv) => _assert_key_match(kv.Key, kv.Value); #endregion } -} \ No newline at end of file +} diff --git a/src/cs/Bts.Spark.Core/Collections/ObservableSortedCollection.cs b/src/cs/Bts.Spark.Core/Collections/ObservableSortedCollection.cs index b3af98fad..a829e5369 100644 --- a/src/cs/Bts.Spark.Core/Collections/ObservableSortedCollection.cs +++ b/src/cs/Bts.Spark.Core/Collections/ObservableSortedCollection.cs @@ -4,7 +4,8 @@ namespace Spark.Core.Collections { using bts.utils; using mbts; - using mbts.utils; + + using Spark.Core.Diagnostics; using System; using System.Collections; diff --git a/src/cs/Bts.Spark.Core/Collections/OffsetList.cs b/src/cs/Bts.Spark.Core/Collections/OffsetList.cs index 38d02a86b..2ee5d7125 100644 --- a/src/cs/Bts.Spark.Core/Collections/OffsetList.cs +++ b/src/cs/Bts.Spark.Core/Collections/OffsetList.cs @@ -1,7 +1,7 @@ #nullable enable namespace Spark.Core.Collections; -using mbts.utils; +using Spark.Core.Diagnostics; using System.Collections; using System.Collections.Generic; diff --git a/src/cs/Bts.Spark.Core/Collections/ReadOnlyListSubRangeWrapper.cs b/src/cs/Bts.Spark.Core/Collections/ReadOnlyListSubRangeWrapper.cs index fd2b25e7f..3fcf9e335 100644 --- a/src/cs/Bts.Spark.Core/Collections/ReadOnlyListSubRangeWrapper.cs +++ b/src/cs/Bts.Spark.Core/Collections/ReadOnlyListSubRangeWrapper.cs @@ -1,4 +1,5 @@ -using mbts.utils; +using Spark.Core.Diagnostics; + using System; using System.Collections; using System.Collections.Generic; diff --git a/src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionAssert.cs b/src/cs/Bts.Spark.Core/Diagnostics/ExceptionAssert.cs similarity index 99% rename from src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionAssert.cs rename to src/cs/Bts.Spark.Core/Diagnostics/ExceptionAssert.cs index c4bfbcdc0..fd7f98a0e 100644 --- a/src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionAssert.cs +++ b/src/cs/Bts.Spark.Core/Diagnostics/ExceptionAssert.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Numerics; using System.Runtime.CompilerServices; -namespace mbts.utils { +namespace Spark.Core.Diagnostics { public static class ExceptionAssert { public static T of_type(object? obj, [CallerArgumentExpression(nameof(obj))] string? name = null) => obj is T ? (T)obj : throw new ArgumentException($"Expected {typeof(T)}, actually {(obj?.GetType()?.ToString() ?? "null")}.", name); diff --git a/src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionBuilder.cs b/src/cs/Bts.Spark.Core/Diagnostics/ExceptionBuilder.cs similarity index 99% rename from src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionBuilder.cs rename to src/cs/Bts.Spark.Core/Diagnostics/ExceptionBuilder.cs index c5353f6d6..d4092aadd 100644 --- a/src/cs/Bts.Spark.Core/utils/Exceptions/ExceptionBuilder.cs +++ b/src/cs/Bts.Spark.Core/Diagnostics/ExceptionBuilder.cs @@ -1,6 +1,6 @@ using System; -namespace mbts.utils { +namespace Spark.Core.Diagnostics { public static class ExceptionBuilder { public static class Argument { public static ArgumentException must_be(string description, string name) => diff --git a/src/cs/Bts.Spark.Core/utils/ArrayUtils.cs b/src/cs/Bts.Spark.Core/utils/ArrayUtils.cs index 4d3a89a11..664eed1e3 100644 --- a/src/cs/Bts.Spark.Core/utils/ArrayUtils.cs +++ b/src/cs/Bts.Spark.Core/utils/ArrayUtils.cs @@ -1,4 +1,5 @@ -using mbts.utils; +using Spark.Core.Diagnostics; + using System; using System.Collections; using System.Collections.Generic; diff --git a/src/cs/Bts.Spark.Core/utils/EnumHelper.cs b/src/cs/Bts.Spark.Core/utils/EnumHelper.cs index b1ca947ce..5f2421a0d 100644 --- a/src/cs/Bts.Spark.Core/utils/EnumHelper.cs +++ b/src/cs/Bts.Spark.Core/utils/EnumHelper.cs @@ -1,6 +1,6 @@ using mbts.ui.utilities; -using mbts.utils; +using Spark.Core.Diagnostics; using Spark.Core.Disposables; using System;