From e32a942fde5f9593dddc72d8178ac2c761da34fd Mon Sep 17 00:00:00 2001
From: Mike Phares <mike.phares@infineon.com>
Date: Tue, 21 May 2024 07:43:37 -0700
Subject: [PATCH] Better format

---
 Models/Binder/AppSettings.cs | 47 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/Models/Binder/AppSettings.cs b/Models/Binder/AppSettings.cs
index 73b08bc..e45f245 100644
--- a/Models/Binder/AppSettings.cs
+++ b/Models/Binder/AppSettings.cs
@@ -85,19 +85,20 @@ public class AppSettings
         return result;
     }
 
-    private static string? GetJson(AppSettings? appSettings)
+    private static Models.AppSettings Get(AppSettings? appSettings)
     {
-        string? result;
+        Models.AppSettings? results;
+        string? json;
         if (appSettings is null || appSettings.ConfigurationFileName is null)
-            result = null;
+            json = null;
         else
         {
             string jsonFile = Path.Combine(AppContext.BaseDirectory, appSettings.ConfigurationFileName);
             if (File.Exists(jsonFile))
-                result = File.ReadAllText(jsonFile);
+                json = File.ReadAllText(jsonFile);
             else
             {
-                result = null;
+                json = null;
                 string applicationData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
                 List<string> collection = [applicationData];
                 if (appSettings?.ConfigurationDirectoryNames is not null)
@@ -106,10 +107,24 @@ public class AppSettings
                     collection.Add(appSettings.ConfigurationFileName);
                 jsonFile = Path.Combine(collection.ToArray());
             }
-            if (string.IsNullOrEmpty(result) && File.Exists(jsonFile))
-                result = File.ReadAllText(jsonFile);
+            if (string.IsNullOrEmpty(json) && File.Exists(jsonFile))
+                json = File.ReadAllText(jsonFile);
         }
-        return result;
+        results = (string.IsNullOrEmpty(json) ? null : results = JsonSerializer.Deserialize(json, AppSettingsSourceGenerationContext.Default.AppSettings)) ??
+            throw new NullReferenceException(nameof(Models.AppSettings));
+        results = Get(appSettings,
+                      results.DriveConfiguration,
+                      results.CompassConfiguration,
+                      results.EAFLogConfiguration,
+                      results.EAFProgramDataConfiguration,
+                      results.EDADatabaseConfiguration,
+                      results.NugetConfiguration,
+                      results.MetrologyConfiguration,
+                      results.SerialConfiguration,
+                      results.StratusConfiguration,
+                      results.TransmissionControlProtocolConfiguration,
+                      results.WaferCounterConfiguration);
+        return results;
     }
 
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
@@ -119,21 +134,7 @@ public class AppSettings
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
 #pragma warning restore IL3050, IL2026
         PreVerify(configurationRoot, appSettings);
-        string? json = GetJson(appSettings);
-        Models.AppSettings? modelsAppSettings = (string.IsNullOrEmpty(json) ? null : modelsAppSettings = JsonSerializer.Deserialize(json, AppSettingsSourceGenerationContext.Default.AppSettings)) ??
-            throw new NullReferenceException(nameof(Models.AppSettings));
-        result = Get(appSettings,
-                     modelsAppSettings.DriveConfiguration,
-                     modelsAppSettings.CompassConfiguration,
-                     modelsAppSettings.EAFLogConfiguration,
-                     modelsAppSettings.EAFProgramDataConfiguration,
-                     modelsAppSettings.EDADatabaseConfiguration,
-                     modelsAppSettings.NugetConfiguration,
-                     modelsAppSettings.MetrologyConfiguration,
-                     modelsAppSettings.SerialConfiguration,
-                     modelsAppSettings.StratusConfiguration,
-                     modelsAppSettings.TransmissionControlProtocolConfiguration,
-                     modelsAppSettings.WaferCounterConfiguration);
+        result = Get(appSettings);
         return result;
     }