This is an automated email from the ASF dual-hosted git repository. aaronai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit 84ba22515815fcd73978467521403de2bde25009 Author: Aaron Ai <[email protected]> AuthorDate: Wed Mar 8 19:36:02 2023 +0800 Apply dotnet-format --- .github/workflows/csharp_build.yml | 10 ++- csharp/rocketmq-client-csharp/Client.cs | 2 +- .../rocketmq-client-csharp/ClientMeterManager.cs | 2 +- csharp/rocketmq-client-csharp/MessageView.cs | 78 +++++++++++----------- csharp/rocketmq-client-csharp/Session.cs | 62 ++++++++--------- csharp/rocketmq-client-csharp/Transaction.cs | 4 +- csharp/tests/ConfigFileCredentialsProviderTest.cs | 2 +- 7 files changed, 82 insertions(+), 78 deletions(-) diff --git a/.github/workflows/csharp_build.yml b/.github/workflows/csharp_build.yml index 0d69629e..1a37900d 100644 --- a/.github/workflows/csharp_build.yml +++ b/.github/workflows/csharp_build.yml @@ -10,15 +10,19 @@ jobs: os: [ubuntu-20.04, macos-11, windows-2022] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 5.0.x 6.0.x + 7.0.x + 8.0.x - name: Build artifacts working-directory: ./csharp run: | - dotnet --version dotnet build + dotnet tool install -g dotnet-format + dotnet-format --check + dotnet test -l "console;verbosity=detailed" diff --git a/csharp/rocketmq-client-csharp/Client.cs b/csharp/rocketmq-client-csharp/Client.cs index 0249b89a..ec0ea6a7 100644 --- a/csharp/rocketmq-client-csharp/Client.cs +++ b/csharp/rocketmq-client-csharp/Client.cs @@ -389,7 +389,7 @@ namespace Org.Apache.Rocketmq Logger.Error(e, $"[Bug] unexpected exception raised during heartbeat, clientId={ClientId}"); } } - + internal grpc.Metadata Sign() { var metadata = new grpc::Metadata(); diff --git a/csharp/rocketmq-client-csharp/ClientMeterManager.cs b/csharp/rocketmq-client-csharp/ClientMeterManager.cs index a639c984..dc856edd 100644 --- a/csharp/rocketmq-client-csharp/ClientMeterManager.cs +++ b/csharp/rocketmq-client-csharp/ClientMeterManager.cs @@ -75,7 +75,7 @@ namespace Org.Apache.Rocketmq var meterProvider = Sdk.CreateMeterProviderBuilder() .SetResourceBuilder(ResourceBuilder.CreateEmpty()) .AddMeter(MeterName) - .AddOtlpExporter(delegate(OtlpExporterOptions options, MetricReaderOptions readerOptions) + .AddOtlpExporter(delegate (OtlpExporterOptions options, MetricReaderOptions readerOptions) { options.Protocol = OtlpExportProtocol.Grpc; options.Endpoint = new Uri(metric.Endpoints.GrpcTarget(_client.GetClientConfig().SslEnabled)); diff --git a/csharp/rocketmq-client-csharp/MessageView.cs b/csharp/rocketmq-client-csharp/MessageView.cs index 2581f48b..461f7781 100644 --- a/csharp/rocketmq-client-csharp/MessageView.cs +++ b/csharp/rocketmq-client-csharp/MessageView.cs @@ -93,43 +93,43 @@ namespace Org.Apache.Rocketmq switch (type) { case Proto.DigestType.Crc32: - { - var expectedCheckSum = Force.Crc32.Crc32Algorithm.Compute(raw, 0, raw.Length).ToString("X"); - if (!expectedCheckSum.Equals(checkSum)) { - corrupted = true; - } + var expectedCheckSum = Force.Crc32.Crc32Algorithm.Compute(raw, 0, raw.Length).ToString("X"); + if (!expectedCheckSum.Equals(checkSum)) + { + corrupted = true; + } - break; - } + break; + } case Proto.DigestType.Md5: - { - var expectedCheckSum = Convert.ToHexString(MD5.HashData(raw)); - if (!expectedCheckSum.Equals(checkSum)) { - corrupted = true; - } + var expectedCheckSum = Convert.ToHexString(MD5.HashData(raw)); + if (!expectedCheckSum.Equals(checkSum)) + { + corrupted = true; + } - break; - } + break; + } case Proto.DigestType.Sha1: - { - var expectedCheckSum = Convert.ToHexString(SHA1.HashData(raw)); - if (!expectedCheckSum.Equals(checkSum)) { - corrupted = true; - } + var expectedCheckSum = Convert.ToHexString(SHA1.HashData(raw)); + if (!expectedCheckSum.Equals(checkSum)) + { + corrupted = true; + } - break; - } + break; + } case Proto.DigestType.Unspecified: default: - { - Logger.Error( - $"Unsupported message body digest algorithm," + - $"digestType={type}, topic={topic}, messageId={messageId}"); - break; - } + { + Logger.Error( + $"Unsupported message body digest algorithm," + + $"digestType={type}, topic={topic}, messageId={messageId}"); + break; + } } var bodyEncoding = systemProperties.BodyEncoding; @@ -137,21 +137,21 @@ namespace Org.Apache.Rocketmq switch (bodyEncoding) { case Proto.Encoding.Gzip: - { - body = Utilities.DecompressBytesGzip(message.Body.ToByteArray()); - break; - } + { + body = Utilities.DecompressBytesGzip(message.Body.ToByteArray()); + break; + } case Proto.Encoding.Identity: - { - break; - } + { + break; + } case Proto.Encoding.Unspecified: default: - { - Logger.Error($"Unsupported message encoding algorithm," + - $" topic={topic}, messageId={messageId}, bodyEncoding={bodyEncoding}"); - break; - } + { + Logger.Error($"Unsupported message encoding algorithm," + + $" topic={topic}, messageId={messageId}, bodyEncoding={bodyEncoding}"); + break; + } } var tag = systemProperties.HasTag ? systemProperties.Tag : null; diff --git a/csharp/rocketmq-client-csharp/Session.cs b/csharp/rocketmq-client-csharp/Session.cs index 86316b9d..69a2c197 100644 --- a/csharp/rocketmq-client-csharp/Session.cs +++ b/csharp/rocketmq-client-csharp/Session.cs @@ -91,41 +91,41 @@ namespace Org.Apache.Rocketmq switch (response.CommandCase) { case Proto.TelemetryCommand.CommandOneofCase.Settings: - { - Logger.Info( - $"Receive setting from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); - _client.OnSettingsCommand(_endpoints, response.Settings); - _event.Set(); - break; - } + { + Logger.Info( + $"Receive setting from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); + _client.OnSettingsCommand(_endpoints, response.Settings); + _event.Set(); + break; + } case Proto.TelemetryCommand.CommandOneofCase.RecoverOrphanedTransactionCommand: - { - Logger.Info( - $"Receive orphaned transaction recovery command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); - _client.OnRecoverOrphanedTransactionCommand(_endpoints, - response.RecoverOrphanedTransactionCommand); - break; - } + { + Logger.Info( + $"Receive orphaned transaction recovery command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); + _client.OnRecoverOrphanedTransactionCommand(_endpoints, + response.RecoverOrphanedTransactionCommand); + break; + } case Proto.TelemetryCommand.CommandOneofCase.VerifyMessageCommand: - { - Logger.Info( - $"Receive message verification command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); - _client.OnVerifyMessageCommand(_endpoints, response.VerifyMessageCommand); - break; - } + { + Logger.Info( + $"Receive message verification command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); + _client.OnVerifyMessageCommand(_endpoints, response.VerifyMessageCommand); + break; + } case Proto.TelemetryCommand.CommandOneofCase.PrintThreadStackTraceCommand: - { - Logger.Info( - $"Receive thread stack print command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); - _client.OnPrintThreadStackTraceCommand(_endpoints, response.PrintThreadStackTraceCommand); - break; - } + { + Logger.Info( + $"Receive thread stack print command from remote, endpoints={_endpoints}, clientId={_client.GetClientId()}"); + _client.OnPrintThreadStackTraceCommand(_endpoints, response.PrintThreadStackTraceCommand); + break; + } default: - { - Logger.Warn( - $"Receive unrecognized command from remote, endpoints={_endpoints}, command={response}, clientId={_client.GetClientId()}"); - break; - } + { + Logger.Warn( + $"Receive unrecognized command from remote, endpoints={_endpoints}, command={response}, clientId={_client.GetClientId()}"); + break; + } } } }); diff --git a/csharp/rocketmq-client-csharp/Transaction.cs b/csharp/rocketmq-client-csharp/Transaction.cs index 5a0e81a6..71d5b748 100644 --- a/csharp/rocketmq-client-csharp/Transaction.cs +++ b/csharp/rocketmq-client-csharp/Transaction.cs @@ -96,7 +96,7 @@ namespace Org.Apache.Rocketmq { throw new InvalidOperationException("Producer is not running"); } - + if (_messageSendReceiptDict.IsEmpty) { throw new ArgumentException("Transactional message has not been sent yet"); @@ -115,7 +115,7 @@ namespace Org.Apache.Rocketmq { throw new InvalidOperationException("Producer is not running"); } - + if (_messageSendReceiptDict.IsEmpty) { throw new ArgumentException("Transaction message has not been sent yet"); diff --git a/csharp/tests/ConfigFileCredentialsProviderTest.cs b/csharp/tests/ConfigFileCredentialsProviderTest.cs index 7874795e..d65439be 100644 --- a/csharp/tests/ConfigFileCredentialsProviderTest.cs +++ b/csharp/tests/ConfigFileCredentialsProviderTest.cs @@ -38,7 +38,7 @@ namespace tests var json = "{\"AccessKey\": \"key\", \"AccessSecret\": \"secret\"}"; File.WriteAllText(configFilePath, json); } - + [TestMethod] public void TestGetCredentials() {
