Run csharpier formatter on all cs files.

sillsdev · Jan 15, 2024 · b1eb2c1 · b1eb2c1
1 parent 4426945
commit b1eb2c1
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 81 deletions.
diff --git a/src/SIL.DataAccess/IMongoDataAccessConfiguratorExtensions.cs b/src/SIL.DataAccess/IMongoDataAccessConfiguratorExtensions.cs
@@ -20,12 +20,11 @@ public static IMongoDataAccessConfigurator AddRepository<T>(
             });
         }
 
-        configurator.Services.AddScoped<IRepository<T>>(
-            sp =>
-                CreateRepository(
-                    sp.GetRequiredService<IMongoDataAccessContext>(),
-                    sp.GetRequiredService<IMongoDatabase>().GetCollection<T>(collectionName)
-                )
+        configurator.Services.AddScoped<IRepository<T>>(sp =>
+            CreateRepository(
+                sp.GetRequiredService<IMongoDataAccessContext>(),
+                sp.GetRequiredService<IMongoDatabase>().GetCollection<T>(collectionName)
+            )
         );
         return configurator;
     }

diff --git a/src/SIL.DataAccess/IServiceCollectionExtensions.cs b/src/SIL.DataAccess/IServiceCollectionExtensions.cs
@@ -35,10 +35,9 @@ Action<IMongoDataAccessConfigurator> configure
         clientSettings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
         clientSettings.LinqProvider = LinqProvider.V2;
         services.AddSingleton<IMongoClient>(sp => new MongoClient(clientSettings));
-        services.AddSingleton(
-            sp =>
-                sp.GetRequiredService<IMongoClient>()
-                    .GetDatabase(sp.GetRequiredService<IOptions<MongoDataAccessOptions>>().Value.Url.DatabaseName)
+        services.AddSingleton(sp =>
+            sp.GetRequiredService<IMongoClient>()
+                .GetDatabase(sp.GetRequiredService<IOptions<MongoDataAccessOptions>>().Value.Url.DatabaseName)
         );
         services.TryAddScoped<IMongoDataAccessContext, MongoDataAccessContext>();
         services.AddScoped<IDataAccessContext>(sp => sp.GetRequiredService<IMongoDataAccessContext>());

diff --git a/src/SIL.DataAccess/MongoRepository.cs b/src/SIL.DataAccess/MongoRepository.cs
@@ -204,14 +204,18 @@ public async Task<ISubscription<T>> SubscribeAsync(
         BsonDocument result;
         if (_context.Session is not null)
         {
-            result = await _collection.Database
-                .RunCommandAsync<BsonDocument>(_context.Session, findCommand, cancellationToken: cancellationToken)
+            result = await _collection
+                .Database.RunCommandAsync<BsonDocument>(
+                    _context.Session,
+                    findCommand,
+                    cancellationToken: cancellationToken
+                )
                 .ConfigureAwait(false);
         }
         else
         {
-            result = await _collection.Database
-                .RunCommandAsync<BsonDocument>(findCommand, cancellationToken: cancellationToken)
+            result = await _collection
+                .Database.RunCommandAsync<BsonDocument>(findCommand, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
         }
         BsonDocument? initialEntityDoc = result["cursor"]["firstBatch"].AsBsonArray.FirstOrDefault()?.AsBsonDocument;

diff --git a/src/SIL.DataAccess/Usings.cs b/src/SIL.DataAccess/Usings.cs
@@ -10,8 +10,8 @@
 global using MongoDB.Bson.Serialization;
 global using MongoDB.Bson.Serialization.Conventions;
 global using MongoDB.Bson.Serialization.Serializers;
-global using MongoDB.Driver.Core.Extensions.DiagnosticSources;
 global using MongoDB.Driver;
+global using MongoDB.Driver.Core.Extensions.DiagnosticSources;
 global using MongoDB.Driver.Linq;
 global using Nito.AsyncEx;
 global using SIL.DataAccess;

diff --git a/src/Serval.ApiServer/Startup.cs b/src/Serval.ApiServer/Startup.cs
@@ -85,24 +85,23 @@ public void ConfigureServices(IServiceCollection services)
             .AddWebhooks();
         services.AddTransient<IUrlService, UrlService>();
 
-        services.AddHangfire(
-            c =>
-                c.SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
-                    .UseSimpleAssemblyNameTypeSerializer()
-                    .UseRecommendedSerializerSettings()
-                    .UseMongoStorage(
-                        Configuration.GetConnectionString("Hangfire"),
-                        new MongoStorageOptions
+        services.AddHangfire(c =>
+            c.SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
+                .UseSimpleAssemblyNameTypeSerializer()
+                .UseRecommendedSerializerSettings()
+                .UseMongoStorage(
+                    Configuration.GetConnectionString("Hangfire"),
+                    new MongoStorageOptions
+                    {
+                        MigrationOptions = new MongoMigrationOptions
                         {
-                            MigrationOptions = new MongoMigrationOptions
-                            {
-                                MigrationStrategy = new MigrateMongoMigrationStrategy(),
-                                BackupStrategy = new CollectionMongoBackupStrategy()
-                            },
-                            CheckConnection = true,
-                            CheckQueuedJobsStrategy = CheckQueuedJobsStrategy.TailNotificationsCollection
-                        }
-                    )
+                            MigrationStrategy = new MigrateMongoMigrationStrategy(),
+                            BackupStrategy = new CollectionMongoBackupStrategy()
+                        },
+                        CheckConnection = true,
+                        CheckQueuedJobsStrategy = CheckQueuedJobsStrategy.TailNotificationsCollection
+                    }
+                )
         );
         services.AddHangfireServer();
 

diff --git a/src/Serval.Grpc/Utils/WriteGrpcHealthCheckResponse.cs b/src/Serval.Grpc/Utils/WriteGrpcHealthCheckResponse.cs
@@ -14,7 +14,7 @@ public static HealthCheckResponse Generate(HealthReport healthReport)
         {
             healthCheckResultData.Add(entry.Key, $"{entry.Value.Status}: {entry.Value.Description ?? ""}");
             if ((entry.Value.Exception?.ToString() ?? "") != "")
-                if(healthCheckResultException is null)
+                if (healthCheckResultException is null)
                     healthCheckResultException = $"{entry.Key}: {entry.Value.Exception}";
                 else
                     healthCheckResultException += $"\n{entry.Key}: {entry.Value.Exception}";
@@ -27,5 +27,5 @@ public static HealthCheckResponse Generate(HealthReport healthReport)
             healthCheckReponse.Data.Add(entry.Key, entry.Value);
         }
         return healthCheckReponse;
-    }   
-}
+    }
+}
diff --git a/src/Serval.Shared/Usings.cs b/src/Serval.Shared/Usings.cs
@@ -1,7 +1,7 @@
-global using Grpc.Core;
-global using System.Text;
+global using System.Text;
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
+global using Grpc.Core;
 global using Microsoft.AspNetCore.Authorization;
 global using Microsoft.AspNetCore.Http;
 global using Microsoft.AspNetCore.Mvc;

diff --git a/src/Serval.Translation/Services/EngineService.cs b/src/Serval.Translation/Services/EngineService.cs
@@ -330,8 +330,8 @@ public Task DeleteAllCorpusFilesAsync(string dataFileId, CancellationToken cance
     {
         return Entities.UpdateAllAsync(
             e =>
-                e.Corpora.Any(
-                    c => c.SourceFiles.Any(f => f.Id == dataFileId) || c.TargetFiles.Any(f => f.Id == dataFileId)
+                e.Corpora.Any(c =>
+                    c.SourceFiles.Any(f => f.Id == dataFileId) || c.TargetFiles.Any(f => f.Id == dataFileId)
                 ),
             u =>
                 u.RemoveAll(e => e.Corpora[ArrayPosition.All].SourceFiles, f => f.Id == dataFileId)

diff --git a/src/Serval.Webhooks/Configuration/IServalBuilderExtensions.cs b/src/Serval.Webhooks/Configuration/IServalBuilderExtensions.cs
@@ -4,10 +4,10 @@ public static class IServalBuilderExtensions
 {
     public static IServalBuilder AddWebhooks(this IServalBuilder builder)
     {
-        builder.Services
-            .AddHttpClient<WebhookJob>()
-            .AddTransientHttpErrorPolicy(
-                b => b.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)))
+        builder
+            .Services.AddHttpClient<WebhookJob>()
+            .AddTransientHttpErrorPolicy(b =>
+                b.WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)))
             );
         builder.Services.AddScoped<IWebhookService, WebhookService>();
         return builder;

diff --git a/tests/Serval.ApiServer.IntegrationTests/ServalWebApplicationFactory.cs b/tests/Serval.ApiServer.IntegrationTests/ServalWebApplicationFactory.cs
@@ -14,28 +14,27 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 })
                 .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>("TestScheme", options => { });
 
-            services.Configure<MongoDataAccessOptions>(
-                options => options.Url = new MongoUrl("mongodb://localhost:27017/serval_test")
+            services.Configure<MongoDataAccessOptions>(options =>
+                options.Url = new MongoUrl("mongodb://localhost:27017/serval_test")
             );
 
-            services.AddHangfire(
-                c =>
-                    c.SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
-                        .UseSimpleAssemblyNameTypeSerializer()
-                        .UseRecommendedSerializerSettings()
-                        .UseMongoStorage(
-                            "mongodb://localhost:27017/serval_test_jobs",
-                            new MongoStorageOptions
+            services.AddHangfire(c =>
+                c.SetDataCompatibilityLevel(CompatibilityLevel.Version_170)
+                    .UseSimpleAssemblyNameTypeSerializer()
+                    .UseRecommendedSerializerSettings()
+                    .UseMongoStorage(
+                        "mongodb://localhost:27017/serval_test_jobs",
+                        new MongoStorageOptions
+                        {
+                            MigrationOptions = new MongoMigrationOptions
                             {
-                                MigrationOptions = new MongoMigrationOptions
-                                {
-                                    MigrationStrategy = new MigrateMongoMigrationStrategy(),
-                                    BackupStrategy = new CollectionMongoBackupStrategy()
-                                },
-                                CheckConnection = true,
-                                CheckQueuedJobsStrategy = CheckQueuedJobsStrategy.TailNotificationsCollection
-                            }
-                        )
+                                MigrationStrategy = new MigrateMongoMigrationStrategy(),
+                                BackupStrategy = new CollectionMongoBackupStrategy()
+                            },
+                            CheckConnection = true,
+                            CheckQueuedJobsStrategy = CheckQueuedJobsStrategy.TailNotificationsCollection
+                        }
+                    )
             );
         });
     }

diff --git a/tests/Serval.ApiServer.IntegrationTests/TranslationEngineTests.cs b/tests/Serval.ApiServer.IntegrationTests/TranslationEngineTests.cs
@@ -300,8 +300,7 @@ await _env.Builds.InsertAsync(
                 );
                 break;
             case 409:
-                _env.EchoClient
-                    .TranslateAsync(Arg.Any<TranslateRequest>(), null, null, Arg.Any<CancellationToken>())
+                _env.EchoClient.TranslateAsync(Arg.Any<TranslateRequest>(), null, null, Arg.Any<CancellationToken>())
                     .Returns(CreateAsyncUnaryCall<TranslateResponse>(StatusCode.Aborted));
                 ex = Assert.ThrowsAsync<ServalApiException>(async () =>
                 {
@@ -356,8 +355,7 @@ await _env.Builds.InsertAsync(
                 );
                 break;
             case 409:
-                _env.EchoClient
-                    .TranslateAsync(Arg.Any<TranslateRequest>(), null, null, Arg.Any<CancellationToken>())
+                _env.EchoClient.TranslateAsync(Arg.Any<TranslateRequest>(), null, null, Arg.Any<CancellationToken>())
                     .Returns(CreateAsyncUnaryCall<TranslateResponse>(StatusCode.Aborted));
                 ex = Assert.ThrowsAsync<ServalApiException>(async () =>
                 {
@@ -407,8 +405,12 @@ await _env.Builds.InsertAsync(
                 });
                 break;
             case 409:
-                _env.EchoClient
-                    .GetWordGraphAsync(Arg.Any<GetWordGraphRequest>(), null, null, Arg.Any<CancellationToken>())
+                _env.EchoClient.GetWordGraphAsync(
+                    Arg.Any<GetWordGraphRequest>(),
+                    null,
+                    null,
+                    Arg.Any<CancellationToken>()
+                )
                     .Returns(CreateAsyncUnaryCall<GetWordGraphResponse>(StatusCode.Aborted));
                 ex = Assert.ThrowsAsync<ServalApiException>(async () =>
                 {
@@ -459,8 +461,12 @@ await _env.Builds.InsertAsync(
                 await client.TrainSegmentAsync(engineId, sp);
                 break;
             case 409:
-                _env.EchoClient
-                    .TrainSegmentPairAsync(Arg.Any<TrainSegmentPairRequest>(), null, null, Arg.Any<CancellationToken>())
+                _env.EchoClient.TrainSegmentPairAsync(
+                    Arg.Any<TrainSegmentPairRequest>(),
+                    null,
+                    null,
+                    Arg.Any<CancellationToken>()
+                )
                     .Returns(CreateAsyncUnaryCall<Empty>(StatusCode.Aborted));
                 ex = Assert.ThrowsAsync<ServalApiException>(async () =>
                 {

diff --git a/tests/Serval.ApiServer.IntegrationTests/Usings.cs b/tests/Serval.ApiServer.IntegrationTests/Usings.cs
@@ -17,7 +17,6 @@
 global using NUnit.Framework;
 global using Serval.Client;
 global using Serval.Shared.Controllers;
-global using Serval.Shared.Contracts;
 global using Serval.Translation.Models;
 global using SIL.DataAccess;
 global using SIL.ObjectModel;
diff --git a/tests/Serval.E2ETests/ServalApiTests.cs b/tests/Serval.E2ETests/ServalApiTests.cs
@@ -256,8 +256,8 @@ await _helperClient.AddTextCorpusToEngine(
         WordGraph result = await _helperClient.translationEnginesClient.GetWordGraphAsync(smtEngineId, "verdad");
         Assert.That(result.SourceTokens, Has.Count.EqualTo(1));
         Assert.That(
-            result.Arcs
-                .Where(arc => arc != null && arc.Confidences != null)!
+            result
+                .Arcs.Where(arc => arc != null && arc.Confidences != null)!
                 .MaxBy(arc => arc.Confidences.Average())!
                 .TargetTokens.All(tk => tk == "truth"),
             "Best translation should have been 'truth'but returned word graph: \n{0}",

diff --git a/tests/Serval.E2ETests/Usings.cs b/tests/Serval.E2ETests/Usings.cs
@@ -1,4 +1,4 @@
-global using System.Text.Json;
+global using System.IO.Compression;
+global using System.Text.Json;
 global using NUnit.Framework;
 global using Serval.Client;
-global using System.IO.Compression;
diff --git a/tests/Serval.Webhooks.Tests/Services/WebhookJobTests.cs b/tests/Serval.Webhooks.Tests/Services/WebhookJobTests.cs
@@ -31,8 +31,7 @@ public async Task RunAsync_MatchingHook()
                 Events = new List<WebhookEvent> { WebhookEvent.TranslationBuildStarted }
             }
         );
-        env.MockHttp
-            .Expect("https://test.client.com/hook")
+        env.MockHttp.Expect("https://test.client.com/hook")
             .WithHeaders(
                 "X-Hub-Signature-256",
                 "sha256=8EC2360A34811845884D8FCE03866EA8FAD9429AAA9E6247D7A817AD2E170B8F"
@@ -81,8 +80,7 @@ public void RunAsync_RequestTimeout()
                 Events = new List<WebhookEvent> { WebhookEvent.TranslationBuildStarted }
             }
         );
-        env.MockHttp
-            .Expect("https://test.client.com/hook")
+        env.MockHttp.Expect("https://test.client.com/hook")
             .WithHeaders(
                 "X-Hub-Signature-256",
                 "sha256=8EC2360A34811845884D8FCE03866EA8FAD9429AAA9E6247D7A817AD2E170B8F"
@@ -111,8 +109,7 @@ public void RunAsync_Exception()
                 Events = new List<WebhookEvent> { WebhookEvent.TranslationBuildStarted }
             }
         );
-        env.MockHttp
-            .Expect("https://test.client.com/hook")
+        env.MockHttp.Expect("https://test.client.com/hook")
             .WithHeaders(
                 "X-Hub-Signature-256",
                 "sha256=8EC2360A34811845884D8FCE03866EA8FAD9429AAA9E6247D7A817AD2E170B8F"