Update from reviewer comments

sillsdev · Nov 6, 2024 · 0b418c3 · 0b418c3
1 parent 5e61336
commit 0b418c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Machine/src/Serval.Machine.Shared/Configuration/IMachineBuilderExtensions.cs b/src/Machine/src/Serval.Machine.Shared/Configuration/IMachineBuilderExtensions.cs
@@ -76,7 +76,7 @@ public static IMachineBuilder AddUnigramTruecaser(this IMachineBuilder builder)
 
     public static IMachineBuilder AddClearMLService(this IMachineBuilder builder, string? connectionString = null)
     {
-        connectionString ??= builder.Configuration?.GetConnectionString("ClearML");
+        connectionString ??= builder.Configuration.GetConnectionString("ClearML");
         if (connectionString is null)
             throw new InvalidOperationException("ClearML connection string is required");
 
@@ -145,7 +145,7 @@ public static IMachineBuilder AddMongoHangfireJobClient(
         string? connectionString = null
     )
     {
-        connectionString ??= builder.Configuration?.GetConnectionString("Hangfire");
+        connectionString ??= builder.Configuration.GetConnectionString("Hangfire");
         if (connectionString is null)
             throw new InvalidOperationException("Hangfire connection string is required");
 
@@ -166,7 +166,7 @@ public static IMachineBuilder AddHangfireJobServer(
     )
     {
         engineTypes ??=
-            builder.Configuration?.GetSection("TranslationEngines").Get<TranslationEngineType[]?>()
+            builder.Configuration.GetSection("TranslationEngines").Get<TranslationEngineType[]?>()
             ?? [TranslationEngineType.SmtTransfer, TranslationEngineType.Nmt];
         var queues = new List<string>();
         foreach (TranslationEngineType engineType in engineTypes.Distinct())
@@ -207,7 +207,7 @@ public static IMachineBuilder AddMemoryDataAccess(this IMachineBuilder builder)
 
     public static IMachineBuilder AddMongoDataAccess(this IMachineBuilder builder, string? connectionString = null)
     {
-        connectionString ??= builder.Configuration?.GetConnectionString("Mongo");
+        connectionString ??= builder.Configuration.GetConnectionString("Mongo");
         if (connectionString is null)
             throw new InvalidOperationException("Mongo connection string is required");
         builder.Services.AddMongoDataAccess(
@@ -262,7 +262,7 @@ public static IMachineBuilder AddServalPlatformService(
         string? connectionString = null
     )
     {
-        connectionString ??= builder.Configuration?.GetConnectionString("Serval");
+        connectionString ??= builder.Configuration.GetConnectionString("Serval");
         if (connectionString is null)
             throw new InvalidOperationException("Serval connection string is required");
 
@@ -329,7 +329,7 @@ public static IMachineBuilder AddServalTranslationEngineService(
         builder.AddServalPlatformService(connectionString);
 
         engineTypes ??=
-            builder.Configuration?.GetSection("TranslationEngines").Get<TranslationEngineType[]?>()
+            builder.Configuration.GetSection("TranslationEngines").Get<TranslationEngineType[]?>()
             ?? [TranslationEngineType.SmtTransfer, TranslationEngineType.Nmt];
         foreach (TranslationEngineType engineType in engineTypes.Distinct())
         {
@@ -368,7 +368,7 @@ public static IMachineBuilder AddBuildJobService(this IMachineBuilder builder, s
         if (smtTransferEngineDir is null)
         {
             var smtTransferEngineOptions = new SmtTransferEngineOptions();
-            builder.Configuration?.GetSection(SmtTransferEngineOptions.Key).Bind(smtTransferEngineOptions);
+            builder.Configuration.GetSection(SmtTransferEngineOptions.Key).Bind(smtTransferEngineOptions);
             smtTransferEngineDir = smtTransferEngineOptions.EnginesDir;
         }
         string? driveLetter = Path.GetPathRoot(smtTransferEngineDir)?[..1];

diff --git a/src/Serval/src/Serval.Assessment/Configuration/IServalBuilderExtensions.cs b/src/Serval/src/Serval.Assessment/Configuration/IServalBuilderExtensions.cs
@@ -15,7 +15,7 @@ public static IServalBuilder AddAssessment(this IServalBuilder builder)
         builder.Services.AddScoped<IEngineService, EngineService>();
 
         var assessmentOptions = new AssessmentOptions();
-        builder.Configuration?.GetSection(AssessmentOptions.Key).Bind(assessmentOptions);
+        builder.Configuration.GetSection(AssessmentOptions.Key).Bind(assessmentOptions);
 
         foreach (EngineInfo engine in assessmentOptions.Engines)
         {

diff --git a/src/Serval/src/Serval.Shared/Configuration/IServalBuilderExtensions.cs b/src/Serval/src/Serval.Shared/Configuration/IServalBuilderExtensions.cs
@@ -28,7 +28,7 @@ public static IServalBuilder AddMongoDataAccess(
         Action<IMongoDataAccessConfigurator> configure
     )
     {
-        string? mongoConnectionString = builder.Configuration?.GetConnectionString("Mongo");
+        string? mongoConnectionString = builder.Configuration.GetConnectionString("Mongo");
         if (mongoConnectionString is null)
             throw new InvalidOperationException("Mongo connection string not configured");
         builder.Services.AddMongoDataAccess(mongoConnectionString, "Serval", configure);

diff --git a/src/Serval/src/Serval.Translation/Configuration/IServalBuilderExtensions.cs b/src/Serval/src/Serval.Translation/Configuration/IServalBuilderExtensions.cs
@@ -15,7 +15,7 @@ public static IServalBuilder AddTranslation(this IServalBuilder builder)
         builder.Services.AddScoped<IEngineService, EngineService>();
 
         var translationOptions = new TranslationOptions();
-        builder.Configuration?.GetSection(TranslationOptions.Key).Bind(translationOptions);
+        builder.Configuration.GetSection(TranslationOptions.Key).Bind(translationOptions);
 
         foreach (EngineInfo engine in translationOptions.Engines)
         {