Moved frame creation methods into Sessions to further break logic bet…

…ween the socket and the MqSessions.
Dtronix · Sep 11, 2016 · 8311936 · 8311936
1 parent 02e8028
commit 8311936
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 52 deletions.
diff --git a/DtronixMessageQueue.Tests/MqClientTests.cs b/DtronixMessageQueue.Tests/MqClientTests.cs
@@ -76,8 +76,8 @@ public void Client_does_not_send_empty_message() {
 
 		[Fact]
 		public void Client_does_not_notify_on_command_frame() {
-			var command_frame = Client.CreateFrame(new byte[21]);
-			command_frame.FrameType = MqFrameType.Command;
+
+			var command_frame = new MqFrame(new byte[21], MqFrameType.Command, Config);
 
 			Client.Connected += (sender, args) => {
 				Client.Send(command_frame);
@@ -96,7 +96,7 @@ public void Client_does_not_notify_on_command_frame() {
 
 		[Fact]
 		public void Client_does_not_notify_on_ping_frame() {
-			var command_frame = Client.CreateFrame(null, MqFrameType.Ping);
+			var command_frame = new MqFrame(null, MqFrameType.Ping, Config);
 
 			Client.Connected += (sender, args) => {
 				Client.Send(command_frame);

diff --git a/DtronixMessageQueue/MqClient.cs b/DtronixMessageQueue/MqClient.cs
@@ -27,7 +27,6 @@ public class MqClient<TSession> : SocketClient<TSession>
 		/// </summary>
 		private readonly Timer timeout_timer;
 
-
 		/// <summary>
 		/// Initializes a new instance of a message queue.
 		/// </summary>
@@ -66,7 +65,7 @@ protected override void OnClose(TSession session, SocketCloseReason reason) {
 		/// </summary>
 		/// <param name="state">Concurrent dictionary of the sessions.</param>
 		private void TimeoutCallback(object state) {
-			Session.Send(CreateFrame(null, MqFrameType.Ping));
+			Session.Send(Session.CreateFrame(null, MqFrameType.Ping));
 		}
 
 		/// <summary>

diff --git a/DtronixMessageQueue/MqSession.cs b/DtronixMessageQueue/MqSession.cs
@@ -240,7 +240,7 @@ public override void Close(SocketCloseReason reason) {
 			if (CurrentState == State.Connected) {
 				CurrentState = State.Closing;
 
-				close_frame = BaseSocket.CreateFrame(new byte[2]);
+				close_frame = CreateFrame(new byte[2]);
 				close_frame.FrameType = MqFrameType.Command;
 
 				close_frame.Write(0, (byte) 0);
@@ -284,6 +284,25 @@ public void Send(MqMessage message) {
 			EnqueueOutgoingMessage(message);
 		}
 
+		/// <summary>
+		/// Creates a frame with the specified bytes and the current configurations.
+		/// </summary>
+		/// <param name="bytes">Bytes to put in the frame.</param>
+		/// <returns>Configured frame.</returns>
+		public MqFrame CreateFrame(byte[] bytes) {
+			return Utilities.CreateFrame(bytes, MqFrameType.Unset, (MqSocketConfig)Config);
+		}
+
+		/// <summary>
+		/// Creates a frame with the specified bytes and the current configurations.
+		/// </summary>
+		/// <param name="bytes">Bytes to put in the frame.</param>
+		/// <param name="type">Type of frame to create.</param>
+		/// <returns>Configured frame.</returns>
+		public MqFrame CreateFrame(byte[] bytes, MqFrameType type) {
+			return Utilities.CreateFrame(bytes, type, (MqSocketConfig)Config);
+		}
+
 
 		/// <summary>
 		/// Processes an incoming command frame from the connection.

diff --git a/DtronixMessageQueue/Socket/SocketBase.cs b/DtronixMessageQueue/Socket/SocketBase.cs
@@ -109,10 +109,5 @@ protected virtual TSession CreateSession(System.Net.Sockets.Socket socket) {
 			session.Closed += (sender, args) => OnClose(session, args.CloseReason);
 			return session;
 		}
-
-
-		public abstract MqFrame CreateFrame(byte[] bytes);
-
-		public abstract MqFrame CreateFrame(byte[] bytes, MqFrameType type);
 	}
 }
diff --git a/DtronixMessageQueue/Socket/SocketClient.cs b/DtronixMessageQueue/Socket/SocketClient.cs
@@ -56,25 +56,5 @@ public void Connect(IPEndPoint end_point) {
 
 			MainSocket.ConnectAsync(event_arg);
 		}
-
-
-		/// <summary>
-		/// Creates a frame with the specified bytes and the current configurations.
-		/// </summary>
-		/// <param name="bytes">Bytes to put in the frame.</param>
-		/// <returns>Configured frame.</returns>
-		public override MqFrame CreateFrame(byte[] bytes) {
-			return Utilities.CreateFrame(bytes, MqFrameType.Unset, (MqSocketConfig) Config);
-		}
-
-		/// <summary>
-		/// Creates a frame with the specified bytes and the current configurations.
-		/// </summary>
-		/// <param name="bytes">Bytes to put in the frame.</param>
-		/// <param name="type">Type of frame to create.</param>
-		/// <returns>Configured frame.</returns>
-		public override MqFrame CreateFrame(byte[] bytes, MqFrameType type) {
-			return Utilities.CreateFrame(bytes, type, (MqSocketConfig)Config);
-		}
 	}
 }
diff --git a/DtronixMessageQueue/Socket/SocketServer.cs b/DtronixMessageQueue/Socket/SocketServer.cs
@@ -124,27 +124,6 @@ private void RemoveClientEvent(object sender, SessionClosedEventArgs<SocketSessi
 			e.Session.Closed -= RemoveClientEvent;
 		}
 
-		/// <summary>
-		/// Creates a frame with the specified bytes and the current configurations.
-		/// </summary>
-		/// <param name="bytes">Bytes to put in the frame.</param>
-		/// <returns>Configured frame.</returns>
-		public override MqFrame CreateFrame(byte[] bytes) {
-			return Utilities.CreateFrame(bytes, MqFrameType.Unset, (MqSocketConfig)Config);
-		}
-
-		/// <summary>
-		/// Creates a frame with the specified bytes and the current configurations.
-		/// </summary>
-		/// <param name="bytes">Bytes to put in the frame.</param>
-		/// <param name="type">Type of frame to create.</param>
-		/// <returns>Configured frame.</returns>
-		public override MqFrame CreateFrame(byte[] bytes, MqFrameType type) {
-			return Utilities.CreateFrame(bytes, type, (MqSocketConfig)Config);
-		}
-
-
-
 		/// <summary>
 		/// Terminates this server and notify all connected clients.
 		/// </summary>