From 906846775edf4eee64708aa76435f249ba82081f Mon Sep 17 00:00:00 2001
From: Federico Barresi <federico.barresi@evopro-ag.de>
Date: Fri, 5 Jun 2020 12:09:54 +0200
Subject: [PATCH] changed to expression body solution wide

---
 Sharp7.Tests/S7Server.cs | 15 ++-------
 Sharp7/MsgSocket.cs      | 39 ++++------------------
 Sharp7/S7Client.cs       | 70 +++++++---------------------------------
 Sharp7/S7Timer.cs        | 36 +++++----------------
 4 files changed, 30 insertions(+), 130 deletions(-)

diff --git a/Sharp7.Tests/S7Server.cs b/Sharp7.Tests/S7Server.cs
index c4644a7..ca76520 100644
--- a/Sharp7.Tests/S7Server.cs
+++ b/Sharp7.Tests/S7Server.cs
@@ -345,10 +345,7 @@ namespace Sharp7.Tests
                 else
                     return 0;
             }
-            set
-            {
-                Srv_SetMask(server, S7Server.MkLog, value);
-            }
+            set => Srv_SetMask(server, S7Server.MkLog, value);
         }
 
         // Property EventMask R/W
@@ -365,10 +362,7 @@ namespace Sharp7.Tests
                 else
                     return 0;
             }
-            set
-            {
-                Srv_SetMask(server, S7Server.MkEvent, value);
-            }
+            set => Srv_SetMask(server, S7Server.MkEvent, value);
         }
 
 
@@ -395,10 +389,7 @@ namespace Sharp7.Tests
                 else
                     return -1;
             }
-            set
-            {
-                Srv_SetCpuStatus(server, value);
-            }
+            set => Srv_SetCpuStatus(server, value);
         }
 
         // Property Server Status Read Only
diff --git a/Sharp7/MsgSocket.cs b/Sharp7/MsgSocket.cs
index ddefa8d..698a122 100644
--- a/Sharp7/MsgSocket.cs
+++ b/Sharp7/MsgSocket.cs
@@ -160,48 +160,23 @@ namespace Sharp7
             return LastError;
         }
 
-        public bool Connected
-        {
-            get
-            {
-                return (TCPSocket != null) && (TCPSocket.Connected); 
-            }
-        }
+        public bool Connected => (TCPSocket != null) && (TCPSocket.Connected);
 
         public int ReadTimeout
         {
-            get
-            {
-                return _ReadTimeout;
-            }
-            set
-            {
-                _ReadTimeout = value;
-            }
+            get => _ReadTimeout;
+            set => _ReadTimeout = value;
         }
 
         public int WriteTimeout
         {
-            get
-            {
-                return _WriteTimeout;
-            }
-            set
-            {
-                _WriteTimeout = value;
-            }
-
+            get => _WriteTimeout;
+            set => _WriteTimeout = value;
         }
         public int ConnectTimeout
         {
-            get
-            {
-                return _ConnectTimeout;
-            }
-            set
-            {
-                _ConnectTimeout = value;
-            }
+            get => _ConnectTimeout;
+            set => _ConnectTimeout = value;
         }
     }   
 }
diff --git a/Sharp7/S7Client.cs b/Sharp7/S7Client.cs
index be06749..542864d 100644
--- a/Sharp7/S7Client.cs
+++ b/Sharp7/S7Client.cs
@@ -2235,28 +2235,13 @@ namespace Sharp7
 			return Time_ms;
 		}
 
-		public int ExecutionTime
-		{
-			get
-			{
-				return Time_ms;
-			}
-		}
+		public int ExecutionTime => Time_ms;
 
-		public int PduSizeNegotiated
-		{
-			get
-			{
-				return _PDULength;
-			}
-		}
+		public int PduSizeNegotiated => _PDULength;
 
 		public int PduSizeRequested
 		{
-			get
-			{
-				return _PduSizeRequested;
-			}
+			get => _PduSizeRequested;
 			set
 			{
 				if (value < MinPduSizeToRequest)
@@ -2269,60 +2254,29 @@ namespace Sharp7
 
 		public int PLCPort
 		{
-			get
-			{
-				return _PLCPort;
-			}
-			set
-			{
-				_PLCPort = value;
-			}
+			get => _PLCPort;
+			set => _PLCPort = value;
 		}
 
 		public int ConnTimeout
 		{
-			get
-			{
-				return Socket.ConnectTimeout;
-			}
-			set
-			{
-				Socket.ConnectTimeout = value;
-			}
+			get => Socket.ConnectTimeout;
+			set => Socket.ConnectTimeout = value;
 		}
 
 		public int RecvTimeout
 		{
-			get
-			{
-				return Socket.ReadTimeout;
-			}
-			set
-			{
-				Socket.ReadTimeout = value;
-			}
+			get => Socket.ReadTimeout;
+			set => Socket.ReadTimeout = value;
 		}
 
 		public int SendTimeout
 		{
-			get
-			{
-				return Socket.WriteTimeout;
-			}
-			set
-			{
-				Socket.WriteTimeout = value;
-			}
-		}
-
-		public bool Connected
-		{
-			get
-			{
-				return (Socket != null) && (Socket.Connected);
-			}
+			get => Socket.WriteTimeout;
+			set => Socket.WriteTimeout = value;
 		}
 
+		public bool Connected => (Socket != null) && (Socket.Connected);
 
 		#endregion
 	}
diff --git a/Sharp7/S7Timer.cs b/Sharp7/S7Timer.cs
index ef98df6..ac63bde 100644
--- a/Sharp7/S7Timer.cs
+++ b/Sharp7/S7Timer.cs
@@ -51,34 +51,14 @@ namespace Sharp7
 				this.q = (buff[8] & 0x02) == 0x02;
 			}
 		}
-		public TimeSpan PT
-		{
-			get
-			{
-				return pt;
-			}
-		}
-		public TimeSpan ET
-		{
-			get
-			{
-				return et;
-			}
-		}
-		public bool IN
-		{
-			get
-			{
-				return input;
-			}
-		}
-		public bool Q
-		{
-			get
-			{
-				return q;
-			}
-		}
+		public TimeSpan PT => pt;
+
+		public TimeSpan ET => et;
+
+		public bool IN => input;
+
+		public bool Q => q;
+
 		#endregion
 	}
 }
\ No newline at end of file