Merge branch 'master' into improvements-dapr-client

dapr · Oct 24, 2024 · 9903a1d · 9903a1d
2 parents ac635b3 + 94b97e2
commit 9903a1d
Show file tree

Hide file tree

Showing 26 changed files with 94 additions and 114 deletions.
diff --git a/examples/Actor/ActorClient/Program.cs b/examples/Actor/ActorClient/Program.cs
@@ -85,7 +85,7 @@ public static async Task Main(string[] args)
             var nonRemotingProxy = ActorProxy.Create(actorId, "DemoActor");
             await nonRemotingProxy.InvokeMethodAsync("TestNoArgumentNoReturnType");
             await nonRemotingProxy.InvokeMethodAsync("SaveData", data);
-            var res = await nonRemotingProxy.InvokeMethodAsync<MyData>("GetData");
+            await nonRemotingProxy.InvokeMethodAsync<MyData>("GetData");
 
             Console.WriteLine("Registering the timer and reminder");
             await proxy.RegisterTimer();

diff --git a/examples/AspNetCore/RoutingSample/Startup.cs b/examples/AspNetCore/RoutingSample/Startup.cs
@@ -221,7 +221,6 @@ await JsonSerializer.SerializeAsync(context.Response.Body,
 
             async Task ViewErrorMessage(HttpContext context)
             {
-                var client = context.RequestServices.GetRequiredService<DaprClient>();
                 var transaction = await JsonSerializer.DeserializeAsync<Transaction>(context.Request.Body, serializerOptions);
 
                 logger.LogInformation("The amount cannot be negative: {0}", transaction.Amount);

diff --git a/examples/GeneratedActor/ActorClient/Program.cs b/examples/GeneratedActor/ActorClient/Program.cs
@@ -23,7 +23,7 @@
 
 var client = new ClientActorClient(proxy);
 
-var state = await client.GetStateAsync(cancellationTokenSource.Token);
+await client.GetStateAsync(cancellationTokenSource.Token);
 
 await client.SetStateAsync(new ClientState("Hello, World!"), cancellationTokenSource.Token);
 

diff --git a/examples/Workflow/WorkflowUnitTest/OrderProcessingTests.cs b/examples/Workflow/WorkflowUnitTest/OrderProcessingTests.cs
@@ -64,7 +64,7 @@ public async Task TestInsufficientInventory()
                 .Returns(Task.FromResult(inventoryResult));
 
             // Run the workflow directly
-            OrderResult result = await new OrderProcessingWorkflow().RunAsync(mockContext.Object, order);
+            await new OrderProcessingWorkflow().RunAsync(mockContext.Object, order);
 
             // Verify that ReserveInventoryActivity was called with a specific input
             mockContext.Verify(

diff --git a/src/Dapr.Actors.Generators/ActorClientGenerator.cs b/src/Dapr.Actors.Generators/ActorClientGenerator.cs
@@ -112,7 +112,6 @@ public void Execute(GeneratorExecutionContext context)
         {
             try
             {
-                var actorInterfaceTypeName = interfaceSymbol.Name;
                 var fullyQualifiedActorInterfaceTypeName = interfaceSymbol.ToString();
 
                 var attributeData = interfaceSymbol.GetAttributes().Single(a => a.AttributeClass?.Equals(generateActorClientAttributeSymbol, SymbolEqualityComparer.Default) == true);

diff --git a/src/Dapr.Actors/Runtime/ActorManager.cs b/src/Dapr.Actors/Runtime/ActorManager.cs
@@ -229,7 +229,6 @@ internal async Task FireTimerAsync(ActorId actorId, Stream requestBodyStream, Ca
             // Create a Func to be invoked by common method.
             async Task<byte[]> RequestFunc(Actor actor, CancellationToken ct)
             {
-                var actorTypeName = actor.Host.ActorTypeInfo.ActorTypeName;
                 var actorType = actor.Host.ActorTypeInfo.ImplementationType;
                 var methodInfo = actor.GetMethodInfoUsingReflection(actorType, timerData.Callback);
 
@@ -241,7 +240,7 @@ async Task<byte[]> RequestFunc(Actor actor, CancellationToken ct)
                 return default;
             }
 
-            var result = await this.DispatchInternalAsync(actorId, this.timerMethodContext, RequestFunc, cancellationToken);
+            await this.DispatchInternalAsync(actorId, this.timerMethodContext, RequestFunc, cancellationToken);
         }
 
         internal async Task ActivateActorAsync(ActorId actorId)

diff --git a/test/Dapr.Actors.AspNetCore.IntegrationTest/HostingTests.cs b/test/Dapr.Actors.AspNetCore.IntegrationTest/HostingTests.cs
@@ -42,7 +42,7 @@ public void MapActorsHandlers_WithoutAddActors_Throws()
                 // NOTE: in 3.1 TestServer.CreateClient triggers the failure, in 5.0 it's Host.Start
                 using var host = CreateHost<BadStartup>();
                 var server = host.GetTestServer();
-                var client = server.CreateClient();
+                server.CreateClient();
             });
 
             Assert.Equal(

diff --git a/test/Dapr.Actors.Test/ActorCodeBuilderTests.cs b/test/Dapr.Actors.Test/ActorCodeBuilderTests.cs
@@ -32,7 +32,7 @@ public class ActorCodeBuilderTests
         [Fact]
         public void TestBuildActorProxyGenerator()
         {
-            ActorProxyGenerator proxyGenerator = ActorCodeBuilder.GetOrCreateProxyGenerator(typeof(ITestActor));
+            ActorCodeBuilder.GetOrCreateProxyGenerator(typeof(ITestActor));
         }
 
         [Fact]

diff --git a/test/Dapr.Actors.Test/ActorIdTests.cs b/test/Dapr.Actors.Test/ActorIdTests.cs
@@ -115,10 +115,7 @@ public class ActorIdTests
         [InlineData("   ")]
         public void Initialize_New_ActorId_Object_With_Null_Or_Whitespace_Id(string id)
         {
-            Assert.Throws<ArgumentException>(() =>
-            {
-                ActorId actorId = new ActorId(id);
-            });
+            Assert.Throws<ArgumentException>(() => new ActorId(id));
         }
 
         [Theory]

diff --git a/test/Dapr.Actors.Test/Runtime/ActorManagerTests.cs b/test/Dapr.Actors.Test/Runtime/ActorManagerTests.cs
@@ -164,7 +164,7 @@ public async Task DeactivateActorAsync_ExceptionDuringDeactivation_ActorIsRemove
 
             var id = ActorId.CreateRandom();
             await manager.ActivateActorAsync(id);
-            Assert.True(manager.TryGetActorAsync(id, out var actor));
+            Assert.True(manager.TryGetActorAsync(id, out _));
 
             await Assert.ThrowsAsync<InvalidTimeZoneException>(async () =>
             {

diff --git a/test/Dapr.Actors.Test/Runtime/ActorRuntimeOptionsTests.cs b/test/Dapr.Actors.Test/Runtime/ActorRuntimeOptionsTests.cs
@@ -26,8 +26,6 @@ public void TestRegisterActor_SavesActivator()
         {
             var actorType = typeof(TestActor);
             var actorTypeInformation = ActorTypeInformation.Get(actorType, actorTypeName: null);
-            var host = ActorHost.CreateForTest<TestActor>();
-            var actor = new TestActor(host);
 
             var activator = Mock.Of<ActorActivator>();
 

diff --git a/test/Dapr.Actors.Test/Serialization/ActorIdJsonConverterTest.cs b/test/Dapr.Actors.Test/Serialization/ActorIdJsonConverterTest.cs
@@ -50,9 +50,9 @@ public void CanDeserializeActorId()
         {
             var id = ActorId.CreateRandom().GetId();
             var document = $@"
-{{
-    ""actor"": ""{id}""
-}}";
+            {{
+                ""actor"": ""{id}""
+            }}";
 
             var deserialized = JsonSerializer.Deserialize<ActorHolder>(document);
 
@@ -62,11 +62,10 @@ public void CanDeserializeActorId()
         [Fact]
         public void CanDeserializeNullActorId()
         {
-            var id = ActorId.CreateRandom().GetId();
-            var document = $@"
-{{
-    ""actor"": null
-}}";
+            const string document = @"
+            {
+                ""actor"": null
+            }";
 
             var deserialized = JsonSerializer.Deserialize<ActorHolder>(document);
 

diff --git a/test/Dapr.AspNetCore.IntegrationTest/ControllerIntegrationTest.cs b/test/Dapr.AspNetCore.IntegrationTest/ControllerIntegrationTest.cs
@@ -67,7 +67,6 @@ public async Task ModelBinder_GetFromStateEntryWithKeyNotInStateStore_ReturnsNul
             using (var factory = new AppWebApplicationFactory())
             {
                 var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
-                var daprClient = factory.DaprClient;
 
                 var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/controllerwithoutstateentry/test");
                 var response = await httpClient.SendAsync(request);
@@ -142,7 +141,6 @@ public async Task ModelBinder_GetFromStateEntryWithStateEntry_WithKeyNotInStateS
             using (var factory = new AppWebApplicationFactory())
             {
                 var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
-                var daprClient = factory.DaprClient;
 
                 var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/controllerwithstateentry/test");
                 var response = await httpClient.SendAsync(request);
@@ -159,7 +157,6 @@ public async Task ModelBinder_CanGetOutOfTheWayWhenTheresNoBinding()
             using (var factory = new AppWebApplicationFactory())
             {
                 var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
-                var daprClient = factory.DaprClient;
 
                 var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/echo-user?name=jimmy");
                 var response = await httpClient.SendAsync(request);

diff --git a/test/Dapr.AspNetCore.Test/DaprClientBuilderTest.cs b/test/Dapr.AspNetCore.Test/DaprClientBuilderTest.cs
@@ -11,7 +11,7 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-using System;
+using System;
 using System.Text.Json;
 using Dapr.Client;
 using Grpc.Core;
@@ -44,15 +44,15 @@ public void DaprClientBuilder_UsesPropertyNameCaseHandlingAsSpecified()
         public void DaprClientBuilder_UsesThrowOperationCanceledOnCancellation_ByDefault()
         {
             var builder = new DaprClientBuilder();
-            var daprClient = builder.Build();
+
             Assert.True(builder.GrpcChannelOptions.ThrowOperationCanceledOnCancellation);
         }
 
         [Fact]
         public void DaprClientBuilder_DoesNotOverrideUserGrpcChannelOptions()
         {
             var builder = new DaprClientBuilder();
-            var daprClient = builder.UseGrpcChannelOptions(new GrpcChannelOptions()).Build();
+            builder.UseGrpcChannelOptions(new GrpcChannelOptions()).Build();
             Assert.False(builder.GrpcChannelOptions.ThrowOperationCanceledOnCancellation);
         }
 

diff --git a/test/Dapr.Client.Test/DaprApiTokenTest.cs b/test/Dapr.Client.Test/DaprApiTokenTest.cs
@@ -35,7 +35,7 @@ public async Task DaprCall_WithApiTokenSet()
             request.Dismiss();
 
             // Get Request and validate
-            var envelope = await request.GetRequestEnvelopeAsync<Autogenerated.GetSecretRequest>();
+            await request.GetRequestEnvelopeAsync<Autogenerated.GetSecretRequest>();
 
             request.Request.Headers.TryGetValues("dapr-api-token", out var headerValues);
             headerValues.Count().Should().Be(1);
@@ -56,7 +56,7 @@ public async Task DaprCall_WithoutApiToken()
             request.Dismiss();
 
             // Get Request and validate
-            var envelope = await request.GetRequestEnvelopeAsync<Autogenerated.GetSecretRequest>();
+            await request.GetRequestEnvelopeAsync<Autogenerated.GetSecretRequest>();
 
             request.Request.Headers.TryGetValues("dapr-api-token", out var headerValues);
             headerValues.Should().BeNull();

diff --git a/test/Dapr.Client.Test/DaprClientTest.InvokeMethodGrpcAsync.cs b/test/Dapr.Client.Test/DaprClientTest.InvokeMethodGrpcAsync.cs
@@ -88,8 +88,7 @@ public async Task InvokeMethodGrpcAsync_CanInvokeMethodWithReturnTypeAndData_Thr
                 Data = Any.Pack(data),
             };
 
-            var response =
-                client.Call<InvokeResponse>()
+            await client.Call<InvokeResponse>()
                 .SetResponse(invokeResponse)
                 .Build();
 
@@ -153,8 +152,7 @@ public async Task InvokeMethodGrpcAsync_CanInvokeMethodWithReturnTypeNoData_Thro
                 Data = Any.Pack(data),
             };
 
-            var response =
-                client.Call<InvokeResponse>()
+            await client.Call<InvokeResponse>()
                 .SetResponse(invokeResponse)
                 .Build();
 
@@ -210,8 +208,7 @@ public async Task InvokeMethodGrpcAsync_CanInvokeMethodWithNoReturnTypeAndData_T
                 Data = Any.Pack(data),
             };
 
-            var response =
-                client.Call<InvokeResponse>()
+            await client.Call<InvokeResponse>()
                 .SetResponse(invokeResponse)
                 .Build();
 
@@ -294,7 +291,7 @@ public async Task InvokeMethodGrpcAsync_WithReturnTypeAndData()
 
             // Validate Response
             var invokedResponse = await request.CompleteWithMessageAsync(response);
-            invokeResponse.Name.Should().Be(invokeResponse.Name);
+            invokedResponse.Name.Should().Be(invokeResponse.Name);
         }
 
         [Fact]

diff --git a/test/Dapr.Client.Test/DistributedLockApiTest.cs b/test/Dapr.Client.Test/DistributedLockApiTest.cs
@@ -60,7 +60,6 @@ public async Task TryLockAsync_WithAllValues_ArgumentVerifierException()
             string lockOwner = "owner1";
             Int32 expiryInSeconds = 0;
             // Get response and validate
-            var invokeResponse = new ArgumentException();
             await Assert.ThrowsAsync<ArgumentException>(async () => await client.Lock(storeName, resourceId, lockOwner, expiryInSeconds));
         }
 

diff --git a/test/Dapr.Client.Test/InvocationHandlerTests.cs b/test/Dapr.Client.Test/InvocationHandlerTests.cs
@@ -123,7 +123,7 @@ public async Task SendAsync_RewritesUri()
             };
 
             var request = new HttpRequestMessage(HttpMethod.Post, uri);
-            var response = await CallSendAsync(handler, request);
+            await CallSendAsync(handler, request);
 
             Assert.Equal("https://localhost:5000/v1.0/invoke/bank/method/accounts/17?", capture.RequestUri?.OriginalString);
             Assert.Null(capture.DaprApiToken);
@@ -148,7 +148,7 @@ public async Task SendAsync_RewritesUri_AndAppId()
             };
 
             var request = new HttpRequestMessage(HttpMethod.Post, uri);
-            var response = await CallSendAsync(handler, request);
+            await CallSendAsync(handler, request);
 
             Assert.Equal("https://localhost:5000/v1.0/invoke/Bank/method/accounts/17?", capture.RequestUri?.OriginalString);
             Assert.Null(capture.DaprApiToken);
@@ -172,7 +172,7 @@ public async Task SendAsync_RewritesUri_AndAddsApiToken()
             };
 
             var request = new HttpRequestMessage(HttpMethod.Post, uri);
-            var response = await CallSendAsync(handler, request);
+            await CallSendAsync(handler, request);
 
             Assert.Equal("https://localhost:5000/v1.0/invoke/bank/method/accounts/17?", capture.RequestUri?.OriginalString);
             Assert.Equal("super-duper-secure", capture.DaprApiToken);

diff --git a/test/Dapr.Client.Test/InvokeBindingApiTest.cs b/test/Dapr.Client.Test/InvokeBindingApiTest.cs
@@ -209,7 +209,7 @@ public async Task InvokeBindingAsync_WrapsJsonException()
                 return await daprClient.InvokeBindingAsync<InvokeRequest, Widget>("test", "test", new InvokeRequest() { RequestParameter = "Hello " });
             });
 
-            var envelope = await request.GetRequestEnvelopeAsync<InvokeBindingRequest>();
+            await request.GetRequestEnvelopeAsync<InvokeBindingRequest>();
             var ex = await Assert.ThrowsAsync<DaprException>(async () => 
             {
                 await request.CompleteWithMessageAsync(response);

diff --git a/test/Dapr.Client.Test/PublishEventApiTest.cs b/test/Dapr.Client.Test/PublishEventApiTest.cs
@@ -142,7 +142,6 @@ public async Task PublishEventAsync_CanPublishTopicWithNoContent()
             request.Dismiss();
 
             var envelope = await request.GetRequestEnvelopeAsync<PublishEventRequest>();
-            var jsonFromRequest = envelope.Data.ToStringUtf8();
 
             envelope.PubsubName.Should().Be(TestPubsubName);
             envelope.Topic.Should().Be("test");
@@ -214,7 +213,6 @@ public async Task PublishEventAsync_CanPublishCloudEventWithNoContent()
         {
             await using var client = TestClient.CreateForDaprClient();
 
-            var publishData = new PublishData() { PublishObjectParameter = "testparam" };
             var cloudEvent = new CloudEvent
             {
                 Source = new Uri("urn:testsource"),

diff --git a/test/Dapr.Client.Test/StateApiTest.cs b/test/Dapr.Client.Test/StateApiTest.cs
@@ -839,8 +839,7 @@ public async Task TrySaveStateAsync_ValidateNonETagErrorThrowsException()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>().Build();
 
             var rpcException = new RpcException(new Status(StatusCode.Internal, "Network Error"));
 
@@ -861,8 +860,8 @@ public async Task TrySaveStateAsync_ValidateETagRelatedExceptionReturnsFalse()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>()
+                .Build();
 
             var rpcException = new RpcException(new Status(StatusCode.Aborted, $"failed saving state in state store testStore"));
             // Setup the mock client to throw an Rpc Exception with the expected details info
@@ -879,8 +878,8 @@ public async Task TrySaveStateAsync_NullEtagThrowsArgumentException()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>()
+                .Build();
 
             await FluentActions.Awaiting(async () => await client.DaprClient.TrySaveStateAsync("test", "test", "testValue", null))
                 .Should().ThrowAsync<ArgumentException>();
@@ -907,8 +906,8 @@ public async Task TryDeleteStateAsync_ValidateNonETagErrorThrowsException()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>()
+                .Build();
 
             var rpcException = new RpcException(new Status(StatusCode.Internal, "Network Error"));
 
@@ -929,8 +928,8 @@ public async Task TryDeleteStateAsync_NullEtagThrowsArgumentException()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>()
+                .Build();
 
             await FluentActions.Awaiting(async () => await client.DaprClient.TryDeleteStateAsync("test", "test", null))
                 .Should().ThrowAsync<ArgumentException>();
@@ -957,8 +956,8 @@ public async Task TryDeleteStateAsync_ValidateETagRelatedExceptionReturnsFalse()
         {
             var client = new MockClient();
 
-            var response = client.CallStateApi<string>()
-            .Build();
+            await client.CallStateApi<string>()
+                .Build();
 
             var rpcException = new RpcException(new Status(StatusCode.Aborted, $"failed deleting state with key test"));
             // Setup the mock client to throw an Rpc Exception with the expected details info

diff --git a/test/Dapr.Client.Test/TryLockResponseTest.cs b/test/Dapr.Client.Test/TryLockResponseTest.cs
@@ -47,7 +47,7 @@ public async Task TryLockAsync_WithAllValues_ValidateRequest()
                 Success = true
             };
 
-            var domainResponse = await request.CompleteWithMessageAsync(invokeResponse);
+            await request.CompleteWithMessageAsync(invokeResponse);
 
             //testing unlocking
 

diff --git a/test/Dapr.E2E.Test.Actors.Generators/Clients/GeneratedClientTests.cs b/test/Dapr.E2E.Test.Actors.Generators/Clients/GeneratedClientTests.cs
@@ -100,7 +100,7 @@ public async Task TestGeneratedClientAsync()
 
         var client = new ClientActorClient(actorProxy);
 
-        var result = await client.GetStateAsync(cancellationTokenSource.Token);
+        await client.GetStateAsync(cancellationTokenSource.Token);
 
         await client.SetStateAsync(new ClientState("updated state"), cancellationTokenSource.Token);
     }

diff --git a/test/Dapr.E2E.Test.App/Startup.cs b/test/Dapr.E2E.Test.App/Startup.cs
@@ -120,7 +120,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             var logger = new LoggerConfiguration().WriteTo.File("log.txt").CreateLogger();
 
-            var loggerFactory = LoggerFactory.Create(builder =>
+            LoggerFactory.Create(builder =>
             {
                 builder.AddSerilog(logger);
             });