From 7192d1d1b67b0461ff91a4280a7a981786dc63ca Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 18 Feb 2020 18:49:32 -0600 Subject: [PATCH] resolve CA1062 warning --- .../Seed/Extensions/SeedExtension.cs | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/server/src/FilterLists.Data/Seed/Extensions/SeedExtension.cs b/server/src/FilterLists.Data/Seed/Extensions/SeedExtension.cs index b8947ebe0..76649e190 100644 --- a/server/src/FilterLists.Data/Seed/Extensions/SeedExtension.cs +++ b/server/src/FilterLists.Data/Seed/Extensions/SeedExtension.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; +using Ardalis.GuardClauses; using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Data.Seed.Extensions @@ -9,16 +10,17 @@ public static class SeedExtension { public static void HasDataJsonFile(this EntityTypeBuilder entityTypeBuilder) { - string path = Path.Combine("../../../data", $"{typeof(TEntity).Name}.json"); - if (File.Exists(path)) + Guard.Against.Null(entityTypeBuilder, nameof(entityTypeBuilder)); + + var path = Path.Combine("../../../data", $"{typeof(TEntity).Name}.json"); + if (!File.Exists(path)) return; + + var entitiesJson = File.ReadAllText(path); + var entities = JsonSerializer.Deserialize>(entitiesJson, new JsonSerializerOptions { - var entitiesJson = File.ReadAllText(path); - var entities = JsonSerializer.Deserialize>(entitiesJson, new JsonSerializerOptions - { - PropertyNamingPolicy = JsonNamingPolicy.CamelCase - }); - entityTypeBuilder.HasData((IEnumerable)entities); - } + PropertyNamingPolicy = JsonNamingPolicy.CamelCase + }); + entityTypeBuilder.HasData((IEnumerable)entities); } } } \ No newline at end of file