From e8bd11c0d4b26e99ed8b741af5bc98f0ead1d3e3 Mon Sep 17 00:00:00 2001 From: Grant Birchmeier Date: Thu, 6 Jun 2024 22:34:12 -0500 Subject: [PATCH] delete namesp prefix: QuickFix.SettingisDictionary no longer needed after I renamed QuickFix.Dictionary to QuickFix.SettingsDictionary This commit makes no other changes to these files --- QuickFIXn/SessionFactory.cs | 6 +++--- QuickFIXn/SessionSettings.cs | 14 +++++++------- QuickFIXn/Settings.cs | 12 ++++++------ QuickFIXn/Transport/SocketInitiator.cs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/QuickFIXn/SessionFactory.cs b/QuickFIXn/SessionFactory.cs index ea8bd5a67..0323a5d7a 100755 --- a/QuickFIXn/SessionFactory.cs +++ b/QuickFIXn/SessionFactory.cs @@ -36,7 +36,7 @@ public SessionFactory( _messageFactory = messageFactory ?? new DefaultMessageFactory(); } - private static bool DetectIfInitiator(QuickFix.SettingsDictionary settings) + private static bool DetectIfInitiator(SettingsDictionary settings) { switch (settings.GetString(SessionSettings.CONNECTION_TYPE)) { @@ -46,7 +46,7 @@ private static bool DetectIfInitiator(QuickFix.SettingsDictionary settings) throw new ConfigError("Invalid ConnectionType"); } - public Session Create(SessionID sessionId, QuickFix.SettingsDictionary settings) + public Session Create(SessionID sessionId, SettingsDictionary settings) { bool isInitiator = SessionFactory.DetectIfInitiator(settings); @@ -161,7 +161,7 @@ public Session Create(SessionID sessionId, QuickFix.SettingsDictionary settings) return session; } - protected DataDictionary.DataDictionary CreateDataDictionary(SessionID sessionId, QuickFix.SettingsDictionary settings, string settingsKey, string beginString) + protected DataDictionary.DataDictionary CreateDataDictionary(SessionID sessionId, SettingsDictionary settings, string settingsKey, string beginString) { string path; if (settings.Has(settingsKey)) diff --git a/QuickFIXn/SessionSettings.cs b/QuickFIXn/SessionSettings.cs index e536d9d47..fdddfc395 100755 --- a/QuickFIXn/SessionSettings.cs +++ b/QuickFIXn/SessionSettings.cs @@ -162,7 +162,7 @@ public bool Has(SessionID sessionId) /// Get global default settings /// /// Dictionary of settings from the [DEFAULT] section - public QuickFix.SettingsDictionary Get() + public SettingsDictionary Get() { return _defaults; } @@ -179,10 +179,10 @@ public SettingsDictionary Get(SessionID sessionId) return dict; } - public void Set(QuickFix.SettingsDictionary defaults) + public void Set(SettingsDictionary defaults) { _defaults = defaults; - foreach (KeyValuePair entry in _settings) + foreach (KeyValuePair entry in _settings) entry.Value.Merge(_defaults); } @@ -201,7 +201,7 @@ public bool Remove(SessionID sessionId) /// /// ID of session for which to add config /// session config - public void Set(SessionID sessionId, QuickFix.SettingsDictionary settings) + public void Set(SessionID sessionId, SettingsDictionary settings) { if (Has(sessionId)) throw new ConfigError($"Duplicate Session {sessionId}"); @@ -224,7 +224,7 @@ public void Set(SessionID sessionId, QuickFix.SettingsDictionary settings) public HashSet GetSessions() { HashSet result = new HashSet(); - foreach (KeyValuePair entry in _settings) + foreach (KeyValuePair entry in _settings) result.Add(entry.Key); return result; } @@ -237,7 +237,7 @@ public override string ToString() foreach (System.Collections.Generic.KeyValuePair entry in _defaults) s.Append(entry.Key).Append('=').AppendLine(entry.Value); - foreach (KeyValuePair entry in _settings) + foreach (KeyValuePair entry in _settings) { s.AppendLine().AppendLine("[SESSION]"); foreach (System.Collections.Generic.KeyValuePair kvp in entry.Value) @@ -251,7 +251,7 @@ public override string ToString() return s.ToString(); } - protected void Validate(QuickFix.SettingsDictionary settingsDictionary) + protected void Validate(SettingsDictionary settingsDictionary) { string beginString = settingsDictionary.GetString(BEGINSTRING); if (beginString != Values.BeginString_FIX40 && diff --git a/QuickFIXn/Settings.cs b/QuickFIXn/Settings.cs index 1175ec2f3..eeaf2878b 100755 --- a/QuickFIXn/Settings.cs +++ b/QuickFIXn/Settings.cs @@ -5,11 +5,11 @@ namespace QuickFix { public class Settings { - private readonly LinkedList _sections = new(); + private readonly LinkedList _sections = new(); public Settings(System.IO.TextReader conf) { - QuickFix.SettingsDictionary? currentSection = null; + SettingsDictionary? currentSection = null; string? line; while ((line = conf.ReadLine()) != null) @@ -61,7 +61,7 @@ public static bool IsSection(string s) return s[0] == '[' && s[^1] == ']'; } - public QuickFix.SettingsDictionary Add(QuickFix.SettingsDictionary section) + public SettingsDictionary Add(SettingsDictionary section) { _sections.AddLast(section); return section; @@ -73,10 +73,10 @@ public QuickFix.SettingsDictionary Add(QuickFix.SettingsDictionary section) /// /// (case is ignored) /// - public LinkedList Get(string sectionName) + public LinkedList Get(string sectionName) { - LinkedList result = new(); - foreach (QuickFix.SettingsDictionary dict in _sections) + LinkedList result = new(); + foreach (SettingsDictionary dict in _sections) if (sectionName.ToUpperInvariant() == dict.Name.ToUpperInvariant()) result.AddLast(dict); return result; diff --git a/QuickFIXn/Transport/SocketInitiator.cs b/QuickFIXn/Transport/SocketInitiator.cs index d8e24a430..995a3264e 100644 --- a/QuickFIXn/Transport/SocketInitiator.cs +++ b/QuickFIXn/Transport/SocketInitiator.cs @@ -138,7 +138,7 @@ private void RemoveThread(SessionID sessionId) } } - private IPEndPoint GetNextSocketEndPoint(SessionID sessionId, QuickFix.SettingsDictionary settings) + private IPEndPoint GetNextSocketEndPoint(SessionID sessionId, SettingsDictionary settings) { if (!_sessionToHostNum.TryGetValue(sessionId, out var num)) num = 0;