Resolve Build Warnings

BSVN · May 15, 2024 · b373b4f · b373b4f
1 parent 81fd665
commit b373b4f
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/SmppClient.sln b/SmppClient.sln
@@ -6,6 +6,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmppClient", "Source\SmppCl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmppTestClient", "Test\SmppTestClient\SmppTestClient.csproj", "{0CF6060A-904C-41E8-BCA2-C63114DFFCB0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{DDB3B925-BE16-4ADE-BAC3-1EC27ED74BFE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{AF70F1AF-4C3C-439B-A72A-43EDEBB1054B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,6 +46,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{8CBF9913-5ED6-4C40-8675-385FE08F15AA} = {DDB3B925-BE16-4ADE-BAC3-1EC27ED74BFE}
+		{0CF6060A-904C-41E8-BCA2-C63114DFFCB0} = {AF70F1AF-4C3C-439B-A72A-43EDEBB1054B}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {24DDD7FA-6419-43B9-ACF8-39C4D4E6D3C6}
 	EndGlobalSection

diff --git a/Source/SmppClient/ESMEConnection.cs b/Source/SmppClient/ESMEConnection.cs
@@ -12,11 +12,12 @@ namespace BSN.SmppClient
 {
     /// <summary> Manages a single ESME (Extended Short Message Entity) connection </summary>
     internal class ESMEConnection : IDisposable
-    {
+    {
         #region Delegates
-
+
         /// <summary> Called when a message is received </summary>
-        /// <param name="logKey"></param>
+        /// <param name="logKey"></param>
+        /// <param name="messageType"></param>
         /// <param name="serviceType"></param>
         /// <param name="sourceTon"></param>
         /// <param name="sourceNpi"></param>

diff --git a/Source/SmppClient/ESMEManager.cs b/Source/SmppClient/ESMEManager.cs
@@ -12,11 +12,12 @@ namespace BSN.SmppClient
 {
     /// <summary> Provides ESME (Extended Short Message Entity) Management </summary>
     public class ESMEManager : IDisposable
-    {
+    {
         #region Delegates
-
+
         /// <summary> Called when a message is received </summary>
-        /// <param name="logKey"></param>
+        /// <param name="logKey"></param>
+        /// <param name="messageType"></param>
         /// <param name="serviceType"></param>
         /// <param name="sourceTon"></param>
         /// <param name="sourceNpi"></param>
@@ -247,10 +248,11 @@ public void ConnectionEventConnectionHandler(string logKey, ConnectionEventTypes
             {
                 ConnectionEventHandler(logKey, connectionEventType, message);
             }
-        }
-
+        }
+
         /// <summary> Called when a message is received on a connection </summary>
-        /// <param name="logKey"></param>
+        /// <param name="logKey"></param>
+        /// <param name="messageType"></param>
         /// <param name="serviceType"></param>
         /// <param name="sourceTon"></param>
         /// <param name="sourceNpi"></param>

diff --git a/Source/SmppClient/SmppClient.csproj b/Source/SmppClient/SmppClient.csproj
@@ -112,6 +112,7 @@
 		<Content Include="DataTypes\spSMPP_Pdu_Insert.sql" />
 	</ItemGroup>
 	<ItemGroup>
+		<PackageReference Include="EnterpriseLibrary.Common" Version="6.0.1304" />
 		<PackageReference Include="EnterpriseLibrary.Data" Version="6.0.1304" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
 	</ItemGroup>

diff --git a/Test/SmppTestClient/Program.cs b/Test/SmppTestClient/Program.cs
@@ -9,13 +9,6 @@ namespace SmppTestClient
 {
     class SMSControl
     {
-        #region Properties
-
-        /// <summary> A reference to the esme manager </summary>
-        private static ESMEManager connectionManager = null;
-
-        #endregion
-
         static void Main(string[] args)
         {
             string server = "smscsim.smpp.org";       // IP Address or Name of the server
@@ -26,7 +19,7 @@ static void Main(string[] args)
             DataCodings dataCoding = DataCodings.ASCII; // The encoding to use if Default is returned in any PDU or encoding request
 
             // Create a esme manager to communicate with an ESME
-            connectionManager = new ESMEManager("Test",
+            ESMEManager connectionManager = new ESMEManager("Test",
                                                 shortLongCode,
                                                 new ESMEManager.CONNECTION_EVENT_HANDLER(ConnectionEventHandler),
                                                 new ESMEManager.RECEIVED_MESSAGE_HANDLER(ReceivedMessageHandler),
@@ -56,8 +49,8 @@ static void Main(string[] args)
 
                 Console.Write("\n#>");
 
-                string command = Console.ReadLine();
-                if (command.Length == 0)
+                string? command = Console.ReadLine();
+                if (command == null || command.Length == 0)
                     continue;
 
                 switch (command.Split(' ')[0].ToString())
@@ -68,7 +61,7 @@ static void Main(string[] args)
                         break;
 
                     default:
-                        ProcessCommand(command);
+                        ProcessCommand(connectionManager, command);
                         break;
                 }
 
@@ -82,23 +75,23 @@ static void Main(string[] args)
             }
         }
 
-        private static void ProcessCommand(string command)
+        private static void ProcessCommand(ESMEManager connectionManager, string command)
         {
             string[] parts = command.Split(' ');
 
             switch (parts[0])
             {
                 case "send":
-                    SendMessage(command);
+                    SendMessage(connectionManager, command);
                     break;
 
                 case "query":
-                    QueryMessage(command);
+                    QueryMessage(connectionManager, command);
                     break;
             }
         }
 
-        private static void SendMessage(string command)
+        private static void SendMessage(ESMEManager connectionManager, string command)
         {
             string[] parts = command.Split(' ');
             string phoneNumber = parts[1];
@@ -114,13 +107,11 @@ private static void SendMessage(string command)
 
             // There is a default encoding set for each connection. This is used if the encodeDataCoding is Default
 
-            SubmitSm submitSm = null;
-            SubmitSmResp submitSmResp = null;
-            connectionManager.SendMessage(phoneNumber, null, Ton.National, Npi.ISDN, submitDataCoding, encodeDataCoding, message, out submitSm, out submitSmResp);
+            connectionManager.SendMessage(phoneNumber, null, Ton.National, Npi.ISDN, submitDataCoding, encodeDataCoding, message, out SubmitSm submitSm, out SubmitSmResp submitSmResp);
             Console.Write("submitSm:{0}, submitSmResp:{1}, messageId:{2}", submitSm.DestAddr, submitSmResp.Status, submitSmResp.MessageId);
         }
 
-        private static void QueryMessage(string command)
+        private static void QueryMessage(ESMEManager connectionManager, string command)
         {
             string[] parts = command.Split(' ');
             string messageId = parts[1];
@@ -181,7 +172,7 @@ private static void ConnectionEventHandler(string logKey, ConnectionEventTypes c
                     return null;
                 }
 
-                string connectionString = null; // If null InsertPdu will just log to stdout
+                string? connectionString = null; // If null InsertPdu will just log to stdout
                 int serviceId = 0;              // Internal Id used to track multiple SMSC systems
 
                 PduApp.InsertPdu(logKey, connectionString, serviceId, pduDirectionType, details, pdu.PduData.BreakIntoDataBlocks(4096), out pduHeaderId);

diff --git a/Test/SmppTestClient/SmppTestClient.csproj b/Test/SmppTestClient/SmppTestClient.csproj
@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="EnterpriseLibrary.Common" Version="6.0.1304" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Source\SmppClient\SmppClient.csproj" />
   </ItemGroup>