From 2ddb5a6cb54c88ccf36af81f79160150a40df0be Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Jun 2015 17:51:36 -0700 Subject: revamp of c# channel options --- src/csharp/Grpc.IntegrationTesting/InteropClient.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/csharp/Grpc.IntegrationTesting/InteropClient.cs') diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs index 66171fae57..faee5a8fa5 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs @@ -110,14 +110,15 @@ namespace Grpc.IntegrationTesting credentials = TestCredentials.CreateTestClientCredentials(options.useTestCa); } - ChannelArgs channelArgs = null; + List channelOptions = null; if (!string.IsNullOrEmpty(options.serverHostOverride)) { - channelArgs = ChannelArgs.CreateBuilder() - .AddString(ChannelArgs.SslTargetNameOverrideKey, options.serverHostOverride).Build(); + channelOptions = new List { + new ChannelOption(ChannelOptions.SslTargetNameOverride, options.serverHostOverride) + }; } - using (Channel channel = new Channel(options.serverHost, options.serverPort.Value, credentials, channelArgs)) + using (Channel channel = new Channel(options.serverHost, options.serverPort.Value, credentials, channelOptions)) { var stubConfig = StubConfiguration.Default; if (options.testCase == "service_account_creds" || options.testCase == "compute_engine_creds") -- cgit v1.2.3 From c8f7d1079e66a87e1248462b5ff2216460f488ab Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Jun 2015 17:53:45 -0700 Subject: fix stylecop issues --- src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs | 4 ++-- src/csharp/Grpc.Core/ChannelOptions.cs | 1 - src/csharp/Grpc.IntegrationTesting/InteropClient.cs | 3 ++- src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/csharp/Grpc.IntegrationTesting/InteropClient.cs') diff --git a/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs b/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs index ee846eae96..df09857efe 100644 --- a/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs +++ b/src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs @@ -50,7 +50,7 @@ namespace Grpc.Core.Internal.Tests Assert.AreEqual(ChannelOption.OptionType.Integer, option.Type); Assert.AreEqual("somename", option.Name); Assert.AreEqual(1, option.IntValue); - Assert.Throws(typeof(InvalidOperationException), () => {var s = option.StringValue; }); + Assert.Throws(typeof(InvalidOperationException), () => { var s = option.StringValue; }); } [Test] @@ -61,7 +61,7 @@ namespace Grpc.Core.Internal.Tests Assert.AreEqual(ChannelOption.OptionType.String, option.Type); Assert.AreEqual("somename", option.Name); Assert.AreEqual("ABCDEF", option.StringValue); - Assert.Throws(typeof(InvalidOperationException), () => {var s = option.IntValue; }); + Assert.Throws(typeof(InvalidOperationException), () => { var s = option.IntValue; }); } [Test] diff --git a/src/csharp/Grpc.Core/ChannelOptions.cs b/src/csharp/Grpc.Core/ChannelOptions.cs index 4d37b39682..bc23bb59b1 100644 --- a/src/csharp/Grpc.Core/ChannelOptions.cs +++ b/src/csharp/Grpc.Core/ChannelOptions.cs @@ -162,7 +162,6 @@ namespace Grpc.Core { throw new InvalidOperationException("Unknown option type"); } - } return nativeArgs; } diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs index faee5a8fa5..f0be522bc6 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClient.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClient.cs @@ -113,7 +113,8 @@ namespace Grpc.IntegrationTesting List channelOptions = null; if (!string.IsNullOrEmpty(options.serverHostOverride)) { - channelOptions = new List { + channelOptions = new List + { new ChannelOption(ChannelOptions.SslTargetNameOverride, options.serverHostOverride) }; } diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs index 33628ce4c7..1a733450c1 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs @@ -62,7 +62,8 @@ namespace Grpc.IntegrationTesting int port = server.AddListeningPort(host, Server.PickUnusedPort, TestCredentials.CreateTestServerCredentials()); server.Start(); - var options = new List { + var options = new List + { new ChannelOption(ChannelOptions.SslTargetNameOverride, TestCredentials.DefaultHostOverride) }; channel = new Channel(host, port, TestCredentials.CreateTestClientCredentials(true), options); -- cgit v1.2.3