diff --git a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs index 47a3b9433..8c5129bfb 100644 --- a/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs +++ b/src/DataStreamSuite/DataStream/Offloading/RemoteQueryStream.cs @@ -9,7 +9,7 @@ namespace BCG { [DataStreamUserRespresentation("remoteQuery")] public class RemoteQueryStream : ViewStream { private readonly string _name, _stream_exp; - private PublisherCore _publisher_core = new PublisherCore(); + private PublisherCore _publisher_core = PublisherCore.Create(); private ViewStream _source_str; public RemoteQueryStream(params string[] lines) { diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/PubSubTestStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/PubSubTestStream.cs index 0225ecb7b..2fcb19acb 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/PubSubTestStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/PubSubTestStream.cs @@ -70,7 +70,7 @@ namespace bts private readonly int _msg_size; private readonly TimeSpan _publish_period; private DateTime _last_publish_time = DateTime.MinValue; - private PublisherCore _pub_core = new PublisherCore(); + private PublisherCore _pub_core = PublisherCore.Create(); private BlueTable _table; private int _n_pubs = 0; private readonly int _max_pubs; @@ -224,4 +224,4 @@ namespace bts } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/DataStream/Primitives/Misc/PubsubEchoTestStream.cs b/src/DataStreamSuite/DataStream/Primitives/Misc/PubsubEchoTestStream.cs index 9ff1c491c..c7b1fa8a1 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Misc/PubsubEchoTestStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Misc/PubsubEchoTestStream.cs @@ -123,7 +123,7 @@ namespace bts protected override void myOnFirstSubscriber() { - _pub_core = new PublisherCore(_router); + _pub_core = PublisherCore.Create(_router); _sub_core = new SubscriberCore(_router); _sub_core.subscribe(_tag_name); _vsd.addWorker(this); diff --git a/src/DataStreamSuite/DataStreamCore/Messaging/Publish/PubTableBroker.cs b/src/DataStreamSuite/DataStreamCore/Messaging/Publish/PubTableBroker.cs index 848a087d4..a533b8039 100644 --- a/src/DataStreamSuite/DataStreamCore/Messaging/Publish/PubTableBroker.cs +++ b/src/DataStreamSuite/DataStreamCore/Messaging/Publish/PubTableBroker.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Xml.Serialization; - -using BCG.Utilities; - using bts; using Bts.DataStreamCore; +using System; +using System.Collections.Generic; + namespace BCG { /// /// This class will be used by the clients to publish tabular data to the pubsub @@ -22,7 +17,7 @@ namespace BCG { protected bool myWaitingForFirstOp = false; public PubTableBroker() - : this(new PublisherCore()) { } + : this(PublisherCore.Create()) { } public PubTableBroker(IPublisherCore publisher) { _publisher_core = publisher; diff --git a/src/DataStreamSuite/PubSub/Client/PubSubTagHandlerFactoryConfig.cs b/src/DataStreamSuite/PubSub/Client/PubSubTagHandlerFactoryConfig.cs index 511c7c8ce..94bd2f520 100644 --- a/src/DataStreamSuite/PubSub/Client/PubSubTagHandlerFactoryConfig.cs +++ b/src/DataStreamSuite/PubSub/Client/PubSubTagHandlerFactoryConfig.cs @@ -17,11 +17,6 @@ public class PubSubTagHandlerFactoryConfig { public static PubSubTagHandlerFactoryConfig Default() { return new() { Handlers = new() { - new() { - TagType = string.Empty, - Assembly = "DataStreamCore", - Class = "bts.PubsubServerStreamTagHandler", - }, new() { TagType = DSTagManager.DataStreamTagType, Assembly = "DataStreamCore", @@ -36,7 +31,12 @@ public class PubSubTagHandlerFactoryConfig { TagType = "System_Stats", Assembly = "PubSub", Class = "BCG.SystemStatsPublisher", - } + }, + new() { + TagType = ".*", + Assembly = "DataStreamCore", + Class = "bts.PubsubServerGenericDataHandler", + }, } }; } diff --git a/src/DataStreamSuite/PubSub/PublisherCore.cs b/src/DataStreamSuite/PubSub/PublisherCore.cs index c22ae260a..a8663ca41 100644 --- a/src/DataStreamSuite/PubSub/PublisherCore.cs +++ b/src/DataStreamSuite/PubSub/PublisherCore.cs @@ -43,10 +43,7 @@ namespace BCG { #region constructors - public PublisherCore(IPubSubRouter? router = null, IPubSubTagHandlerFactory? tagHandlerFactory = null, IServiceProvider? serviceProvider = null) { - router ??= new PubSubRouter(); - serviceProvider ??= PubSubServices.ServiceProvider; - tagHandlerFactory ??= new PubsubTagHandlerFactory(serviceProvider, PubSubTagHandlerFactoryConfig.Default()); + public PublisherCore(IPubSubRouter router, IPubSubTagHandlerFactory tagHandlerFactory) { _router = router; _state = new(tagHandlerFactory); Thread pump_thread = new Thread(new ThreadStart(_message_pump)); @@ -54,6 +51,14 @@ namespace BCG { pump_thread.Start(); } + public static PublisherCore Create(IPubSubRouter? router = null, IPubSubTagHandlerFactory? tagHandlerFactory = null, IServiceProvider? serviceProvider = null) { + router ??= new PubSubRouter(); + tagHandlerFactory ??= new PubsubTagHandlerFactory( + serviceProvider ?? PubSubServices.ServiceProvider, + PubSubConfig.Instance.TagHandlerFactory ?? PubSubTagHandlerFactoryConfig.Default()); + return new(router, tagHandlerFactory); + } + public void Dispose() { } #endregion diff --git a/src/DataStreamSuite/PubSub/Services/PubSubServices.cs b/src/DataStreamSuite/PubSub/Services/PubSubServices.cs index 910d3bdd4..82bce671d 100644 --- a/src/DataStreamSuite/PubSub/Services/PubSubServices.cs +++ b/src/DataStreamSuite/PubSub/Services/PubSubServices.cs @@ -114,6 +114,7 @@ public static class PubSubServices { PubSubConfig.SetGlobalConfig(configurationSection.Get() ?? PubSubConfig.Default()); return services.AddGlobalServiceProvider() .AddPubSubRouter(configurationSection.GetSection(nameof(PubSubConfig.Routing))) + .AddTagHandlerFactory(configurationSection.GetSection(nameof(PubSubConfig.TagHandlerFactory))) .AddPublisherCore() .AddSubscriberCore() .AddManagedSubscriber(); diff --git a/src/DataStreamSuite/PubSub/Testing/TestPublisher.cs b/src/DataStreamSuite/PubSub/Testing/TestPublisher.cs index b80778f50..a83755eed 100644 --- a/src/DataStreamSuite/PubSub/Testing/TestPublisher.cs +++ b/src/DataStreamSuite/PubSub/Testing/TestPublisher.cs @@ -1,10 +1,5 @@ -using BCG; - -using bts; - using System; using System.IO; -using System.Runtime.Serialization; namespace BCG { public class TestPubItem : IPubItem { @@ -24,7 +19,7 @@ namespace BCG { } public class TestPublisher { TestPubItem _tbi = new TestPubItem(); - IPublisherCore pcore = new PublisherCore(); + IPublisherCore pcore = PublisherCore.Create(); bool _hit_key_to_send = false; public TestPublisher(bool hit_key_to_send) { _hit_key_to_send = hit_key_to_send; @@ -50,4 +45,4 @@ namespace BCG { } } } -} \ No newline at end of file +}