Skip to content
Snippets Groups Projects
Commit f22abfbf authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

rename async extension methods for clarity

parent 39a9ec89
No related branches found
No related tags found
No related merge requests found
...@@ -138,7 +138,7 @@ namespace Grpc.Core.Tests ...@@ -138,7 +138,7 @@ namespace Grpc.Core.Tests
helper.ClientStreamingHandler = new ClientStreamingServerMethod<string, string>(async (requestStream, context) => helper.ClientStreamingHandler = new ClientStreamingServerMethod<string, string>(async (requestStream, context) =>
{ {
string result = ""; string result = "";
await requestStream.ForEach(async (request) => await requestStream.ForEachAsync(async (request) =>
{ {
result += request; result += request;
}); });
...@@ -147,7 +147,7 @@ namespace Grpc.Core.Tests ...@@ -147,7 +147,7 @@ namespace Grpc.Core.Tests
}); });
var call = Calls.AsyncClientStreamingCall(helper.CreateClientStreamingCall()); var call = Calls.AsyncClientStreamingCall(helper.CreateClientStreamingCall());
await call.RequestStream.WriteAll(new string[] { "A", "B", "C" }); await call.RequestStream.WriteAllAsync(new string[] { "A", "B", "C" });
Assert.AreEqual("ABC", await call.ResponseAsync); Assert.AreEqual("ABC", await call.ResponseAsync);
} }
...@@ -159,7 +159,7 @@ namespace Grpc.Core.Tests ...@@ -159,7 +159,7 @@ namespace Grpc.Core.Tests
helper.ClientStreamingHandler = new ClientStreamingServerMethod<string, string>(async (requestStream, context) => helper.ClientStreamingHandler = new ClientStreamingServerMethod<string, string>(async (requestStream, context) =>
{ {
barrier.SetResult(null); barrier.SetResult(null);
await requestStream.ToList(); await requestStream.ToListAsync();
return ""; return "";
}); });
......
...@@ -90,7 +90,7 @@ namespace Grpc.Core.Tests ...@@ -90,7 +90,7 @@ namespace Grpc.Core.Tests
{ {
helper.DuplexStreamingHandler = new DuplexStreamingServerMethod<string, string>(async (requestStream, responseStream, context) => helper.DuplexStreamingHandler = new DuplexStreamingServerMethod<string, string>(async (requestStream, responseStream, context) =>
{ {
await requestStream.ToList(); await requestStream.ToListAsync();
context.WriteOptions = new WriteOptions(WriteFlags.NoCompress); context.WriteOptions = new WriteOptions(WriteFlags.NoCompress);
...@@ -122,7 +122,7 @@ namespace Grpc.Core.Tests ...@@ -122,7 +122,7 @@ namespace Grpc.Core.Tests
await call.RequestStream.CompleteAsync(); await call.RequestStream.CompleteAsync();
await call.ResponseStream.ToList(); await call.ResponseStream.ToListAsync();
} }
} }
} }
...@@ -129,7 +129,7 @@ namespace Grpc.Core.Tests ...@@ -129,7 +129,7 @@ namespace Grpc.Core.Tests
}); });
var call = Calls.AsyncServerStreamingCall(helper.CreateServerStreamingCall(), ""); var call = Calls.AsyncServerStreamingCall(helper.CreateServerStreamingCall(), "");
var responses = await call.ResponseStream.ToList(); var responses = await call.ResponseStream.ToListAsync();
CollectionAssert.AreEqual(new[] { "A", "B" }, responses); CollectionAssert.AreEqual(new[] { "A", "B" }, responses);
} }
} }
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Grpc.Core.Utils namespace Grpc.Core.Utils
...@@ -46,7 +45,7 @@ namespace Grpc.Core.Utils ...@@ -46,7 +45,7 @@ namespace Grpc.Core.Utils
/// <summary> /// <summary>
/// Reads the entire stream and executes an async action for each element. /// Reads the entire stream and executes an async action for each element.
/// </summary> /// </summary>
public static async Task ForEach<T>(this IAsyncStreamReader<T> streamReader, Func<T, Task> asyncAction) public static async Task ForEachAsync<T>(this IAsyncStreamReader<T> streamReader, Func<T, Task> asyncAction)
where T : class where T : class
{ {
while (await streamReader.MoveNext()) while (await streamReader.MoveNext())
...@@ -58,7 +57,7 @@ namespace Grpc.Core.Utils ...@@ -58,7 +57,7 @@ namespace Grpc.Core.Utils
/// <summary> /// <summary>
/// Reads the entire stream and creates a list containing all the elements read. /// Reads the entire stream and creates a list containing all the elements read.
/// </summary> /// </summary>
public static async Task<List<T>> ToList<T>(this IAsyncStreamReader<T> streamReader) public static async Task<List<T>> ToListAsync<T>(this IAsyncStreamReader<T> streamReader)
where T : class where T : class
{ {
var result = new List<T>(); var result = new List<T>();
...@@ -73,7 +72,7 @@ namespace Grpc.Core.Utils ...@@ -73,7 +72,7 @@ namespace Grpc.Core.Utils
/// Writes all elements from given enumerable to the stream. /// Writes all elements from given enumerable to the stream.
/// Completes the stream afterwards unless close = false. /// Completes the stream afterwards unless close = false.
/// </summary> /// </summary>
public static async Task WriteAll<T>(this IClientStreamWriter<T> streamWriter, IEnumerable<T> elements, bool complete = true) public static async Task WriteAllAsync<T>(this IClientStreamWriter<T> streamWriter, IEnumerable<T> elements, bool complete = true)
where T : class where T : class
{ {
foreach (var element in elements) foreach (var element in elements)
...@@ -89,7 +88,7 @@ namespace Grpc.Core.Utils ...@@ -89,7 +88,7 @@ namespace Grpc.Core.Utils
/// <summary> /// <summary>
/// Writes all elements from given enumerable to the stream. /// Writes all elements from given enumerable to the stream.
/// </summary> /// </summary>
public static async Task WriteAll<T>(this IServerStreamWriter<T> streamWriter, IEnumerable<T> elements) public static async Task WriteAllAsync<T>(this IServerStreamWriter<T> streamWriter, IEnumerable<T> elements)
where T : class where T : class
{ {
foreach (var element in elements) foreach (var element in elements)
......
...@@ -109,7 +109,7 @@ namespace math.Tests ...@@ -109,7 +109,7 @@ namespace math.Tests
{ {
using (var call = client.Fib(new FibArgs.Builder { Limit = 6 }.Build())) using (var call = client.Fib(new FibArgs.Builder { Limit = 6 }.Build()))
{ {
var responses = await call.ResponseStream.ToList(); var responses = await call.ResponseStream.ToListAsync();
CollectionAssert.AreEqual(new List<long> { 1, 1, 2, 3, 5, 8 }, CollectionAssert.AreEqual(new List<long> { 1, 1, 2, 3, 5, 8 },
responses.ConvertAll((n) => n.Num_)); responses.ConvertAll((n) => n.Num_));
} }
...@@ -151,7 +151,7 @@ namespace math.Tests ...@@ -151,7 +151,7 @@ namespace math.Tests
using (var call = client.Fib(new FibArgs.Builder { Limit = 0 }.Build(), using (var call = client.Fib(new FibArgs.Builder { Limit = 0 }.Build(),
deadline: DateTime.UtcNow.AddMilliseconds(500))) deadline: DateTime.UtcNow.AddMilliseconds(500)))
{ {
var ex = Assert.Throws<RpcException>(async () => await call.ResponseStream.ToList()); var ex = Assert.Throws<RpcException>(async () => await call.ResponseStream.ToListAsync());
// We can't guarantee the status code always DeadlineExceeded. See issue #2685. // We can't guarantee the status code always DeadlineExceeded. See issue #2685.
Assert.Contains(ex.Status.StatusCode, new[] { StatusCode.DeadlineExceeded, StatusCode.Internal }); Assert.Contains(ex.Status.StatusCode, new[] { StatusCode.DeadlineExceeded, StatusCode.Internal });
...@@ -167,7 +167,7 @@ namespace math.Tests ...@@ -167,7 +167,7 @@ namespace math.Tests
var numbers = new List<long> { 10, 20, 30 }.ConvertAll( var numbers = new List<long> { 10, 20, 30 }.ConvertAll(
n => Num.CreateBuilder().SetNum_(n).Build()); n => Num.CreateBuilder().SetNum_(n).Build());
await call.RequestStream.WriteAll(numbers); await call.RequestStream.WriteAllAsync(numbers);
var result = await call.ResponseAsync; var result = await call.ResponseAsync;
Assert.AreEqual(60, result.Num_); Assert.AreEqual(60, result.Num_);
} }
...@@ -185,8 +185,8 @@ namespace math.Tests ...@@ -185,8 +185,8 @@ namespace math.Tests
using (var call = client.DivMany()) using (var call = client.DivMany())
{ {
await call.RequestStream.WriteAll(divArgsList); await call.RequestStream.WriteAllAsync(divArgsList);
var result = await call.ResponseStream.ToList(); var result = await call.ResponseStream.ToListAsync();
CollectionAssert.AreEqual(new long[] { 3, 4, 3 }, result.ConvertAll((divReply) => divReply.Quotient)); CollectionAssert.AreEqual(new long[] { 3, 4, 3 }, result.ConvertAll((divReply) => divReply.Quotient));
CollectionAssert.AreEqual(new long[] { 1, 16, 1 }, result.ConvertAll((divReply) => divReply.Remainder)); CollectionAssert.AreEqual(new long[] { 1, 16, 1 }, result.ConvertAll((divReply) => divReply.Remainder));
......
...@@ -54,7 +54,7 @@ namespace math ...@@ -54,7 +54,7 @@ namespace math
{ {
using (var call = client.Fib(new FibArgs.Builder { Limit = 5 }.Build())) using (var call = client.Fib(new FibArgs.Builder { Limit = 5 }.Build()))
{ {
List<Num> result = await call.ResponseStream.ToList(); List<Num> result = await call.ResponseStream.ToListAsync();
Console.WriteLine("Fib Result: " + string.Join("|", result)); Console.WriteLine("Fib Result: " + string.Join("|", result));
} }
} }
...@@ -70,7 +70,7 @@ namespace math ...@@ -70,7 +70,7 @@ namespace math
using (var call = client.Sum()) using (var call = client.Sum())
{ {
await call.RequestStream.WriteAll(numbers); await call.RequestStream.WriteAllAsync(numbers);
Console.WriteLine("Sum Result: " + await call.ResponseAsync); Console.WriteLine("Sum Result: " + await call.ResponseAsync);
} }
} }
...@@ -85,8 +85,8 @@ namespace math ...@@ -85,8 +85,8 @@ namespace math
}; };
using (var call = client.DivMany()) using (var call = client.DivMany())
{ {
await call.RequestStream.WriteAll(divArgsList); await call.RequestStream.WriteAllAsync(divArgsList);
Console.WriteLine("DivMany Result: " + string.Join("|", await call.ResponseStream.ToList())); Console.WriteLine("DivMany Result: " + string.Join("|", await call.ResponseStream.ToListAsync()));
} }
} }
...@@ -102,7 +102,7 @@ namespace math ...@@ -102,7 +102,7 @@ namespace math
Num sum; Num sum;
using (var sumCall = client.Sum()) using (var sumCall = client.Sum())
{ {
await sumCall.RequestStream.WriteAll(numbers); await sumCall.RequestStream.WriteAllAsync(numbers);
sum = await sumCall.ResponseAsync; sum = await sumCall.ResponseAsync;
} }
......
...@@ -75,7 +75,7 @@ namespace math ...@@ -75,7 +75,7 @@ namespace math
public async Task<Num> Sum(IAsyncStreamReader<Num> requestStream, ServerCallContext context) public async Task<Num> Sum(IAsyncStreamReader<Num> requestStream, ServerCallContext context)
{ {
long sum = 0; long sum = 0;
await requestStream.ForEach(async num => await requestStream.ForEachAsync(async num =>
{ {
sum += num.Num_; sum += num.Num_;
}); });
...@@ -84,10 +84,7 @@ namespace math ...@@ -84,10 +84,7 @@ namespace math
public async Task DivMany(IAsyncStreamReader<DivArgs> requestStream, IServerStreamWriter<DivReply> responseStream, ServerCallContext context) public async Task DivMany(IAsyncStreamReader<DivArgs> requestStream, IServerStreamWriter<DivReply> responseStream, ServerCallContext context)
{ {
await requestStream.ForEach(async divArgs => await requestStream.ForEachAsync(async divArgs => await responseStream.WriteAsync(DivInternal(divArgs)));
{
await responseStream.WriteAsync(DivInternal(divArgs));
});
} }
static DivReply DivInternal(DivArgs args) static DivReply DivInternal(DivArgs args)
......
...@@ -215,7 +215,7 @@ namespace Grpc.IntegrationTesting ...@@ -215,7 +215,7 @@ namespace Grpc.IntegrationTesting
using (var call = client.StreamingInputCall()) using (var call = client.StreamingInputCall())
{ {
await call.RequestStream.WriteAll(bodySizes); await call.RequestStream.WriteAllAsync(bodySizes);
var response = await call.ResponseAsync; var response = await call.ResponseAsync;
Assert.AreEqual(74922, response.AggregatedPayloadSize); Assert.AreEqual(74922, response.AggregatedPayloadSize);
...@@ -237,7 +237,7 @@ namespace Grpc.IntegrationTesting ...@@ -237,7 +237,7 @@ namespace Grpc.IntegrationTesting
using (var call = client.StreamingOutputCall(request)) using (var call = client.StreamingOutputCall(request))
{ {
var responseList = await call.ResponseStream.ToList(); var responseList = await call.ResponseStream.ToListAsync();
foreach (var res in responseList) foreach (var res in responseList)
{ {
Assert.AreEqual(PayloadType.COMPRESSABLE, res.Payload.Type); Assert.AreEqual(PayloadType.COMPRESSABLE, res.Payload.Type);
...@@ -303,7 +303,7 @@ namespace Grpc.IntegrationTesting ...@@ -303,7 +303,7 @@ namespace Grpc.IntegrationTesting
{ {
await call.RequestStream.CompleteAsync(); await call.RequestStream.CompleteAsync();
var responseList = await call.ResponseStream.ToList(); var responseList = await call.ResponseStream.ToListAsync();
Assert.AreEqual(0, responseList.Count); Assert.AreEqual(0, responseList.Count);
} }
Console.WriteLine("Passed!"); Console.WriteLine("Passed!");
......
...@@ -71,7 +71,7 @@ namespace grpc.testing ...@@ -71,7 +71,7 @@ namespace grpc.testing
public async Task<StreamingInputCallResponse> StreamingInputCall(IAsyncStreamReader<StreamingInputCallRequest> requestStream, ServerCallContext context) public async Task<StreamingInputCallResponse> StreamingInputCall(IAsyncStreamReader<StreamingInputCallRequest> requestStream, ServerCallContext context)
{ {
int sum = 0; int sum = 0;
await requestStream.ForEach(async request => await requestStream.ForEachAsync(async request =>
{ {
sum += request.Payload.Body.Length; sum += request.Payload.Body.Length;
}); });
...@@ -80,7 +80,7 @@ namespace grpc.testing ...@@ -80,7 +80,7 @@ namespace grpc.testing
public async Task FullDuplexCall(IAsyncStreamReader<StreamingOutputCallRequest> requestStream, IServerStreamWriter<StreamingOutputCallResponse> responseStream, ServerCallContext context) public async Task FullDuplexCall(IAsyncStreamReader<StreamingOutputCallRequest> requestStream, IServerStreamWriter<StreamingOutputCallResponse> responseStream, ServerCallContext context)
{ {
await requestStream.ForEach(async request => await requestStream.ForEachAsync(async request =>
{ {
foreach (var responseParam in request.ResponseParametersList) foreach (var responseParam in request.ResponseParametersList)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment