refactor: Make CompositeDataStreamFactory class internal
This commit is contained in:
1 parent
619be37379
commit
f07d83e7bb
6 files changed
+11
-22
No files matched your search
+1
-4
@@ -12,10 +12,7 @@ public class DataStreamSubscriptionController : ControllerBase {
|
||||
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger, IEnumerable<IDataStreamFactory> 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")]
|
||||
|
||||
@@ -63,10 +63,7 @@ namespace BCG {
|
||||
public RemoteQueryManager(IManagedSubscriber managedSubscriber, IPubTableBroker pubTableBroker, IEnumerable<IDataStreamFactory> 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) {
|
||||
|
||||
@@ -6,11 +6,14 @@ using BCG;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
public class CompositeDataStreamFactory : IDataStreamFactory {
|
||||
class CompositeDataStreamFactory : IDataStreamFactory {
|
||||
readonly List<IDataStreamFactory> streamFactories;
|
||||
|
||||
public CompositeDataStreamFactory(IEnumerable<IDataStreamFactory> streamFactories) {
|
||||
this.streamFactories = streamFactories.ToList();
|
||||
public CompositeDataStreamFactory(IEnumerable<IDataStreamFactory> streamFactories)
|
||||
: this(streamFactories.ToList()) { }
|
||||
|
||||
internal CompositeDataStreamFactory(List<IDataStreamFactory> streamFactories) {
|
||||
this.streamFactories = streamFactories;
|
||||
foreach (var rsf in this.streamFactories.OfType<IRecursiveDataStreamFactory>()) {
|
||||
rsf.OnCompositeFactory(this);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -39,9 +39,7 @@ static class Program {
|
||||
try {
|
||||
var (services, runAsync) = init(args);
|
||||
var streamFactoryList = services.GetServices<IDataStreamFactory>().ToList();
|
||||
var streamFactory = streamFactoryList.Count == 1
|
||||
? streamFactoryList[0]
|
||||
: new CompositeDataStreamFactory(streamFactoryList);
|
||||
var streamFactory = DataStreamFactory.Create(streamFactoryList);
|
||||
var primitiveManager = streamFactoryList.OfType<PrimitiveManager>().Single();
|
||||
var win = new MainForm(primitiveManager, streamFactory);
|
||||
Application.Run(win);
|
||||
|
||||
@@ -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),
|
||||
|
||||
Reference in new issue
Block a user