QRCodeXXX -> WebPaymentXXX. Some refactorings and improved tests.

OpenChargingCloud · Jan 20, 2025 · 993de5f · 993de5f
1 parent 4c7e636
commit 993de5f
Show file tree

Hide file tree

Showing 37 changed files with 3,640 additions and 2,248 deletions.
diff --git a/WWCP_OCPP_Common/WebSockets/OCPPWebSocketServer.cs b/WWCP_OCPP_Common/WebSockets/OCPPWebSocketServer.cs
@@ -104,7 +104,7 @@ public OCPPWebSocketServer(NetworkingNode.INetworkingNode
                                    Boolean                                                         AutoStart                    = true)
 
             : base(NetworkingNode,
-                   HTTPServiceName,
+                   HTTPServiceName ?? DefaultHTTPServiceName,
                    IPAddress,
                    TCPPort,
                    Description,

diff --git a/WWCP_OCPPv2.1/DataStructures/Ids/EVSE_Id.cs b/WWCP_OCPPv2.1/DataStructures/Ids/EVSE_Id.cs
@@ -61,7 +61,7 @@ public static Boolean IsNotNullOrEmpty(this EVSE_Id? EVSEId)
         /// <summary>
         /// The nummeric value of the EVSE identification.
         /// </summary>
-        public readonly Byte Value;
+        public readonly UInt16 Value;
 
         #endregion
 
@@ -93,15 +93,15 @@ public readonly UInt64   Length
         /// Create a new EVSE identification based on the given number.
         /// </summary>
         /// <param name="Number">A numeric representation of a display message identification.</param>
-        private EVSE_Id(Byte Number)
+        private EVSE_Id(UInt16 Number)
         {
             this.Value = Number;
         }
 
         #endregion
 
 
-        #region (static) Parse   (Text)
+        #region (static) Parse    (Text)
 
         /// <summary>
         /// Parse the given string as an EVSE identification.
@@ -120,19 +120,7 @@ public static EVSE_Id Parse(String Text)
 
         #endregion
 
-        #region (static) Parse   (Number)
-
-        /// <summary>
-        /// Parse the given number as an EVSE identification.
-        /// </summary>
-        /// <param name="Number">A numeric representation of an EVSE identification.</param>
-        public static EVSE_Id Parse(Byte Number)
-
-            => new (Number);
-
-        #endregion
-
-        #region (static) TryParse(Text)
+        #region (static) TryParse (Text)
 
         /// <summary>
         /// Try to parse the given text as an EVSE identification.
@@ -150,25 +138,7 @@ public static EVSE_Id Parse(Byte Number)
 
         #endregion
 
-        #region (static) TryParse(Number)
-
-        /// <summary>
-        /// Try to parse the given number as an EVSE identification.
-        /// </summary>
-        /// <param name="Number">A numeric representation of an EVSE identification.</param>
-        public static EVSE_Id? TryParse(Byte Number)
-        {
-
-            if (TryParse(Number, out var evseId))
-                return evseId;
-
-            return null;
-
-        }
-
-        #endregion
-
-        #region (static) TryParse(Text,   out EVSEId)
+        #region (static) TryParse (Text,   out EVSEId)
 
         /// <summary>
         /// Try to parse the given text as an EVSE identification.
@@ -181,7 +151,7 @@ public static Boolean TryParse(String Text, out EVSE_Id EVSEId)
             Text = Text.Trim();
 
             if (Text.IsNotNullOrEmpty() &&
-                Byte.TryParse(Text, out var number))
+                UInt16.TryParse(Text, out var number))
             {
                 EVSEId = new EVSE_Id(number);
                 return true;
@@ -194,14 +164,45 @@ public static Boolean TryParse(String Text, out EVSE_Id EVSEId)
 
         #endregion
 
-        #region (static) TryParse(Number, out EVSEId)
+
+        #region (static) Parse    (Number)
+
+        /// <summary>
+        /// Parse the given number as an EVSE identification.
+        /// </summary>
+        /// <param name="Number">A numeric representation of an EVSE identification.</param>
+        public static EVSE_Id Parse(UInt16 Number)
+
+            => new (Number);
+
+        #endregion
+
+        #region (static) TryParse (Number)
+
+        /// <summary>
+        /// Try to parse the given number as an EVSE identification.
+        /// </summary>
+        /// <param name="Number">A numeric representation of an EVSE identification.</param>
+        public static EVSE_Id? TryParse(UInt16 Number)
+        {
+
+            if (TryParse(Number, out var evseId))
+                return evseId;
+
+            return null;
+
+        }
+
+        #endregion
+
+        #region (static) TryParse (Number, out EVSEId)
 
         /// <summary>
         /// Try to parse the given number as an EVSE identification.
         /// </summary>
         /// <param name="Number">A numeric representation of an EVSE identification.</param>
         /// <param name="EVSEId">The parsed EVSE identification.</param>
-        public static Boolean TryParse(Byte Number, out EVSE_Id EVSEId)
+        public static Boolean TryParse(UInt16 Number, out EVSE_Id EVSEId)
         {
 
             EVSEId = new EVSE_Id(Number);
@@ -212,6 +213,7 @@ public static Boolean TryParse(Byte Number, out EVSE_Id EVSEId)
 
         #endregion
 
+
         #region Clone
 
         /// <summary>