PR feedback

Azure · Apr 20, 2023 · ff3f15b · ff3f15b
1 parent fcd79d3
commit ff3f15b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/iothub/device/src/Pipeline/AmqpTransportHandler.cs b/iothub/device/src/Pipeline/AmqpTransportHandler.cs
@@ -31,7 +31,6 @@ internal class AmqpTransportHandler : TransportHandlerBase
 
         internal IotHubConnectionCredentials _connectionCredentials;
 
-        private static readonly TimeSpan s_twinResponseTimeout = TimeSpan.FromMinutes(2);
         private bool _closed;
 
         static AmqpTransportHandler()
@@ -527,7 +526,7 @@ private void RemoveOldOperations(object state)
         {
             if (state is not TimeSpan maxAge)
             {
-                maxAge = s_twinResponseTimeout;
+                maxAge = TwinResponseTimeout;
             }
 
             if (Logging.IsEnabled)

diff --git a/iothub/device/src/Pipeline/MqttTransportHandler.cs b/iothub/device/src/Pipeline/MqttTransportHandler.cs
@@ -102,8 +102,6 @@ internal sealed class MqttTransportHandler : TransportHandlerBase, IDisposable
         // Timer to check if any expired messages exist. The timer is executed after each hour of execution.
         private readonly Timer _twinTimeoutTimer;
 
-        private static TimeSpan s_twinResponseTimeout = TimeSpan.FromMinutes(2);
-
         private bool _isSubscribedToTwinResponses;
 
         private readonly string _deviceId;
@@ -313,7 +311,7 @@ public override async Task OpenAsync(CancellationToken cancellationToken)
                     _mqttClient.ApplicationMessageReceivedAsync += HandleReceivedMessageAsync;
 
                     // The timer would invoke callback in the specified time and that duration thereafter.
-                    _twinTimeoutTimer.Change(s_twinResponseTimeout, s_twinResponseTimeout);
+                    _twinTimeoutTimer.Change(TwinResponseTimeout, TwinResponseTimeout);
                 }
                 catch (MqttConnectingFailedException ex)
                 {
@@ -1355,7 +1353,7 @@ private void RemoveOldOperations(object state)
         {
             if (state is not TimeSpan maxAge)
             {
-                maxAge = s_twinResponseTimeout;
+                maxAge = TwinResponseTimeout;
             }
 
             if (Logging.IsEnabled)

diff --git a/iothub/device/src/Pipeline/TransportHandlerBase.cs b/iothub/device/src/Pipeline/TransportHandlerBase.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Devices.Client.Transport
@@ -17,6 +18,8 @@ protected TransportHandlerBase(PipelineContext context, IDelegatingHandler nextH
         {
         }
 
+        protected static TimeSpan TwinResponseTimeout { get; } = TimeSpan.FromHours(1);
+
         public override Task WaitForTransportClosedAsync()
         {
             _transportShouldRetry = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);

diff --git a/iothub/device/src/Serialization/SystemTestJsonPayloadConvention.cs b/iothub/device/src/Serialization/SystemTestJsonPayloadConvention.cs
@@ -19,7 +19,7 @@ private SystemTextJsonPayloadConvention() { }
         /// <summary>
         /// A static instance of this class.
         /// </summary>
-        public static SystemTextJsonPayloadConvention Instance => new();
+        public static SystemTextJsonPayloadConvention Instance { get; } = new();
 
         /// <inheritdoc/>
         public override string ContentType => "application/json";