From b0c603082b35a402c37b2e989cbe7f9dfd509e94 Mon Sep 17 00:00:00 2001
From: Marc Sallin <marc.sallin@outlook.com>
Date: Tue, 25 Aug 2020 00:47:44 +0200
Subject: [PATCH] Rename "QualityOfServiceLevel" to
 SubscriptionQualityOfServiceLevel where appropriated to make the difference
 between the two different QoS fields more clear

---
 Source/MQTTnet/Server/MqttClientConnection.cs        |  2 +-
 .../MqttClientSessionApplicationMessagesQueue.cs     |  2 +-
 .../MQTTnet/Server/MqttQueuedApplicationMessage.cs   | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Source/MQTTnet/Server/MqttClientConnection.cs b/Source/MQTTnet/Server/MqttClientConnection.cs
index 9d10e329..6c95f255 100644
--- a/Source/MQTTnet/Server/MqttClientConnection.cs
+++ b/Source/MQTTnet/Server/MqttClientConnection.cs
@@ -392,7 +392,7 @@ namespace MQTTnet.Server
                     }
 
                     publishPacket = _dataConverter.CreatePublishPacket(queuedApplicationMessage.ApplicationMessage);
-                    publishPacket.QualityOfServiceLevel = queuedApplicationMessage.QualityOfServiceLevel;
+                    publishPacket.QualityOfServiceLevel = queuedApplicationMessage.SubscriptionQualityOfServiceLevel;
 
                     // Set the retain flag to true according to [MQTT-3.3.1-8] and [MQTT-3.3.1-9].
                     publishPacket.Retain = queuedApplicationMessage.IsRetainedMessage;
diff --git a/Source/MQTTnet/Server/MqttClientSessionApplicationMessagesQueue.cs b/Source/MQTTnet/Server/MqttClientSessionApplicationMessagesQueue.cs
index 0cf19c8e..19c4f93d 100644
--- a/Source/MQTTnet/Server/MqttClientSessionApplicationMessagesQueue.cs
+++ b/Source/MQTTnet/Server/MqttClientSessionApplicationMessagesQueue.cs
@@ -27,7 +27,7 @@ namespace MQTTnet.Server
             {
                 ApplicationMessage = applicationMessage,
                 SenderClientId = senderClientId,
-                QualityOfServiceLevel = qualityOfServiceLevel,
+                SubscriptionQualityOfServiceLevel = qualityOfServiceLevel,
                 IsRetainedMessage = isRetainedMessage
             });
         }
diff --git a/Source/MQTTnet/Server/MqttQueuedApplicationMessage.cs b/Source/MQTTnet/Server/MqttQueuedApplicationMessage.cs
index 5a3300ad..635894b3 100644
--- a/Source/MQTTnet/Server/MqttQueuedApplicationMessage.cs
+++ b/Source/MQTTnet/Server/MqttQueuedApplicationMessage.cs
@@ -1,4 +1,5 @@
-using MQTTnet.Protocol;
+using System;
+using MQTTnet.Protocol;
 
 namespace MQTTnet.Server
 {
@@ -10,7 +11,14 @@ namespace MQTTnet.Server
 
         public bool IsRetainedMessage { get; set; }
 
-        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
+        public MqttQualityOfServiceLevel SubscriptionQualityOfServiceLevel { get; set; }
+
+        [Obsolete("Use 'SubscriptionQualityOfServiceLevel' instead.")]
+        public MqttQualityOfServiceLevel QualityOfServiceLevel
+        {
+            get => SubscriptionQualityOfServiceLevel;
+            set => SubscriptionQualityOfServiceLevel = value;
+        }
 
         public bool IsDuplicate { get; set; }
     }