Acceptor Dynamic Session Templates

.gitignore

@@ -35,6 +35,7 @@ upload_to_s3.rb
 *~
 *.suo
 .vs/
+.vscode/
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/

AcceptanceTest/at_xml_to_nunit_xml.rb

@@ -58,7 +58,6 @@ class Fixture
     attr_accessor :name, :total, :errors, :failures, :cases
 
     def self.create_from_acceptance_test_xml xml_filename
-        require 'rubygems'
         require 'nokogiri'
 
         fixture = Fixture.new

AcceptanceTest/runat.ps1

@@ -120,6 +120,7 @@ AppDataDictionary=..\spec\fix\FIX50SP1.xml
 "@ | Out-File 'cfg\at.cfg' -Encoding utf8
 
     # Start the acceptor...
+    # (this runs the exe or dll in AcceptanceTest/bin/)
     $AtProcess = Start-Process -FilePath dotnet.exe -ArgumentList "run -c $Configuration -f $Framework --no-build --no-restore -- $Conf" -NoNewWindow -PassThru
 
     if ($UseWsl -and $UseWsl.IsPresent) {

New-Release.ps1

@@ -27,7 +27,7 @@ Write-Host "`nTag Version: $TagVersion`n"
 if ($UseWslRuby -and $UseWslRuby.IsPresent) {
 	wsl ruby scripts\update_assembly_version.rb $TagVersion QuickFIXn\QuickFix.csproj Messages\FIX40\QuickFix.FIX40.csproj Messages\FIX41\QuickFix.FIX41.csproj Messages\FIX42\QuickFix.FIX42.csproj Messages\FIX43\QuickFix.FIX43.csproj Messages\FIX44\QuickFix.FIX44.csproj Messages\FIX50\QuickFix.FIX50.csproj Messages\FIX50SP1\QuickFix.FIX50SP1.csproj Messages\FIX50SP2\QuickFix.FIX50SP2.csproj
 } else {
-	.\ruby scripts\update_assembly_version.rb $TagVersion QuickFIXn\QuickFix.csproj Messages\FIX40\QuickFix.FIX40.csproj Messages\FIX41\QuickFix.FIX41.csproj Messages\FIX42\QuickFix.FIX42.csproj Messages\FIX43\QuickFix.FIX43.csproj Messages\FIX44\QuickFix.FIX44.csproj Messages\FIX50\QuickFix.FIX50.csproj Messages\FIX50SP1\QuickFix.FIX50SP1.csproj Messages\FIX50SP2\QuickFix.FIX50SP2.csproj
+	ruby scripts\update_assembly_version.rb $TagVersion QuickFIXn\QuickFix.csproj Messages\FIX40\QuickFix.FIX40.csproj Messages\FIX41\QuickFix.FIX41.csproj Messages\FIX42\QuickFix.FIX42.csproj Messages\FIX43\QuickFix.FIX43.csproj Messages\FIX44\QuickFix.FIX44.csproj Messages\FIX50\QuickFix.FIX50.csproj Messages\FIX50SP1\QuickFix.FIX50SP1.csproj Messages\FIX50SP2\QuickFix.FIX50SP2.csproj
 }
 
 $ExitCode = $LASTEXITCODE
@@ -38,22 +38,22 @@ if ($ExitCode -eq 0) {
 	Exit $ExitCode
 }
 
-.\git add QuickFIXn\QuickFix.csproj
-.\git add Messages\FIX40\QuickFix.FIX40.csproj
-.\git add Messages\FIX41\QuickFix.FIX41.csproj
-.\git add Messages\FIX42\QuickFix.FIX42.csproj
-.\git add Messages\FIX43\QuickFix.FIX43.csproj
-.\git add Messages\FIX44\QuickFix.FIX44.csproj
-.\git add Messages\FIX50\QuickFix.FIX50.csproj
-.\git add Messages\FIX50SP1\QuickFix.FIX50SP1.csproj
-.\git add Messages\FIX50SP2\QuickFix.FIX50SP2.csproj
-.\git commit -m "version number for version %TAG_VERSION%"
+git add QuickFIXn\QuickFix.csproj
+git add Messages\FIX40\QuickFix.FIX40.csproj
+git add Messages\FIX41\QuickFix.FIX41.csproj
+git add Messages\FIX42\QuickFix.FIX42.csproj
+git add Messages\FIX43\QuickFix.FIX43.csproj
+git add Messages\FIX44\QuickFix.FIX44.csproj
+git add Messages\FIX50\QuickFix.FIX50.csproj
+git add Messages\FIX50SP1\QuickFix.FIX50SP1.csproj
+git add Messages\FIX50SP2\QuickFix.FIX50SP2.csproj
+git commit -m "version number for version %TAG_VERSION%"
 Write-Host '* Version number committed.'
 
-.\git tag -a $TagVersion -m 'Release version $TagVersion'
+git tag -a $TagVersion -m 'Release version $TagVersion'
 Write-Host '* Created tag.'
 
-.\git checkout $TagVersion
+git checkout $TagVersion
 $ExitCode = $LASTEXITCODE
 if ($ExitCode -eq 0) {
 	Write-Host "* Checked out tag $TagVersion"
@@ -65,7 +65,7 @@ if ($ExitCode -eq 0) {
 if ($UsWslRuby -and $UseWslRuby.IsPresent) {
 	wsl ruby generator/generate.rb
 } else {
-	.\ruby generator/generate.rb
+	ruby generator/generate.rb
 }
 
 $ExitCode = $LASTEXITCODE
@@ -91,17 +91,17 @@ if ($ExitCode -eq 0) {
 
 # DO NOT remove quotes around *.nupkg. Due to a bug in older versions of the .NET SDK,
 # without the surrounding quotes, only the first package will be pushed.
-if ($BuildTarget -ieq 'pack') {
-	dotnet nuget push '*.nupkg' -s 'https://api.nuget.org/v3/index.json' -k $NuGetApiKey 'tmp\NuGet'
-}
-
-$ExitCode = $LASTEXITCODE
-if ($ExitCode -eq 0) {
-	Write-Host '* Pushed QuickFIX/n NuGet packages to NuGet.org'
-} else {
-	Write-Error 'A problem occurred while pushing NuGet packages to NuGet.org'
-	Exit $ExitCode
-}
+#if ($BuildTarget -ieq 'pack') {
+#	dotnet nuget push '*.nupkg' -s 'https://api.nuget.org/v3/index.json' -k $NuGetApiKey 'tmp\NuGet'
+#}
+
+#$ExitCode = $LASTEXITCODE
+#if ($ExitCode -eq 0) {
+#	Write-Host '* Pushed QuickFIX/n NuGet packages to NuGet.org'
+#} else {
+#	Write-Error 'A problem occurred while pushing NuGet packages to NuGet.org'
+#	Exit $ExitCode
+#}
 
 @(
 	$QFDir
@@ -140,7 +140,7 @@ Write-Host '* Created zip.'
 if ($UseWslRuby -and $UseWslRuby.IsPresent) {
 	wsl ruby scripts\s3_upload.rb "$QFDir.zip" $AwsAccessKey $AwsSecretKey
 } else {
-	.\ruby scripts\s3_upload.rb "$QFDir.zip" $AwsAccessKey $AwsSecretKey
+	ruby scripts\s3_upload.rb "$QFDir.zip" $AwsAccessKey $AwsSecretKey
 }
 
 $ExitCode = $LASTEXITCODE
@@ -154,7 +154,7 @@ if ($ExitCode -eq 0) {
 Get-ChildItem -Path 'tmp' -Recurse | Remove-Item -Recurse -Force
 Write-Host '* Removed ''tmp'' directory.'
 
-.\git checkout master
+git checkout master
 Write-Host '* Changed back to master.'
 
 Write-Host "`nSuccessfully created QuickFIX/n $TagVersion" -ForegroundColor Green
@@ -164,4 +164,4 @@ if ($NuGetApiKey) {
 }
 Write-Host "You must commit the new tag and deploy the website"
 
-Exit 0
+Exit 0

QuickFIXn/DefaultMessageFactory.cs

@@ -188,7 +188,7 @@ private static ICollection<Assembly> GetAppDomainAssemblies()
             var assemblies = AppDomain
                 .CurrentDomain
                 .GetAssemblies()
-                .Where(assembly => !assembly.IsDynamic)
+                .Where(assembly => !assembly.IsDynamic && assembly.GetName().Name.StartsWith("QuickFix"))
                 .ToList();
             return assemblies;
         }

QuickFIXn/FileLog.cs

@@ -43,23 +43,97 @@ private void Init(string fileLogPath, string prefix)
             eventLog_.AutoFlush = true;
         }
 
+        public const string WILDCARD_FILE_PREFIX = "DS_"; // Dynamic Session
+        public const string WILDCARD_REPLACEMENT = "(ANY)";
+        /// <summary>
+        /// Calculates unique filename prefix from SessionID.
+        /// Handles wildcards in SessionID fields
+        /// </summary>
+        /// <returns>Filename prefix unique for SessioID</returns>
         public static string Prefix(SessionID sessionID)
         {
-            System.Text.StringBuilder prefix = new System.Text.StringBuilder(sessionID.BeginString)
-                .Append('-').Append(sessionID.SenderCompID);
+
+            bool hasWildcard = false;
+
+            System.Text.StringBuilder prefix = new System.Text.StringBuilder();
+            if (Values.WILDCARD_VALUE.Equals(sessionID.BeginString))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT).Append('-');
+            }
+            else prefix.Append(sessionID.BeginString).Append('-');
+            if (Values.WILDCARD_VALUE.Equals(sessionID.SenderCompID))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT);
+            }
+            else prefix.Append(sessionID.SenderCompID);
+
+
             if (SessionID.IsSet(sessionID.SenderSubID))
-                prefix.Append('_').Append(sessionID.SenderSubID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SenderSubID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SenderSubID);
+            }
             if (SessionID.IsSet(sessionID.SenderLocationID))
-                prefix.Append('_').Append(sessionID.SenderLocationID);
-            prefix.Append('-').Append(sessionID.TargetCompID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SenderLocationID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SenderLocationID);
+            }
+            prefix.Append('-');
+            if (Values.WILDCARD_VALUE.Equals(sessionID.TargetCompID))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT);
+            }
+            else prefix.Append(sessionID.TargetCompID);
+
             if (SessionID.IsSet(sessionID.TargetSubID))
-                prefix.Append('_').Append(sessionID.TargetSubID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.TargetSubID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.TargetSubID);
+            }
             if (SessionID.IsSet(sessionID.TargetLocationID))
-                prefix.Append('_').Append(sessionID.TargetLocationID);
-
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.TargetLocationID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.TargetLocationID);
+            }
+            // SessionQualifier now is not allowed for acceptor, so cannot be a wildcard,
+            // still should not hurt to implement wildcard logic for it
             if (SessionID.IsSet(sessionID.SessionQualifier))
-                prefix.Append('-').Append(sessionID.SessionQualifier);
-
+            {
+                prefix.Append('-');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SessionQualifier))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SessionQualifier);
+            }
+            // To guarantee unique file name,
+            // even if someone uses WILDCARD_REPLACEMENT as a part if SessionID
+            if (hasWildcard) return WILDCARD_FILE_PREFIX + prefix.ToString();
+            // No wildcard(s) - no additional prefix 
             return prefix.ToString();
         }
 

QuickFIXn/FileStore.cs

@@ -35,23 +35,97 @@ public MsgDef(long index, int size)
 
         System.Collections.Generic.Dictionary<int, MsgDef> offsets_ = new Dictionary<int, MsgDef>();
 
+        public const string WILDCARD_FILE_PREFIX = "DS_"; // Dynamic Session
+        public const string WILDCARD_REPLACEMENT = "(ANY)";
+        /// <summary>
+        /// Calculates unique filename prefix from SessionID.
+        /// Handles wildcards in SessionID fields
+        /// </summary>
+        /// <returns>Filename prefix unique for SessioID</returns>
         public static string Prefix(SessionID sessionID)
         {
-            System.Text.StringBuilder prefix = new System.Text.StringBuilder(sessionID.BeginString)
-                .Append('-').Append(sessionID.SenderCompID);
+
+            bool hasWildcard = false;
+
+            System.Text.StringBuilder prefix = new System.Text.StringBuilder();
+            if (Values.WILDCARD_VALUE.Equals(sessionID.BeginString))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT).Append('-');
+            }
+            else prefix.Append(sessionID.BeginString).Append('-');
+            if (Values.WILDCARD_VALUE.Equals(sessionID.SenderCompID))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT);
+            }
+            else prefix.Append(sessionID.SenderCompID);
+
+
             if (SessionID.IsSet(sessionID.SenderSubID))
-                prefix.Append('_').Append(sessionID.SenderSubID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SenderSubID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SenderSubID);
+            }
             if (SessionID.IsSet(sessionID.SenderLocationID))
-                prefix.Append('_').Append(sessionID.SenderLocationID);
-            prefix.Append('-').Append(sessionID.TargetCompID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SenderLocationID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SenderLocationID);
+            }
+            prefix.Append('-');
+            if (Values.WILDCARD_VALUE.Equals(sessionID.TargetCompID))
+            {
+                hasWildcard = true;
+                prefix.Append(WILDCARD_REPLACEMENT);
+            }
+            else prefix.Append(sessionID.TargetCompID);
+
             if (SessionID.IsSet(sessionID.TargetSubID))
-                prefix.Append('_').Append(sessionID.TargetSubID);
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.TargetSubID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.TargetSubID);
+            }
             if (SessionID.IsSet(sessionID.TargetLocationID))
-                prefix.Append('_').Append(sessionID.TargetLocationID);
-
+            {
+                prefix.Append('_');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.TargetLocationID))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.TargetLocationID);
+            }
+            // SessionQualifier now is not allowed for acceptor, so cannot be a wildcard,
+            // still should not hurt to implement wildcard logic for it
             if (SessionID.IsSet(sessionID.SessionQualifier))
-                prefix.Append('-').Append(sessionID.SessionQualifier);
-
+            {
+                prefix.Append('-');
+                if (Values.WILDCARD_VALUE.Equals(sessionID.SessionQualifier))
+                {
+                    hasWildcard = true;
+                    prefix.Append(WILDCARD_REPLACEMENT);
+                }
+                else prefix.Append(sessionID.SessionQualifier);
+            }
+            // To guarantee unique file name,
+            // even if someone uses WILDCARD_REPLACEMENT as a part if SessionID
+            if (hasWildcard) return WILDCARD_FILE_PREFIX + prefix.ToString();
+            // No wildcard(s) - no additional prefix 
             return prefix.ToString();
         }