Compact IManagementClientAPI (Get/Put/Delete/Post)

EasyNetQ · Feb 14, 2024 · c79ee3e · c79ee3e
1 parent d49a9d8
commit c79ee3e
Show file tree

Hide file tree

Showing 16 changed files with 724 additions and 1,006 deletions.
diff --git a/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt b/Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.approved.txt
diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/ReplacementExtensionsGenerator.cs
@@ -76,13 +76,14 @@ private static MethodDeclarationSyntax GenerateReplacementExtensionMethod(
             SyntaxFactory.MemberAccessExpression(
                 SyntaxKind.SimpleMemberAccessExpression,
                 SyntaxFactory.IdentifierName(thisParameter.Identifier.Text),
-                SyntaxFactory.IdentifierName(method.Name)
+                method.GetAccessName()
             ),
             SyntaxFactory.ArgumentList(
                 SyntaxFactory.SeparatedList(argumentExpressions.Select(a => SyntaxFactory.Argument(a))))
         );
 
         return SyntaxFactory.MethodDeclaration(method.ReturnType.GetTypeSyntax(), methodName)
+            .WithTypeParameterList(method.GetTypeParameterListSyntax())
             .AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword))
             .WithParameterList(SyntaxFactory.ParameterList(parameters))
             .WithExpressionBody(SyntaxFactory.ArrowExpressionClause(expression))

diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyncExtensionsGenerator.cs
@@ -67,7 +67,7 @@ private static MethodDeclarationSyntax GenerateSyncExtensionMethod(
             SyntaxFactory.MemberAccessExpression(
                 SyntaxKind.SimpleMemberAccessExpression,
                 SyntaxFactory.IdentifierName(thisParameter.Identifier.Text),
-                SyntaxFactory.IdentifierName(method.Name)
+                method.GetAccessName()
             ),
             SyntaxFactory.ArgumentList(
                 SyntaxFactory.SeparatedList(argumentExpressions.Select(a => SyntaxFactory.Argument(a))))
@@ -90,6 +90,7 @@ private static MethodDeclarationSyntax GenerateSyncExtensionMethod(
         method.IsAwaitable(out var awaitableResultType);
 
         return SyntaxFactory.MethodDeclaration(awaitableResultType!.GetTypeSyntax(), methodName)
+            .WithTypeParameterList(method.GetTypeParameterListSyntax())
             .AddModifiers(SyntaxFactory.Token(SyntaxKind.PublicKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword))
             .WithParameterList(SyntaxFactory.ParameterList(parameters))
             .WithExpressionBody(SyntaxFactory.ArrowExpressionClause(expression))

diff --git a/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs b/Source/EasyNetQ.Management.Client.ExtensionsGenerator/SyntaxExtensions.cs
@@ -23,4 +23,22 @@ public static SeparatedSyntaxList<ParameterSyntax> GetParameterListSyntax(this I
     {
         return (SyntaxFactory.ParseMemberDeclaration(method.ToDisplayString(MethodDisplayFormat)) as MethodDeclarationSyntax)!.ParameterList.Parameters;
     }
+
+    public static TypeParameterListSyntax? GetTypeParameterListSyntax(this IMethodSymbol method)
+    {
+        return (SyntaxFactory.ParseMemberDeclaration(method.ToDisplayString(MethodDisplayFormat)) as MethodDeclarationSyntax)!.TypeParameterList;
+    }
+
+    public static SimpleNameSyntax GetAccessName(this IMethodSymbol method)
+    {
+        if (method.IsGenericMethod)
+        {
+            var arguments = method.GetTypeParameterListSyntax()!.Parameters.Select(typeParameter => SyntaxFactory.IdentifierName(typeParameter.Identifier));
+            return SyntaxFactory.GenericName(method.Name).WithTypeArgumentList(SyntaxFactory.TypeArgumentList(SyntaxFactory.SeparatedList<TypeSyntax>(arguments)));
+        }
+        else
+        {
+            return SyntaxFactory.IdentifierName(method.Name);
+        }
+    }
 }
diff --git a/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs b/Source/EasyNetQ.Management.Client.IntegrationTests/ManagementClientTests.cs
@@ -1215,11 +1215,39 @@ public async Task Should_get_queues()
     }
 
     [Fact]
-    public async Task Should_get_queues_without_stats()
+    public async Task Should_get_queues_with_stats_criteria()
     {
-        await CreateTestQueue(TestQueue);
-        var queues = await fixture.ManagementClient.GetQueuesWithoutStatsAsync();
-        queues.Should().NotBeNullOrEmpty();
+        var queue = await CreateTestQueue(TestQueue);
+
+        var publishInfo = new PublishInfo(
+            TestQueue,
+            "Hello World",
+            PayloadEncoding.String,
+            new Dictionary<string, object?>
+            {
+                { "app_id", "management-test" }
+            }
+        );
+
+        await fixture.ManagementClient.PublishAsync("/", "amq.default", publishInfo);
+        Queue queueWithStats;
+        do
+        {
+            queueWithStats = (await fixture.ManagementClient.GetQueuesAsync()).Single(q => q.Name == TestQueue);
+        } while (queueWithStats.Messages == 0);
+        queueWithStats.Messages.Should().Be(1);
+        queueWithStats.MessagesDetails.Should().NotBeNull();
+        queueWithStats.MessageStats.Should().NotBeNull();
+
+        var queueWithoutStats = (await fixture.ManagementClient.GetQueuesAsync(StatsCriteria.Disable)).Single(q => q.Name == TestQueue);
+        queueWithoutStats.Messages.Should().Be(0);
+        queueWithoutStats.MessagesDetails.Should().BeNull();
+        queueWithoutStats.MessageStats.Should().BeNull();
+
+        var queueWithTotalsOnly = (await fixture.ManagementClient.GetQueuesAsync(StatsCriteria.QueueTotalsOnly)).Single(q => q.Name == TestQueue);
+        queueWithTotalsOnly.Messages.Should().Be(1);
+        queueWithTotalsOnly.MessagesDetails.Should().BeNull();
+        queueWithTotalsOnly.MessageStats.Should().BeNull();
     }