Merge pull request #773 from mgatny/continuous-mkts-uint64-seqnums

UInt64 seqnums to support Continous Markets
connamara · Jul 13, 2023 · 8895d8b · 8895d8b
2 parents c4e8171 + d462e4e
commit 8895d8b
Show file tree

Hide file tree

Showing 27 changed files with 480 additions and 283 deletions.
diff --git a/QuickFIXn/Dictionary.cs b/QuickFIXn/Dictionary.cs
@@ -105,6 +105,22 @@ public long GetLong(string key)
             }
         }
 
+        public ulong GetULong(string key)
+        {
+            try
+            {
+                return Convert.ToUInt64(GetString(key));
+            }
+            catch(FormatException)
+            {
+                throw new ConfigError("Incorrect data type");
+            }
+            catch(QuickFIXException)
+            {
+                throw new ConfigError("No value for key: " + key);
+            }
+        }
+
         public double GetDouble(string key)
         {
             try

diff --git a/QuickFIXn/Fields/Converters/AsciiConverter.cs b/QuickFIXn/Fields/Converters/AsciiConverter.cs
@@ -0,0 +1,29 @@
+
+namespace QuickFix.Fields.Converters
+{
+    /// <summary>
+    ///  convert Int64 to/from string
+    /// </summary>
+    public static class AsciiValidator
+    {
+        public const int ASCII_ZERO = 48;
+        public const int ASCII_NINE = 57;
+        public const int ASCII_MINUS = 45;
+
+        /// <summary>
+        /// TODO can we use NumberFormatInfo or NumberStyles to avoid this bit of ASCII hackery?
+        /// Validates that a string looks like number (for use before conversion to an int, ulong, etc.).
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        public static void Validate(string i)
+        {
+            if ((null == i) || (i.Length < 1))
+                throw new FieldConvertError("The argument string cannot be null or empty");
+            int asciiValOfFirstChar = System.Convert.ToInt32(i[0]);
+            if ((asciiValOfFirstChar < ASCII_ZERO) || (asciiValOfFirstChar > ASCII_NINE))
+                if (asciiValOfFirstChar != ASCII_MINUS)
+                    throw new FieldConvertError("Could not convert string to int (" + i + "): The first character must be a digit or a minus sign");
+        }
+    }
+}
diff --git a/QuickFIXn/Fields/Converters/DecimalConverter.cs b/QuickFIXn/Fields/Converters/DecimalConverter.cs
@@ -23,8 +23,8 @@ public static Decimal Convert(string d)
                 if((null == d) || (d.Length < 1))
                     throw new FieldConvertError("The argument string cannot be null or empty");
                 int asciiValOfFirstChar = System.Convert.ToInt32(d[0]);
-                if ((asciiValOfFirstChar < IntConverter.ASCII_ZERO) || (asciiValOfFirstChar > IntConverter.ASCII_NINE))
-                    if (asciiValOfFirstChar != IntConverter.ASCII_MINUS && asciiValOfFirstChar != ASCII_DECIMALPOINT)
+                if ((asciiValOfFirstChar < AsciiValidator.ASCII_ZERO) || (asciiValOfFirstChar > AsciiValidator.ASCII_NINE))
+                    if (asciiValOfFirstChar != AsciiValidator.ASCII_MINUS && asciiValOfFirstChar != ASCII_DECIMALPOINT)
                         throw new FieldConvertError("Could not convert string to decimal (" + d + "): The first character must be a digit, decimal point, or minus sign");
                 return decimal.Parse(d, System.Globalization.NumberStyles.AllowExponent | System.Globalization.NumberStyles.AllowLeadingSign | System.Globalization.NumberStyles.AllowDecimalPoint, System.Globalization.CultureInfo.InvariantCulture);
             }

diff --git a/QuickFIXn/Fields/Converters/IntConverter.cs b/QuickFIXn/Fields/Converters/IntConverter.cs
@@ -6,12 +6,7 @@ namespace QuickFix.Fields.Converters
     /// </summary>
     public static class IntConverter
     {
-        public const int ASCII_ZERO = 48;
-        public const int ASCII_NINE = 57;
-        public const int ASCII_MINUS = 45;
-
         /// <summary>
-        /// TODO can we use NumberFormatInfo or NumberStyles to avoid this bit of ASCII hackery?
         /// Converts string to int.
         /// </summary>
         /// <param name="i"></param>
@@ -20,12 +15,7 @@ public static int Convert(string i)
         {
             try
             {
-                if ((null == i) || (i.Length < 1))
-                    throw new FieldConvertError("The argument string cannot be null or empty");
-                int asciiValOfFirstChar = System.Convert.ToInt32(i[0]);
-                if ((asciiValOfFirstChar < ASCII_ZERO) || (asciiValOfFirstChar > ASCII_NINE))
-                    if (asciiValOfFirstChar != ASCII_MINUS)
-                        throw new FieldConvertError("Could not convert string to int (" + i + "): The first character must be a digit or a minus sign");
+                AsciiValidator.Validate(i);
                 return System.Convert.ToInt32(i);
             }
             catch (System.FormatException e)
@@ -34,7 +24,7 @@ public static int Convert(string i)
             }
             catch (System.OverflowException e)
             {
-                throw new FieldConvertError("Could not convert string to int(" + i + ")", e);
+                throw new FieldConvertError("Could not convert string to int (" + i + ")", e);
             }
         }
 

diff --git a/QuickFIXn/Fields/Converters/ULongConverter.cs b/QuickFIXn/Fields/Converters/ULongConverter.cs
@@ -0,0 +1,39 @@
+
+namespace QuickFix.Fields.Converters
+{
+    /// <summary>
+    ///  convert UInt64 to/from string
+    /// </summary>
+    public static class ULongConverter
+    {
+        /// <summary>
+        /// Converts string to ulong.
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        public static ulong Convert(string i)
+        {
+            try
+            {
+                AsciiValidator.Validate(i);
+                return System.Convert.ToUInt64(i);
+            }
+            catch (System.FormatException e)
+            {
+                throw new FieldConvertError("Could not convert string to ulong (" + i + ")", e);
+            }
+            catch (System.OverflowException e)
+            {
+                throw new FieldConvertError("Could not convert string to ulong (" + i + ")", e);
+            }
+        }
+
+        /// <summary>
+        /// convert ulong to string
+        /// </summary>
+        public static string Convert(System.UInt64 i)
+        {
+            return i.ToString();
+        }
+    }
+}