update deprecated function body

awslabs · Dec 1, 2023 · 771549f · 771549f
1 parent ffabd36
commit 771549f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/source/iot/Mqtt5Client.cpp b/source/iot/Mqtt5Client.cpp
@@ -416,8 +416,7 @@ namespace Aws
 
         Mqtt5ClientBuilder &Mqtt5ClientBuilder::WithAckTimeoutSeconds(uint32_t ackTimeoutSec) noexcept
         {
-            m_options->WithAckTimeoutSec(ackTimeoutSec);
-            return *this;
+            return WithAckTimeoutSec(ackTimeoutSec);
         }
 
         Mqtt5ClientBuilder &Mqtt5ClientBuilder::WithSdkName(const Crt::String &sdkName)

diff --git a/source/mqtt/Mqtt5Client.cpp b/source/mqtt/Mqtt5Client.cpp
@@ -355,8 +355,7 @@ namespace Aws
 
             Mqtt5ClientOptions &Mqtt5ClientOptions::WithAckTimeoutSeconds(uint32_t ackTimeoutSec) noexcept
             {
-                m_ackTimeoutSec = ackTimeoutSec;
-                return *this;
+                return WithAckTimeoutSec(ackTimeoutSec);
             }
 
             Mqtt5ClientOptions &Mqtt5ClientOptions::WithAckTimeoutSec(uint32_t ackTimeoutSec) noexcept

diff --git a/source/mqtt/Mqtt5Packets.cpp b/source/mqtt/Mqtt5Packets.cpp
@@ -391,7 +391,7 @@ namespace Aws
 
             const Crt::Optional<uint32_t> &ConnectPacket::getMaximumPacketSizeBytes() const noexcept
             {
-                return m_maximumPacketSizeBytes;
+                return getMaximumPacketSizeToServer();
             }
 
             const Crt::Optional<uint32_t> &ConnectPacket::getMaximumPacketSizeToServer() const noexcept
@@ -841,7 +841,7 @@ namespace Aws
 
             const Crt::Optional<uint32_t> &ConnAckPacket::getSessionExpiryInterval() const noexcept
             {
-                return m_sessionExpiryIntervalSec;
+                return getSessionExpiryIntervalSec();
             }
 
             const Crt::Optional<uint16_t> &ConnAckPacket::getReceiveMaximum() const noexcept
@@ -894,7 +894,7 @@ namespace Aws
 
             const Crt::Optional<uint16_t> &ConnAckPacket::getServerKeepAlive() const noexcept
             {
-                return m_serverKeepAliveSec;
+                return getServerKeepAliveSec();
             }
 
             const Crt::Optional<String> &ConnAckPacket::getResponseInformation() const noexcept
@@ -938,8 +938,7 @@ namespace Aws
             }
             Subscription &Subscription::WithRetain(bool retain) noexcept
             {
-                m_retainAsPublished = retain;
-                return *this;
+                return WithRetainAsPublished(retain);
             }
             Subscription &Subscription::WithRetainAsPublished(bool retain) noexcept
             {
@@ -1233,7 +1232,7 @@ namespace Aws
                 return m_receiveMaximumFromServer;
             }
 
-            uint32_t NegotiatedSettings::getMaximumPacketSizeBytes() const noexcept { return m_maximumPacketSizeBytes; }
+            uint32_t NegotiatedSettings::getMaximumPacketSizeBytes() const noexcept { return getMaximumPacketSizeToServer(); }
 
             uint32_t NegotiatedSettings::getMaximumPacketSizeToServer() const noexcept
             {
@@ -1252,7 +1251,7 @@ namespace Aws
 
             uint16_t NegotiatedSettings::getServerKeepAliveSec() const noexcept { return m_serverKeepAliveSec; }
 
-            uint16_t NegotiatedSettings::getServerKeepAlive() const noexcept { return m_serverKeepAliveSec; }
+            uint16_t NegotiatedSettings::getServerKeepAlive() const noexcept { return getServerKeepAliveSec(); }
 
             bool NegotiatedSettings::getRetainAvailable() const noexcept { return m_retainAvailable; }