Bläddra i källkod

Let's be consistent

Piotr Czajkowski 2 veckor sedan
förälder
incheckning
56878bb159
2 ändrade filer med 6 tillägg och 4 borttagningar
  1. 3 2
      ExcelORM/ExcelORM/ExcelDynamicReader.cs
  2. 3 2
      ExcelORM/ExcelORM/ExcelReader.cs

+ 3 - 2
ExcelORM/ExcelORM/ExcelDynamicReader.cs

@@ -119,7 +119,7 @@ public sealed class ExcelDynamicReader : IDisposable
     
     public static IEnumerable<List<DynamicCell>> ReadData(IXLWorkbook? workbook, string? worksheetName, uint startFrom = 1, uint skip = 0)
     {
-        if (workbook == null) return [];
+        ArgumentNullException.ThrowIfNull(workbook);
         
         var worksheet = string.IsNullOrWhiteSpace(worksheetName) ? workbook.Worksheets.FirstOrDefault()
             : workbook.Worksheets.FirstOrDefault(x => x.Name.Equals(worksheetName, StringComparison.InvariantCultureIgnoreCase));
@@ -129,7 +129,8 @@ public sealed class ExcelDynamicReader : IDisposable
     
     public static IEnumerable<List<DynamicCell>> ReadData(IXLWorkbook? workbook, int worksheetIndex = 1, uint startFrom = 1, uint skip = 0)
     {
-        if (workbook == null || worksheetIndex < 1 || worksheetIndex > workbook.Worksheets.Count) return [];
+        ArgumentNullException.ThrowIfNull(workbook);
+        if (worksheetIndex < 1 || worksheetIndex > workbook.Worksheets.Count) return [];
         
         var reader = new ExcelDynamicReader(workbook);
         return reader.Read(worksheetIndex, startFrom, skip);

+ 3 - 2
ExcelORM/ExcelORM/ExcelReader.cs

@@ -128,7 +128,7 @@ public sealed class ExcelReader : IDisposable
     
     public static IEnumerable<T> ReadData<T>(IXLWorkbook? workbook, string? worksheetName, uint startFrom = 1, uint skip = 0) where T : class
     {
-        if (workbook == null) return [];
+        ArgumentNullException.ThrowIfNull(workbook);
         
         var worksheet = string.IsNullOrWhiteSpace(worksheetName) ? workbook.Worksheets.FirstOrDefault()
             : workbook.Worksheets.FirstOrDefault(x => x.Name.Equals(worksheetName, StringComparison.InvariantCultureIgnoreCase));
@@ -138,7 +138,8 @@ public sealed class ExcelReader : IDisposable
     
     public static IEnumerable<T> ReadData<T>(IXLWorkbook? workbook, int worksheetIndex = 1, uint startFrom = 1, uint skip = 0) where T : class
     {
-        if (workbook == null || worksheetIndex < 1 || worksheetIndex > workbook.Worksheets.Count) return [];
+        ArgumentNullException.ThrowIfNull(workbook);
+        if (worksheetIndex < 1 || worksheetIndex > workbook.Worksheets.Count) return [];
         
         var reader = new ExcelReader(workbook);
         return reader.Read<T>(worksheetIndex, startFrom, skip);