fixes for getting the samples to work (#570)

* fixes for getting the samples to work * add ut
dapr · Jan 30, 2021 · 7f9d23c · 7f9d23c
1 parent aa41915
commit 7f9d23c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/samples/Client/DaprClient/InvokeServiceGrpcExample.cs b/samples/Client/DaprClient/InvokeServiceGrpcExample.cs
@@ -20,21 +20,21 @@ public override async Task RunAsync(CancellationToken cancellationToken)
         {
             using var client = new DaprClientBuilder().Build();
 
-            Console.WriteLine("Invoking grpc balance");
-            var request = new GetAccountRequest() { Id = "17", };
-            var account = await client.InvokeMethodGrpcAsync<GetAccountRequest, Account>("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<Transaction, Account>("grpcsample", "deposit", data, cancellationToken);
+            var deposit = new GrpcServiceSample.Generated.Transaction() { Id = "17", Amount = 99 };
+            var account = await client.InvokeMethodGrpcAsync<GrpcServiceSample.Generated.Transaction, Account>("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<GetAccountRequest, Account>("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
@@ -129,6 +129,7 @@ private async Task MakePublishRequest(
             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
@@ -36,6 +36,7 @@ public async Task PublishEventAsync_CanPublishTopicWithData()
             var request = await GrpcUtils.GetRequestFromRequestMessageAsync<PublishEventRequest>(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 @@ public async Task PublishEventAsync_CanPublishTopicWithData_WithMetadata()
             var request = await GrpcUtils.GetRequestFromRequestMessageAsync<PublishEventRequest>(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));