Reorder methods

Author: bording

src/ServiceControl.Transports.RabbitMQ/RabbitMQQuery.cs

@@ -40,11 +40,6 @@ public RabbitMQQuery(ILogger<RabbitMQQuery> logger, TimeProvider timeProvider, I
         }
     }
 
-    protected override void InitializeCore(ReadOnlyDictionary<string, string> settings)
-    {
-        Diagnostics.AppendLine("Using settings from connection string");
-    }
-
     public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBrokerQueue brokerQueue, DateOnly startDate, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         var queue = (RabbitMQBrokerQueueDetails)brokerQueue;
@@ -82,34 +77,6 @@ public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBro
         }
     }
 
-    async Task GetRabbitDetails(CancellationToken cancellationToken)
-    {
-        var response = await pipeline.ExecuteAsync(async async => await managementClient.Value.GetOverview(cancellationToken), cancellationToken);
-
-        ValidateResponse(response);
-
-        if (response.Value!.DisableStats)
-        {
-            throw new Exception("The RabbitMQ broker is configured with 'management.disable_stats = true' or 'management_agent.disable_metrics_collector = true' " +
-                "and as a result queue statistics cannot be collected using this tool. Consider changing the configuration of the RabbitMQ broker.");
-        }
-
-        Data["RabbitMQVersion"] = response.Value?.BrokerVersion ?? "Unknown";
-    }
-
-    void ValidateResponse<T>((HttpStatusCode StatusCode, string Reason, T? Value) response)
-    {
-        if (response.StatusCode != HttpStatusCode.OK)
-        {
-            throw new HttpRequestException($"Request failed with status code {response.StatusCode}: {response.Reason}");
-        }
-
-        if (response.Value is null)
-        {
-            throw new InvalidOperationException("Request was successful, but the response body was null when a value was expected");
-        }
-    }
-
     public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCancellation] CancellationToken cancellationToken)
     {
         var page = 1;
@@ -141,6 +108,30 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
         } while (morePages);
     }
 
+    async Task GetRabbitDetails(CancellationToken cancellationToken)
+    {
+        var response = await pipeline.ExecuteAsync(async async => await managementClient.Value.GetOverview(cancellationToken), cancellationToken);
+
+        ValidateResponse(response);
+
+        if (response.Value!.DisableStats)
+        {
+            throw new Exception("The RabbitMQ broker is configured with 'management.disable_stats = true' or 'management_agent.disable_metrics_collector = true' " +
+                "and as a result queue statistics cannot be collected using this tool. Consider changing the configuration of the RabbitMQ broker.");
+        }
+
+        Data["RabbitMQVersion"] = response.Value?.BrokerVersion ?? "Unknown";
+    }
+
+    internal async Task<(List<RabbitMQBrokerQueueDetails>?, bool morePages)> GetPage(int page, CancellationToken cancellationToken)
+    {
+        var (StatusCode, Reason, Value, MorePages) = await pipeline.ExecuteAsync(async token => await managementClient.Value.GetQueues(page, 500, token), cancellationToken);
+
+        ValidateResponse((StatusCode, Reason, Value));
+
+        return (MaterializeQueueDetails(Value), MorePages);
+    }
+
     async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, CancellationToken cancellationToken)
     {
         try
@@ -181,15 +172,6 @@ async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, Can
         }
     }
 
-    internal async Task<(List<RabbitMQBrokerQueueDetails>?, bool morePages)> GetPage(int page, CancellationToken cancellationToken)
-    {
-        var (StatusCode, Reason, Value, MorePages) = await pipeline.ExecuteAsync(async token => await managementClient.Value.GetQueues(page, 500, token), cancellationToken);
-
-        ValidateResponse((StatusCode, Reason, Value));
-
-        return (MaterializeQueueDetails(Value), MorePages);
-    }
-
     static List<RabbitMQBrokerQueueDetails> MaterializeQueueDetails(List<Queue> items)
     {
         var queues = new List<RabbitMQBrokerQueueDetails>();
@@ -201,6 +183,19 @@ static List<RabbitMQBrokerQueueDetails> MaterializeQueueDetails(List<Queue> item
         return queues;
     }
 
+    void ValidateResponse<T>((HttpStatusCode StatusCode, string Reason, T? Value) response)
+    {
+        if (response.StatusCode != HttpStatusCode.OK)
+        {
+            throw new HttpRequestException($"Request failed with status code {response.StatusCode}: {response.Reason}");
+        }
+
+        if (response.Value is null)
+        {
+            throw new InvalidOperationException("Request was successful, but the response body was null when a value was expected");
+        }
+    }
+
     public override KeyDescriptionPair[] Settings => [];
 
     protected override async Task<(bool Success, List<string> Errors)> TestConnectionCore(CancellationToken cancellationToken)
@@ -223,5 +218,7 @@ static List<RabbitMQBrokerQueueDetails> MaterializeQueueDetails(List<Queue> item
             throw new Exception($"Failed to connect to RabbitMQ management API", ex);
         }
     }
+
+    protected override void InitializeCore(ReadOnlyDictionary<string, string> settings) => Diagnostics.AppendLine("Using settings from connection string");
 }