From 2ecd2c6b4936fda6d7f5d7e2cd9d947a3c9dc6ab Mon Sep 17 00:00:00 2001
From: diego <diego@ingesom.com>
Date: Fri, 17 Jun 2022 11:08:09 +0200
Subject: [PATCH] Changes following code review

---
 S7.Net/Types/S7String.cs | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/S7.Net/Types/S7String.cs b/S7.Net/Types/S7String.cs
index 671c8e6..8e67db6 100644
--- a/S7.Net/Types/S7String.cs
+++ b/S7.Net/Types/S7String.cs
@@ -8,11 +8,18 @@ namespace S7.Net.Types
     /// An S7 String has a preceeding 2 byte header containing its capacity and length
     /// </summary>
     public static class S7String
-    {
-        /// <summary>
-        /// The Encoding used when serializing and deserializing S7String (Encoding.ASCII by default)
-        /// </summary>
-        public static Encoding StringEncoding { get; set; }
+    {
+        private static Encoding stringEncoding;
+
+        /// <summary>
+        /// The Encoding used when serializing and deserializing S7String (Encoding.ASCII by default)
+        /// </summary>
+        /// <exception cref="ArgumentNullException">StringEncoding must not be null</exception>
+        public static Encoding StringEncoding
+        {
+            get => stringEncoding ??= Encoding.ASCII;
+            set => stringEncoding = value ?? throw new ArgumentNullException(nameof(StringEncoding));
+        }
 
         /// <summary>
         /// Converts S7 bytes to a string
@@ -35,7 +42,6 @@ namespace S7.Net.Types
 
             try
             {
-                if (StringEncoding == null) StringEncoding = Encoding.ASCII;
                 return StringEncoding.GetString(bytes, 2, length);
             }
             catch (Exception e)
@@ -59,9 +65,8 @@ namespace S7.Net.Types
                 throw new ArgumentNullException(nameof(value));
             }
 
-            if (reservedLength > 254) throw new ArgumentException($"The maximum string length supported is 254.");
-
-            if (StringEncoding == null) StringEncoding = Encoding.ASCII;
+            if (reservedLength > 254) throw new ArgumentException($"The maximum string length supported is 254.");
+
             var bytes = StringEncoding.GetBytes(value);
             if (bytes.Length > reservedLength) throw new ArgumentException($"The provided string length ({bytes.Length} is larger than the specified reserved length ({reservedLength}).");
 
@@ -71,13 +76,5 @@ namespace S7.Net.Types
             buffer[1] = (byte)bytes.Length;
             return buffer;
         }
-
-        /// <summary>
-        /// Initializes default static properties
-        /// </summary>
-        static S7String()
-        {
-            StringEncoding = Encoding.ASCII;
-        }
     }
 }