fix deprecations, fix nullable-enables

hlibman-connamara · Sep 25, 2024 · 9b43428 · 9b43428
1 parent e6db015
commit 9b43428
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 95 deletions.
diff --git a/Examples/Executor/Examples.Executor.csproj b/Examples/Executor/Examples.Executor.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <RootNamespace>Executor</RootNamespace>
     <AssemblyName>Executor</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/Examples/Executor/Executor.cs b/Examples/Executor/Executor.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 using QuickFix;
 using QuickFix.Fields;
@@ -48,7 +45,7 @@ public void OnMessage(QuickFix.FIX40.NewOrderSingle n, SessionID s)
             Price price = new Price(DEFAULT_MARKET_PRICE);
             ClOrdID clOrdID = n.ClOrdID;
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -67,10 +64,10 @@ public void OnMessage(QuickFix.FIX40.NewOrderSingle n, SessionID s)
                 symbol,
                 side,
                 orderQty,
-                new LastShares(orderQty.getValue()),
-                new LastPx(price.getValue()),
-                new CumQty(orderQty.getValue()),
-                new AvgPx(price.getValue()));
+                new LastShares(orderQty.Value),
+                new LastPx(price.Value),
+                new CumQty(orderQty.Value),
+                new AvgPx(price.Value));
 
             exReport.Set(clOrdID);
 
@@ -101,7 +98,7 @@ public void OnMessage(QuickFix.FIX41.NewOrderSingle n, SessionID s)
             Price price = new Price(DEFAULT_MARKET_PRICE);
             ClOrdID clOrdID = n.ClOrdID;
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -121,11 +118,11 @@ public void OnMessage(QuickFix.FIX41.NewOrderSingle n, SessionID s)
                 symbol,
                 side,
                 orderQty,
-                new LastShares(orderQty.getValue()),
-                new LastPx(price.getValue()),
+                new LastShares(orderQty.Value),
+                new LastPx(price.Value),
                 new LeavesQty(0),
-                new CumQty(orderQty.getValue()),
-                new AvgPx(price.getValue()));
+                new CumQty(orderQty.Value),
+                new AvgPx(price.Value));
 
             exReport.Set(clOrdID);
 
@@ -156,7 +153,7 @@ public void OnMessage(QuickFix.FIX42.NewOrderSingle n, SessionID s)
             ClOrdID clOrdID = n.ClOrdID;
             Price price = new Price(DEFAULT_MARKET_PRICE);
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -176,13 +173,13 @@ public void OnMessage(QuickFix.FIX42.NewOrderSingle n, SessionID s)
                 symbol,
                 side,
                 new LeavesQty(0),
-                new CumQty(orderQty.getValue()),
-                new AvgPx(price.getValue()));
+                new CumQty(orderQty.Value),
+                new AvgPx(price.Value));
 
             exReport.Set(clOrdID);
             exReport.Set(orderQty);
-            exReport.Set(new LastShares(orderQty.getValue()));
-            exReport.Set(new LastPx(price.getValue()));
+            exReport.Set(new LastShares(orderQty.Value));
+            exReport.Set(new LastPx(price.Value));
 
             if (n.IsSetAccount())
                 exReport.SetField(n.Account);
@@ -211,7 +208,7 @@ public void OnMessage(QuickFix.FIX43.NewOrderSingle n, SessionID s)
             Price price = new Price(DEFAULT_MARKET_PRICE);
             ClOrdID clOrdID = n.ClOrdID;
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -230,14 +227,14 @@ public void OnMessage(QuickFix.FIX43.NewOrderSingle n, SessionID s)
                 symbol, // Shouldn't be here?
                 side,
                 new LeavesQty(0),
-                new CumQty(orderQty.getValue()),
-                new AvgPx(price.getValue()));
+                new CumQty(orderQty.Value),
+                new AvgPx(price.Value));
 
             exReport.Set(clOrdID);
             exReport.Set(symbol);
             exReport.Set(orderQty);
-            exReport.Set(new LastQty(orderQty.getValue()));
-            exReport.Set(new LastPx(price.getValue()));
+            exReport.Set(new LastQty(orderQty.Value));
+            exReport.Set(new LastPx(price.Value));
 
             if (n.IsSetAccount())
                 exReport.SetField(n.Account);
@@ -266,7 +263,7 @@ public void OnMessage(QuickFix.FIX44.NewOrderSingle n, SessionID s)
             Price price = new Price(DEFAULT_MARKET_PRICE);
             ClOrdID clOrdID = n.ClOrdID;
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -285,14 +282,14 @@ public void OnMessage(QuickFix.FIX44.NewOrderSingle n, SessionID s)
                 symbol, //shouldn't be here?
                 side,
                 new LeavesQty(0),
-                new CumQty(orderQty.getValue()),
-                new AvgPx(price.getValue()));
+                new CumQty(orderQty.Value),
+                new AvgPx(price.Value));
 
             exReport.Set(clOrdID);
             exReport.Set(symbol);
             exReport.Set(orderQty);
-            exReport.Set(new LastQty(orderQty.getValue()));
-            exReport.Set(new LastPx(price.getValue()));
+            exReport.Set(new LastQty(orderQty.Value));
+            exReport.Set(new LastPx(price.Value));
 
             if (n.IsSetAccount())
                 exReport.SetField(n.Account);
@@ -321,7 +318,7 @@ public void OnMessage(QuickFix.FIX50.NewOrderSingle n, SessionID s)
             Price price = new Price(DEFAULT_MARKET_PRICE);
             ClOrdID clOrdID = n.ClOrdID;
 
-            switch (ordType.getValue())
+            switch (ordType.Value)
             {
                 case OrdType.LIMIT:
                     price = n.Price;
@@ -339,14 +336,14 @@ public void OnMessage(QuickFix.FIX50.NewOrderSingle n, SessionID s)
                 new OrdStatus(OrdStatus.FILLED),
                 side,
                 new LeavesQty(0),
-                new CumQty(orderQty.getValue()));
+                new CumQty(orderQty.Value));
 
             exReport.Set(clOrdID);
             exReport.Set(symbol);
             exReport.Set(orderQty);
-            exReport.Set(new LastQty(orderQty.getValue()));
-            exReport.Set(new LastPx(price.getValue()));
-            exReport.Set(new AvgPx(price.getValue()));
+            exReport.Set(new LastQty(orderQty.Value));
+            exReport.Set(new LastPx(price.Value));
+            exReport.Set(new AvgPx(price.Value));
 
             if (n.IsSetAccount())
                 exReport.SetField(n.Account);
@@ -601,4 +598,4 @@ public void OnMessage(QuickFix.FIX50.BusinessMessageReject n, SessionID s) { }
 
         #endregion //MessageCracker overloads
     }
-}
+}
diff --git a/Examples/Executor/Program.cs b/Examples/Executor/Program.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.ConstrainedExecution;
-using System.Text;
 using QuickFix;
 using QuickFix.Logger;
 using QuickFix.Store;

diff --git a/Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj b/Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <RootNamespace>SimpleAcceptor</RootNamespace>
     <AssemblyName>SimpleAcceptor</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/Examples/SimpleAcceptor/Program.cs b/Examples/SimpleAcceptor/Program.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using QuickFix;
 using QuickFix.Logger;
 using QuickFix.Store;
-using QuickFix.Transport;
 
 namespace SimpleAcceptor
 {

diff --git a/Examples/SimpleAcceptor/SimpleAcceptorApp.cs b/Examples/SimpleAcceptor/SimpleAcceptorApp.cs
@@ -1,10 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 using QuickFix;
-using QuickFix.Fields;
 
 namespace SimpleAcceptor
 {
@@ -16,8 +11,6 @@ namespace SimpleAcceptor
 
     public class SimpleAcceptorApp : /*QuickFix.MessageCracker,*/ QuickFix.IApplication
     {
-        #region QuickFix.Application Methods
-
         public void FromApp(Message message, SessionID sessionID)
         {
             Console.WriteLine("IN:  " + message);
@@ -42,6 +35,5 @@ public void ToAdmin(Message message, SessionID sessionID)
         public void OnCreate(SessionID sessionID) { }
         public void OnLogout(SessionID sessionID) { }
         public void OnLogon(SessionID sessionID) { }
-        #endregion
     }
-}
+}
diff --git a/Examples/TradeClient/Examples.TradeClient.csproj b/Examples/TradeClient/Examples.TradeClient.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <RootNamespace>TradeClient</RootNamespace>
     <AssemblyName>TradeClient</AssemblyName>
     <Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>

diff --git a/Examples/TradeClient/Program.cs b/Examples/TradeClient/Program.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using QuickFix.Logger;
 using QuickFix.Store;
 
@@ -45,7 +42,7 @@ static void Main(string[] args)
                 application.Run();
                 initiator.Stop();
             }
-            catch (System.Exception e)
+            catch (Exception e)
             {
                 Console.WriteLine(e.Message);
                 Console.WriteLine(e.StackTrace);