From f07d83e7bb52d7ebdbd4a9e10746a72d41858657 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 26 Aug 2025 13:57:00 -0400 Subject: [PATCH] refactor: Make CompositeDataStreamFactory class internal --- .../Controllers/DataStreamSubscriptionController.cs | 5 +---- .../DataStream/Offloading/RemoteQueryManager.cs | 5 +---- .../DynamicLoading/CompositeDataStreamFactory.cs | 9 ++++++--- .../Services/DataStreamPublisherService.cs | 5 +---- src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs | 4 +--- .../spark/Modules/Analytics/AnalyticsShellModule.cs | 5 +---- 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs index 948dde692..dfb9c3eaf 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs @@ -12,10 +12,7 @@ public class DataStreamSubscriptionController : ControllerBase { public DataStreamSubscriptionController(ILogger logger, IEnumerable streamFactories) { this.logger = logger; logger.LogInformation("Creating {ControllerType}", GetType().Name); - var streamFactoryList = streamFactories.ToList(); - streamFactory = streamFactoryList.Count == 1 - ? streamFactoryList[0] - : new CompositeDataStreamFactory(streamFactoryList); + streamFactory = DataStreamFactory.Create(streamFactories); } [Route("/ws")] diff --git a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs index 334f23cc8..33185cd9a 100644 --- a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs +++ b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryManager.cs @@ -63,10 +63,7 @@ namespace BCG { public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker, IEnumerable streamFactories) { _sub = managedSubscriber; _broker = pubTableBroker; - var streamFactoryList = streamFactories.ToList(); - streamFactory = streamFactoryList.Count == 1 - ? streamFactoryList[0] - : new CompositeDataStreamFactory(streamFactoryList); + streamFactory = DataStreamFactory.Create(streamFactories); } public Task StartAsync(CancellationToken cancellationToken) { diff --git a/src/DataStreamSuite/DataStreamCore/DynamicLoading/CompositeDataStreamFactory.cs b/src/DataStreamSuite/DataStreamCore/DynamicLoading/CompositeDataStreamFactory.cs index 7de5bc194..5a7541b85 100644 --- a/src/DataStreamSuite/DataStreamCore/DynamicLoading/CompositeDataStreamFactory.cs +++ b/src/DataStreamSuite/DataStreamCore/DynamicLoading/CompositeDataStreamFactory.cs @@ -6,11 +6,14 @@ using BCG; using System.Collections.Generic; using System.Linq; -public class CompositeDataStreamFactory : IDataStreamFactory { +class CompositeDataStreamFactory : IDataStreamFactory { readonly List streamFactories; - public CompositeDataStreamFactory(IEnumerable streamFactories) { - this.streamFactories = streamFactories.ToList(); + public CompositeDataStreamFactory(IEnumerable streamFactories) + : this(streamFactories.ToList()) { } + + internal CompositeDataStreamFactory(List streamFactories) { + this.streamFactories = streamFactories; foreach (var rsf in this.streamFactories.OfType()) { rsf.OnCompositeFactory(this); } diff --git a/src/DataStreamSuite/DataStreamPublisher/Services/DataStreamPublisherService.cs b/src/DataStreamSuite/DataStreamPublisher/Services/DataStreamPublisherService.cs index 58d907e85..d97f1ec72 100644 --- a/src/DataStreamSuite/DataStreamPublisher/Services/DataStreamPublisherService.cs +++ b/src/DataStreamSuite/DataStreamPublisher/Services/DataStreamPublisherService.cs @@ -47,10 +47,7 @@ public class DataStreamPublisherService : IHostedService, IDisposable { DataStreamPublisherConfig config ) { this.pubTableBroker = pubTableBroker; - var streamFactoryList = streamFactories.ToList(); - streamFactory = streamFactoryList.Count == 1 - ? streamFactoryList[0] - : new CompositeDataStreamFactory(streamFactoryList); + streamFactory = DataStreamFactory.Create(streamFactories); this.workScheduler = workScheduler; this.config = config; } diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs index 1be592bf1..5dc63d583 100644 --- a/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs +++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/Program.cs @@ -39,9 +39,7 @@ static class Program { try { var (services, runAsync) = init(args); var streamFactoryList = services.GetServices().ToList(); - var streamFactory = streamFactoryList.Count == 1 - ? streamFactoryList[0] - : new CompositeDataStreamFactory(streamFactoryList); + var streamFactory = DataStreamFactory.Create(streamFactoryList); var primitiveManager = streamFactoryList.OfType().Single(); var win = new MainForm(primitiveManager, streamFactory); Application.Run(win); diff --git a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs index 07cccb585..bf5d8834d 100644 --- a/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs +++ b/src/client/spark/Modules/Analytics/AnalyticsShellModule.cs @@ -69,10 +69,7 @@ namespace mbts.spark { ".*", rs => o.OnNext(rs.ToDictionary(r => r.key, r => r.value)))) .Replay(1); - var streamFactoryList = streamFactories.ToList(); - var streamFactory = streamFactoryList.Count == 1 - ? streamFactoryList[0] - : new CompositeDataStreamFactory(streamFactoryList); + var streamFactory = DataStreamFactory.Create(streamFactories); _window_factories = new() { new VolSurfaceWindowFactory(this, bus, user.Value), new AnalyticsExpirationParametersWindowFactory(this, bus),