Rename canceled exception property on channel (#490)

JamesNK · web-flow · commit a56e110986fe · 2019-09-06T07:57:09.000+12:00
diff --git a/src/Grpc.Net.Client/GrpcChannel.cs b/src/Grpc.Net.Client/GrpcChannel.cs
@@ -45,7 +45,7 @@ public sealed class GrpcChannel : ChannelBase, IDisposable
         internal int? SendMaxMessageSize { get; }
         internal int? ReceiveMaxMessageSize { get; }
         internal ILoggerFactory LoggerFactory { get; }
-        internal bool ThrowOperationCanceledExceptionOnCancellation { get; }
+        internal bool ThrowOperationCanceledOnCancellation { get; }
         internal bool? IsSecure { get; }
         internal List<CallCredentials>? CallCredentials { get; }
         internal Dictionary<string, ICompressionProvider> CompressionProviders { get; }
@@ -72,7 +72,7 @@ internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(addr
             CompressionProviders = ResolveCompressionProviders(channelOptions.CompressionProviders);
             MessageAcceptEncoding = GrpcProtocolHelpers.GetMessageAcceptEncoding(CompressionProviders);
             LoggerFactory = channelOptions.LoggerFactory ?? NullLoggerFactory.Instance;
-            ThrowOperationCanceledExceptionOnCancellation = channelOptions.ThrowOperationCanceledExceptionOnCancellation;
+            ThrowOperationCanceledOnCancellation = channelOptions.ThrowOperationCanceledOnCancellation;
 
             if (channelOptions.Credentials != null)
             {
diff --git a/src/Grpc.Net.Client/GrpcChannelOptions.cs b/src/Grpc.Net.Client/GrpcChannelOptions.cs
@@ -82,7 +82,7 @@ public sealed class GrpcChannelOptions
         /// The default value is <c>false</c>.
         /// Note: experimental API that can change or be removed without any prior notice.
         /// </summary>
-        public bool ThrowOperationCanceledExceptionOnCancellation { get; set; }
+        public bool ThrowOperationCanceledOnCancellation { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GrpcChannelOptions"/> class.
diff --git a/src/Grpc.Net.Client/Internal/GrpcCall.cs b/src/Grpc.Net.Client/Internal/GrpcCall.cs
@@ -249,7 +249,7 @@ public async Task<Metadata> GetResponseHeadersAsync()
                     return GrpcProtocolHelpers.BuildMetadata(HttpResponse.Headers);
                 }
             }
-            catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledExceptionOnCancellation)
+            catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledOnCancellation)
             {
                 throw CreateCanceledStatusException();
             }
@@ -322,7 +322,7 @@ public async Task<TResponse> GetResponseAsync()
                     return message;
                 }
             }
-            catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledExceptionOnCancellation)
+            catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledOnCancellation)
             {
                 throw CreateCanceledStatusException();
             }
diff --git a/src/Grpc.Net.Client/Internal/HttpContentClientStreamReader.cs b/src/Grpc.Net.Client/Internal/HttpContentClientStreamReader.cs
@@ -63,7 +63,7 @@ public Task<bool> MoveNext(CancellationToken cancellationToken)
             // HTTP response has finished
             if (_call.CancellationToken.IsCancellationRequested)
             {
-                if (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)
+                if (!_call.Channel.ThrowOperationCanceledOnCancellation)
                 {
                     return Task.FromException<bool>(_call.CreateCanceledStatusException());
                 }
@@ -177,7 +177,7 @@ private async Task<bool> MoveNextCore(CancellationToken cancellationToken)
                 GrpcEventSource.Log.MessageReceived();
                 return true;
             }
-            catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)
+            catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledOnCancellation)
             {
                 throw _call.CreateCanceledStatusException();
             }
diff --git a/src/Grpc.Net.Client/Internal/HttpContentClientStreamWriter.cs b/src/Grpc.Net.Client/Internal/HttpContentClientStreamWriter.cs
@@ -94,7 +94,7 @@ public Task WriteAsync(TRequest message)
                     // Call has been canceled
                     if (_call.CancellationToken.IsCancellationRequested)
                     {
-                        if (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)
+                        if (!_call.Channel.ThrowOperationCanceledOnCancellation)
                         {
                             return Task.FromException(_call.CreateCanceledStatusException());
                         }
@@ -167,7 +167,7 @@ await writeStream.WriteMessageAsync<TRequest>(
 
                 GrpcEventSource.Log.MessageSent();
             }
-            catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)
+            catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledOnCancellation)
             {
                 throw _call.CreateCanceledStatusException();
             }
diff --git a/test/Grpc.Net.Client.Tests/AsyncClientStreamingCallTests.cs b/test/Grpc.Net.Client.Tests/AsyncClientStreamingCallTests.cs
@@ -270,7 +270,7 @@ public async Task ClientStreamWriter_CancelledBeforeCallStarts_ThrowOperationCan
             {
                 return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.OK));
             });
-            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncClientStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(cancellationToken: new CancellationToken(true)));
diff --git a/test/Grpc.Net.Client.Tests/CancellationTests.cs b/test/Grpc.Net.Client.Tests/CancellationTests.cs
@@ -81,7 +81,7 @@ public async Task AsyncClientStreamingCall_CancellationDuringSend_ThrowOperation
         {
             // Arrange
             var cts = new CancellationTokenSource();
-            var invoker = CreateTimedoutCallInvoker(configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = CreateTimedoutCallInvoker(configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncClientStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(cancellationToken: cts.Token));
@@ -102,7 +102,7 @@ public async Task AsyncClientStreamingCall_CancellationDuringSend_ThrowOperation
         {
             // Arrange
             var cts = new CancellationTokenSource();
-            var invoker = CreateTimedoutCallInvoker(configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = CreateTimedoutCallInvoker(configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncClientStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(cancellationToken: cts.Token));
diff --git a/test/Grpc.Net.Client.Tests/DeadlineTests.cs b/test/Grpc.Net.Client.Tests/DeadlineTests.cs
@@ -155,7 +155,7 @@ public async Task AsyncClientStreamingCall_DeadlineDuringSend_ThrowOperationCanc
                 return ResponseUtils.CreateResponse(HttpStatusCode.OK);
             });
             var testSystemClock = new TestSystemClock(DateTime.UtcNow);
-            var invoker = HttpClientCallInvokerFactory.Create(httpClient, systemClock: testSystemClock, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = HttpClientCallInvokerFactory.Create(httpClient, systemClock: testSystemClock, configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncClientStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(deadline: testSystemClock.UtcNow.AddSeconds(0.5)));
diff --git a/test/Grpc.Net.Client.Tests/HttpContentClientStreamReaderTests.cs b/test/Grpc.Net.Client.Tests/HttpContentClientStreamReaderTests.cs
@@ -103,7 +103,7 @@ public async Task MoveNext_TokenCanceledDuringCall_ThrowOperationCanceledExcepti
                 return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.OK, content));
             });
 
-            var channel = GrpcChannel.ForAddress(httpClient.BaseAddress, new GrpcChannelOptions { HttpClient = httpClient, ThrowOperationCanceledExceptionOnCancellation = true });
+            var channel = GrpcChannel.ForAddress(httpClient.BaseAddress, new GrpcChannelOptions { HttpClient = httpClient, ThrowOperationCanceledOnCancellation = true });
             var call = new GrpcCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, new CallOptions(), channel);
             call.StartServerStreaming(new HelloRequest());
 
diff --git a/test/Grpc.Net.Client.Tests/ReadAllAsyncTests.cs b/test/Grpc.Net.Client.Tests/ReadAllAsyncTests.cs
@@ -205,7 +205,7 @@ public async Task MoveNextAsync_CancelCall_ThrowOperationCanceledExceptionOnCanc
 
                 return ResponseUtils.CreateResponse(HttpStatusCode.OK, streamContent);
             });
-            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledOnCancellation = true);
             var cts = new CancellationTokenSource();
 
             // Act
diff --git a/test/Grpc.Net.Client.Tests/ResponseAsyncTests.cs b/test/Grpc.Net.Client.Tests/ResponseAsyncTests.cs
@@ -106,7 +106,7 @@ public async Task AsyncUnaryCall_DisposeAfterHeadersAndBeforeMessage_ThrowOperat
                 response.Headers.Add("custom", "value!");
                 return Task.FromResult(response);
             });
-            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncUnaryCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(), new HelloRequest { Name = "World" });
diff --git a/test/Grpc.Net.Client.Tests/ResponseHeadersAsyncTests.cs b/test/Grpc.Net.Client.Tests/ResponseHeadersAsyncTests.cs
@@ -200,7 +200,7 @@ public async Task AsyncServerStreamingCall_DisposeBeforeHeadersReceived_ThrowOpe
                 response.Headers.Add("custom", "ABC");
                 return response;
             });
-            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);
+            var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledOnCancellation = true);
 
             // Act
             var call = invoker.AsyncServerStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(), new HelloRequest());

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public async Task<Metadata> GetResponseHeadersAsync()`
`249`	`249`	`return GrpcProtocolHelpers.BuildMetadata(HttpResponse.Headers);`
`250`	`250`	`}`
`251`	`251`	`}`
`252`		`- catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`252`	`+ catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledOnCancellation)`
`253`	`253`	`{`
`254`	`254`	`throw CreateCanceledStatusException();`
`255`	`255`	`}`
`@@ -322,7 +322,7 @@ public async Task<TResponse> GetResponseAsync()`
`322`	`322`	`return message;`
`323`	`323`	`}`
`324`	`324`	`}`
`325`		`- catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`325`	`+ catch (OperationCanceledException) when (!Channel.ThrowOperationCanceledOnCancellation)`
`326`	`326`	`{`
`327`	`327`	`throw CreateCanceledStatusException();`
`328`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public Task<bool> MoveNext(CancellationToken cancellationToken)`
`63`	`63`	`// HTTP response has finished`
`64`	`64`	`if (_call.CancellationToken.IsCancellationRequested)`
`65`	`65`	`{`
`66`		`- if (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`66`	`+ if (!_call.Channel.ThrowOperationCanceledOnCancellation)`
`67`	`67`	`{`
`68`	`68`	`return Task.FromException<bool>(_call.CreateCanceledStatusException());`
`69`	`69`	`}`
`@@ -177,7 +177,7 @@ private async Task<bool> MoveNextCore(CancellationToken cancellationToken)`
`177`	`177`	`GrpcEventSource.Log.MessageReceived();`
`178`	`178`	`return true;`
`179`	`179`	`}`
`180`		`- catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`180`	`+ catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledOnCancellation)`
`181`	`181`	`{`
`182`	`182`	`throw _call.CreateCanceledStatusException();`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public Task WriteAsync(TRequest message)`
`94`	`94`	`// Call has been canceled`
`95`	`95`	`if (_call.CancellationToken.IsCancellationRequested)`
`96`	`96`	`{`
`97`		`- if (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`97`	`+ if (!_call.Channel.ThrowOperationCanceledOnCancellation)`
`98`	`98`	`{`
`99`	`99`	`return Task.FromException(_call.CreateCanceledStatusException());`
`100`	`100`	`}`
`@@ -167,7 +167,7 @@ await writeStream.WriteMessageAsync<TRequest>(`
`167`	`167`
`168`	`168`	`GrpcEventSource.Log.MessageSent();`
`169`	`169`	`}`
`170`		`- catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledExceptionOnCancellation)`
	`170`	`+ catch (OperationCanceledException) when (!_call.Channel.ThrowOperationCanceledOnCancellation)`
`171`	`171`	`{`
`172`	`172`	`throw _call.CreateCanceledStatusException();`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public async Task ClientStreamWriter_CancelledBeforeCallStarts_ThrowOperationCan`
`270`	`270`	`{`
`271`	`271`	`return Task.FromResult(ResponseUtils.CreateResponse(HttpStatusCode.OK));`
`272`	`272`	`});`
`273`		`- var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledExceptionOnCancellation = true);`
	`273`	`+ var invoker = HttpClientCallInvokerFactory.Create(httpClient, configure: o => o.ThrowOperationCanceledOnCancellation = true);`
`274`	`274`
`275`	`275`	`// Act`
`276`	`276`	`var call = invoker.AsyncClientStreamingCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(cancellationToken: new CancellationToken(true)));`