From 7f9d23cdf50b9bc3ac52444810244cc76dae06c0 Mon Sep 17 00:00:00 2001 From: vinayada1 <28875764+vinayada1@users.noreply.github.com> Date: Fri, 29 Jan 2021 18:40:23 -0800 Subject: [PATCH] fixes for getting the samples to work (#570) * fixes for getting the samples to work * add ut --- .../DaprClient/InvokeServiceGrpcExample.cs | 18 +++++++++--------- src/Dapr.Client/DaprClientGrpc.cs | 1 + test/Dapr.Client.Test/PublishEventApiTest.cs | 2 ++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/samples/Client/DaprClient/InvokeServiceGrpcExample.cs b/samples/Client/DaprClient/InvokeServiceGrpcExample.cs index f43e96cc..9e76b664 100644 --- a/samples/Client/DaprClient/InvokeServiceGrpcExample.cs +++ b/samples/Client/DaprClient/InvokeServiceGrpcExample.cs @@ -20,21 +20,21 @@ namespace Samples.Client { using var client = new DaprClientBuilder().Build(); - Console.WriteLine("Invoking grpc balance"); - var request = new GetAccountRequest() { Id = "17", }; - var account = await client.InvokeMethodGrpcAsync("grpcsample", "getaccount", request, cancellationToken); - Console.WriteLine($"Received grpc balance {account.Balance}"); - Console.WriteLine("Invoking grpc deposit"); - var data = new GrpcServiceSample.Generated.Transaction() { Id = "17", Amount = 99 }; - account = await client.InvokeMethodGrpcAsync("grpcsample", "deposit", data, cancellationToken); + var deposit = new GrpcServiceSample.Generated.Transaction() { Id = "17", Amount = 99 }; + var account = await client.InvokeMethodGrpcAsync("grpcsample", "deposit", deposit, cancellationToken); Console.WriteLine("Returned: id:{0} | Balance:{1}", account.Id, account.Balance); Console.WriteLine("Completed grpc deposit"); Console.WriteLine("Invoking grpc withdraw"); - var withdraw = new Transaction() { Id = "17", Amount = 10, }; - await client.InvokeMethodGrpcAsync("grpcsample", "withdraw", data, cancellationToken); + var withdraw = new GrpcServiceSample.Generated.Transaction() { Id = "17", Amount = 10, }; + await client.InvokeMethodGrpcAsync("grpcsample", "withdraw", withdraw, cancellationToken); Console.WriteLine("Completed grpc withdraw"); + + Console.WriteLine("Invoking grpc balance"); + var request = new GetAccountRequest() { Id = "17", }; + account = await client.InvokeMethodGrpcAsync("grpcsample", "getaccount", request, cancellationToken); + Console.WriteLine($"Received grpc balance {account.Balance}"); } } } diff --git a/src/Dapr.Client/DaprClientGrpc.cs b/src/Dapr.Client/DaprClientGrpc.cs index 1f8e63cc..e10f4ac6 100644 --- a/src/Dapr.Client/DaprClientGrpc.cs +++ b/src/Dapr.Client/DaprClientGrpc.cs @@ -129,6 +129,7 @@ namespace Dapr.Client if (content != null) { envelope.Data = content; + envelope.DataContentType = "application/json"; } if (metadata != null) diff --git a/test/Dapr.Client.Test/PublishEventApiTest.cs b/test/Dapr.Client.Test/PublishEventApiTest.cs index 10b9f09b..90f5b96e 100644 --- a/test/Dapr.Client.Test/PublishEventApiTest.cs +++ b/test/Dapr.Client.Test/PublishEventApiTest.cs @@ -36,6 +36,7 @@ namespace Dapr.Client.Test var request = await GrpcUtils.GetRequestFromRequestMessageAsync(entry.Request); var jsonFromRequest = request.Data.ToStringUtf8(); + request.DataContentType.Should().Be("application/json"); request.PubsubName.Should().Be(TestPubsubName); request.Topic.Should().Be("test"); jsonFromRequest.Should().Be(JsonSerializer.Serialize(publishData, daprClient.JsonSerializerOptions)); @@ -63,6 +64,7 @@ namespace Dapr.Client.Test var request = await GrpcUtils.GetRequestFromRequestMessageAsync(entry.Request); var jsonFromRequest = request.Data.ToStringUtf8(); + request.DataContentType.Should().Be("application/json"); request.PubsubName.Should().Be(TestPubsubName); request.Topic.Should().Be("test"); jsonFromRequest.Should().Be(JsonSerializer.Serialize(publishData, daprClient.JsonSerializerOptions));