diff --git a/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzerConfig.cs b/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzerConfig.cs
index b31beeef1..d6bab2f6c 100644
--- a/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzerConfig.cs
+++ b/src/DataStreamSuite/DataStreamQueryAnalyzer/DataStreamQueryAnalyzerConfig.cs
@@ -13,29 +13,24 @@ public class DataStreamQueryAnalyzerConfig {
///
/// The login user for sparkd
///
- [JsonPropertyName("user")]
[Option("user", HelpText = "The sparkd login user")]
public string? User { get; set; }
///
/// The login password for sparkd
///
- [JsonPropertyName("password")]
[Option("pass", HelpText = "The sparkd login password")]
public string? Password { get; set; }
///
/// The config server url for sparkd
///
- [JsonPropertyName("sparkd")]
[Option("sparkd", HelpText = "The sparkd config server")]
public string? Sparkd { get; set; }
- [JsonPropertyName("stream_file")]
[Option("stream-file", HelpText = "Stream file to load")]
public string? StreamFile { get; set; }
- [JsonPropertyName("pubsub")]
public PubSubConfig? PubSub { get; set; }
[Option(
diff --git a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs
index 6c1e5be88..765df5a73 100644
--- a/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs
+++ b/src/DataStreamSuite/PubSub/Client/Routing/PubSubRoute.cs
@@ -5,20 +5,13 @@ using mbts.utils;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
namespace BCG;
public class PubSubRoute : IEquatable, IComparable, ICloneable {
- [JsonPropertyName("server_address")]
public string? ServerAddress { get; set; }
-
- [JsonPropertyName("tag")]
public string? TagRegExp { get; set; }
- //route names are used in intermediary code (i.e. while substations are being deployed)
- //so that MC Hammer can advertise them.
- [JsonPropertyName("name")]
public string? Name { get; set; }
static readonly IComparer comparer = new ComparerBuilder() {
diff --git a/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs b/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs
index 2e7ff74a8..78c8f8cb0 100644
--- a/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs
+++ b/src/DataStreamSuite/PubSub/Client/TagTypeToAssembly.cs
@@ -1,69 +1,16 @@
-using System;
using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
namespace BCG {
- [Serializable]
- [JsonConverter(typeof(TagTypeToAssemblyJsonConverter))]
public class TagTypeToAssembly {
- //[Serializable]
public class Entry {
- public string handlerClass = "BCG.PubSubServerTagHandler";
-
- public string assembly = Path.Combine(
- Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!,
- "DataStreamCore.dll");
+ public string? HandlerClass { get; set; }
+ public string? Assembly { get; set; }
public override string ToString() {
- return $"handlerClass: {handlerClass} assembly: {assembly}";
+ return $"handlerClass: {HandlerClass} assembly: {Assembly}";
}
}
- public Entry[]? entries = new Entry[] { new Entry() };
- }
-
- public class TagTypeToAssemblyJsonConverter : JsonConverter {
- public override TagTypeToAssembly? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
- new() {
- entries = JsonSerializer.Deserialize>(ref reader, options)?.ToArray()
- };
-
- public override void Write(Utf8JsonWriter writer, TagTypeToAssembly value, JsonSerializerOptions options) =>
- throw new NotImplementedException();
-
- public class EntryJsonConverter : JsonConverter {
- public override TagTypeToAssembly.Entry? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
- var rv = new TagTypeToAssembly.Entry();
- var jsonObj = JsonSerializer.Deserialize(ref reader, options);
- if (jsonObj is null) {
- return null;
- }
- ReadString("handler_class", ref rv.handlerClass);
- ReadString("assembly", ref rv.assembly);
- return rv;
-
- void ReadString(string key, ref string valueOut) {
- if (jsonObj.TryGetPropertyValue(key, out var valueJson)) {
- var valueStr = valueJson?.GetValue();
- // Only (over)write valueOut if non-null
- if (valueStr is not null) {
- valueOut = valueStr;
- }
- }
- }
- }
-
- public override void Write(Utf8JsonWriter writer, TagTypeToAssembly.Entry value, JsonSerializerOptions options) {
- var jsonObj = new JsonObject {
- ["handler_class"] = value.handlerClass,
- ["assembly"] = value.assembly,
- };
- JsonSerializer.Serialize(writer, jsonObj, options);
- }
- }
+ public List? Entries { get; set; }
}
}
diff --git a/src/DataStreamSuite/PubSub/Config/PubSubConfig.cs b/src/DataStreamSuite/PubSub/Config/PubSubConfig.cs
index cf9f39395..08aba5350 100644
--- a/src/DataStreamSuite/PubSub/Config/PubSubConfig.cs
+++ b/src/DataStreamSuite/PubSub/Config/PubSubConfig.cs
@@ -93,4 +93,3 @@ public static class PubSubConfigExtensions {
return Log.notnull(pubSubConfig.SubscriberRoutes);
}
}
-