update based on comments and use lazy loading

common/Models/ExtensionJsonData/DevHomeExtensionJsonData.cs → common/Models/ExtensionJsonData/DevHomeExtensionContentData.cs

@@ -9,7 +9,7 @@ namespace DevHome.Common.Models.ExtensionJsonData;
 /// Root class that will contain the deserialized data located in the
 /// src\Assets\Schemas\ExtensionInformation.schema.json file.
 /// </summary>
-public class DevHomeExtensionJsonData
+public class DevHomeExtensionContentData
 {
     public List<Product> Products { get; set; } = new();
 }

common/Models/ExtensionJsonData/JsonSourceGenerationContext.cs

@@ -17,7 +17,7 @@ namespace DevHome.Common.Models.ExtensionJsonData;
 [JsonSerializable(typeof(ProviderSpecificProperty))]
 [JsonSerializable(typeof(Properties))]
 [JsonSerializable(typeof(Product))]
-[JsonSerializable(typeof(DevHomeExtensionJsonData))]
+[JsonSerializable(typeof(DevHomeExtensionContentData))]
 [JsonSerializable(typeof(DevHomeExtension))]
 [JsonSerializable(typeof(JsonSchema))]
 [JsonSerializable(typeof(EvaluationResults))]

common/Services/IExtensionService.cs

@@ -41,5 +41,5 @@ public interface IExtensionService
     /// Gets known extension information from internal extension json file.
     /// </summary>
     /// <returns>An object that holds a list of extension information based on the internal json file.</returns>
-    public Task<DevHomeExtensionJsonData?> GetExtensionJsonDataAsync();
+    public Task<DevHomeExtensionContentData?> GetExtensionJsonDataAsync();
 }

src/Assets/Schemas/ExtensionInformation.schema.json

@@ -61,6 +61,7 @@
                             "required": [ "DisplayNameKey" ]
                           },
                           "ProviderType": {
+                            "$comment": "Enum values should be kept in sync with the provider type enum values located in the Dev Home SDK.",
                             "type": "string",
                             "enum": [
                               "ComputeSystem",

src/Services/ExtensionService.cs

@@ -47,9 +47,9 @@ public class ExtensionService : IExtensionService, IDisposable
 
     private readonly IStringResource _stringResource;
 
-    private string? _localExtensionJsonSchemaAbsoluteFilePath;
+    private readonly Lazy<string> _localExtensionJsonSchemaAbsoluteFilePath;
 
-    private string? _localExtensionJsonAbsoluteFilePath;
+    private readonly Lazy<string> _localExtensionJsonAbsoluteFilePath;
 
     public ExtensionService(ILocalSettingsService settingsService, IStringResource stringResource)
     {
@@ -58,6 +58,18 @@ public ExtensionService(ILocalSettingsService settingsService, IStringResource s
         _catalog.PackageUpdating += Catalog_PackageUpdating;
         _localSettingsService = settingsService;
         _stringResource = stringResource;
+        _localExtensionJsonSchemaAbsoluteFilePath = new Lazy<string>(GetExtensionJsonSchemaAbsoluteFilePath);
+        _localExtensionJsonAbsoluteFilePath = new Lazy<string>(GetExtensionJsonAbsoluteFilePath);
+    }
+
+    private string GetExtensionJsonSchemaAbsoluteFilePath()
+    {
+        return Path.Combine(_localSettingsService.GetPathToPackageLocation(), LocalExtensionJsonSchemaRelativeFilePath);
+    }
+
+    private string GetExtensionJsonAbsoluteFilePath()
+    {
+        return Path.Combine(_localSettingsService.GetPathToPackageLocation(), LocalExtensionJsonRelativeFilePath);
     }
 
     private void Catalog_PackageInstalling(PackageCatalog sender, PackageInstallingEventArgs args)
@@ -415,18 +427,15 @@ public async Task<bool> DisableExtensionIfWindowsFeatureNotAvailable(IExtensionW
         return true;
     }
 
-    public async Task<DevHomeExtensionJsonData?> GetExtensionJsonDataAsync()
+    public async Task<DevHomeExtensionContentData?> GetExtensionJsonDataAsync()
     {
         try
         {
-            _localExtensionJsonSchemaAbsoluteFilePath ??= Path.Combine(_localSettingsService.GetPathToPackageLocation(), LocalExtensionJsonRelativeFilePath);
-            _localExtensionJsonAbsoluteFilePath ??= Path.Combine(_localSettingsService.GetPathToPackageLocation(), LocalExtensionJsonRelativeFilePath);
-
-            _log.Information($"Getting extension information from file: '{_localExtensionJsonAbsoluteFilePath}'");
-            var extensionJson = await File.ReadAllTextAsync(_localExtensionJsonAbsoluteFilePath);
+            _log.Information($"Getting extension information from file: '{_localExtensionJsonAbsoluteFilePath.Value}'");
+            var extensionJson = await File.ReadAllTextAsync(_localExtensionJsonAbsoluteFilePath.Value);
             var serializerOptions = ExtensionJsonSerializerOptions;
             serializerOptions.Converters.Add(new LocalizedPropertiesConverter(_stringResource));
-            return JsonSerializer.Deserialize<DevHomeExtensionJsonData>(extensionJson, serializerOptions);
+            return JsonSerializer.Deserialize<DevHomeExtensionContentData>(extensionJson, serializerOptions);
         }
         catch (Exception ex)
         {

test/FunctionalTests/ExtensionServiceTests.cs

@@ -35,6 +35,6 @@ public async Task ExtensionServiceReturnsValidExtensionJsonDataObject()
         var extensionJsonData = await extensionService.GetExtensionJsonDataAsync();
         Assert.IsNotNull(extensionJsonData);
 
-        Assert.IsInstanceOfType(extensionJsonData, typeof(DevHomeExtensionJsonData));
+        Assert.IsInstanceOfType(extensionJsonData, typeof(DevHomeExtensionContentData));
     }
 }