Activate Nullable reference types

nager · Sep 17, 2024 · 4a73f61 · 4a73f61
1 parent 18be28f
commit 4a73f61
Show file tree

Hide file tree

Showing 37 changed files with 125 additions and 113 deletions.
diff --git a/src/Nager.Date/Extensions/DateTimeExtension.cs b/src/Nager.Date/Extensions/DateTimeExtension.cs
@@ -33,7 +33,7 @@ internal static DateTime Shift(
             this DateTime value,
             Func<DateTime, DateTime> saturday,
             Func<DateTime, DateTime> sunday,
-            Func<DateTime, DateTime> monday = null)
+            Func<DateTime, DateTime>? monday = null)
         {
             switch (value.DayOfWeek)
             {

diff --git a/src/Nager.Date/Extensions/ListExtension.cs b/src/Nager.Date/Extensions/ListExtension.cs
@@ -7,7 +7,7 @@ internal static class ListExtension
     {
         internal static void AddIfNotNull(
             this List<HolidaySpecification> holidaySpecificationList,
-            HolidaySpecification holidaySpecification)
+            HolidaySpecification? holidaySpecification)
         {
             if (holidaySpecification is null)
             {

diff --git a/src/Nager.Date/Helpers/LicenseHelper.cs b/src/Nager.Date/Helpers/LicenseHelper.cs
@@ -12,8 +12,13 @@ public static class LicenseHelper
         /// </summary>
         /// <param name="licenseKey"></param>
         /// <returns></returns>
-        public static LicenseInfo CheckLicenseKey(string licenseKey)
+        public static LicenseInfo? CheckLicenseKey(string? licenseKey)
         {
+            if (licenseKey == null)
+            {
+                return null;
+            }
+
             var licenseKeyConfiguration = new LicenseKeyConfiguration
             {
                 Part1 = "DCDCB65FD3009576BC11E23C883220F6292709DEB93174D0913D2E89DB3D5D88",

diff --git a/src/Nager.Date/HolidayProviders/AustraliaHolidayProvider.cs b/src/Nager.Date/HolidayProviders/AustraliaHolidayProvider.cs
@@ -289,7 +289,7 @@ private HolidaySpecification[] MonarchBirthday(int year)
             ];
         }
 
-        private HolidaySpecification MourningForQueenElizabeth(int year)
+        private HolidaySpecification? MourningForQueenElizabeth(int year)
         {
             if (year == 2022)
             {

diff --git a/src/Nager.Date/HolidayProviders/CanadaHolidayProvider.cs b/src/Nager.Date/HolidayProviders/CanadaHolidayProvider.cs
@@ -278,7 +278,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification FuneralForQueenElizabeth(int year)
+        private HolidaySpecification? FuneralForQueenElizabeth(int year)
         {
             if (year == 2022)
             {

diff --git a/src/Nager.Date/HolidayProviders/ChileHolidayProvider.cs b/src/Nager.Date/HolidayProviders/ChileHolidayProvider.cs
@@ -208,7 +208,7 @@ private HolidaySpecification ReformationDay(int year)
             };
         }
 
-        private HolidaySpecification NationalPlebiscite(int year)
+        private HolidaySpecification? NationalPlebiscite(int year)
         {
             if (year != 2022)
             {
@@ -249,7 +249,7 @@ private HolidaySpecification NationalPlebiscite(int year)
             }
         }
 
-        private HolidaySpecification NationalDayOfIndigenousPeoples(int year)
+        private HolidaySpecification? NationalDayOfIndigenousPeoples(int year)
         {
             var winterSolstice = this.GetWinterSolstice(year);
             if (winterSolstice is null)

diff --git a/src/Nager.Date/HolidayProviders/CostaRicaHolidayProvider.cs b/src/Nager.Date/HolidayProviders/CostaRicaHolidayProvider.cs
@@ -78,7 +78,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
 
         private HolidaySpecification GetJuanSantamariaDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();
@@ -96,7 +96,7 @@ private HolidaySpecification GetJuanSantamariaDay(int year)
 
         private HolidaySpecification GetLabourDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();
@@ -114,7 +114,7 @@ private HolidaySpecification GetLabourDay(int year)
 
         private HolidaySpecification GetAnnexationDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();
@@ -132,7 +132,7 @@ private HolidaySpecification GetAnnexationDay(int year)
 
         private HolidaySpecification GetMothersDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();
@@ -150,7 +150,7 @@ private HolidaySpecification GetMothersDay(int year)
 
         private HolidaySpecification GetIndenpendenceDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();
@@ -168,7 +168,7 @@ private HolidaySpecification GetIndenpendenceDay(int year)
 
         private HolidaySpecification GetArmyAbolitionDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
             if (year == 2020 || year == 2021 || year == 2022)
             {
                 observedRuleSet = this.Law9875RuleSet();

diff --git a/src/Nager.Date/HolidayProviders/CroatiaHolidayProvider.cs b/src/Nager.Date/HolidayProviders/CroatiaHolidayProvider.cs
@@ -104,7 +104,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification GetIndependenceDay(int year)
+        private HolidaySpecification? GetIndependenceDay(int year)
         {
             if (year >= 2002 && year < 2020)
             {
@@ -120,7 +120,7 @@ private HolidaySpecification GetIndependenceDay(int year)
             return null;
         }
 
-        private HolidaySpecification GetRemembranceDay(int year)
+        private HolidaySpecification? GetRemembranceDay(int year)
         {
             if (year >= 2020)
             {
@@ -136,7 +136,7 @@ private HolidaySpecification GetRemembranceDay(int year)
             return null;
         }
 
-        private HolidaySpecification GetStatehoodDay(int year)
+        private HolidaySpecification? GetStatehoodDay(int year)
         {
             if (year >= 2002 && year < 2020)
             {
@@ -152,7 +152,7 @@ private HolidaySpecification GetStatehoodDay(int year)
             return null;
         }
 
-        private HolidaySpecification GetNationalDay(int year)
+        private HolidaySpecification? GetNationalDay(int year)
         {
             if (year >= 2020)
             {

diff --git a/src/Nager.Date/HolidayProviders/DenmarkHolidayProvider.cs b/src/Nager.Date/HolidayProviders/DenmarkHolidayProvider.cs
@@ -93,7 +93,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification GeneralPrayerDay(int year)
+        private HolidaySpecification? GeneralPrayerDay(int year)
         {
             if (year < 2024)
             {

diff --git a/src/Nager.Date/HolidayProviders/FinlandHolidayProvider.cs b/src/Nager.Date/HolidayProviders/FinlandHolidayProvider.cs
@@ -1,3 +1,4 @@
+using Nager.Date.Extensions;
 using Nager.Date.Helpers;
 using Nager.Date.Models;
 using Nager.Date.ReligiousProviders;
@@ -68,13 +69,6 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
                     HolidayTypes = HolidayTypes.Public
                 },
                 new HolidaySpecification
-                {
-                    Date = allSaintsDay.Value,
-                    EnglishName = "All Saints' Day",
-                    LocalName = "Pyhäinpäivä",
-                    HolidayTypes = HolidayTypes.Public
-                },
-                new HolidaySpecification
                 {
                     Date = new DateTime(year, 12, 6),
                     EnglishName = "Independence Day",
@@ -109,6 +103,17 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
                 this._catholicProvider.Pentecost("Helluntaipäivä", year)
             };
 
+            if (allSaintsDay.HasValue)
+            {
+                holidaySpecifications.AddIfNotNull(new HolidaySpecification
+                {
+                    Date = allSaintsDay.Value,
+                    EnglishName = "All Saints' Day",
+                    LocalName = "Pyhäinpäivä",
+                    HolidayTypes = HolidayTypes.Public
+                });
+            }
+
             return holidaySpecifications;
         }
 

diff --git a/src/Nager.Date/HolidayProviders/GermanyHolidayProvider.cs b/src/Nager.Date/HolidayProviders/GermanyHolidayProvider.cs
@@ -129,7 +129,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification WorldChildrensDay(int year)
+        private HolidaySpecification? WorldChildrensDay(int year)
         {
             if (year >= 2019)
             {
@@ -146,7 +146,7 @@ private HolidaySpecification WorldChildrensDay(int year)
             return null;
         }
 
-        private HolidaySpecification InternationalWomensDay(int year)
+        private HolidaySpecification? InternationalWomensDay(int year)
         {
             var localName = "Internationaler Frauentag";
             var englishName = "International Women's Day";
@@ -213,7 +213,7 @@ private HolidaySpecification ReformationDay(int year)
             };
         }
 
-        private HolidaySpecification PrayerDay(int year)
+        private HolidaySpecification? PrayerDay(int year)
         {
             var dayOfPrayer = this._catholicProvider.AdventSunday(year).AddDays(-11);
             var localName = "Buß- und Bettag";
@@ -280,7 +280,7 @@ private HolidaySpecification PrayerDay(int year)
             return null;
         }
 
-        private HolidaySpecification LiberationDay(int year)
+        private HolidaySpecification? LiberationDay(int year)
         {
             if (year == 2020)
             {

diff --git a/src/Nager.Date/HolidayProviders/IrelandHolidayProvider.cs b/src/Nager.Date/HolidayProviders/IrelandHolidayProvider.cs
@@ -99,7 +99,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification SaintBrigidsDay(int year)
+        private HolidaySpecification? SaintBrigidsDay(int year)
         {
             if (year < 2023)
             {

diff --git a/src/Nager.Date/HolidayProviders/IsleOfManHolidayProvider.cs b/src/Nager.Date/HolidayProviders/IsleOfManHolidayProvider.cs
@@ -177,7 +177,7 @@ private HolidaySpecification SpringBankHoliday(int year)
 
         #region Royal family
 
-        private HolidaySpecification QueensPlatinumJubilee(int year)
+        private HolidaySpecification? QueensPlatinumJubilee(int year)
         {
             if (year == 2022)
             {
@@ -196,7 +196,7 @@ private HolidaySpecification QueensPlatinumJubilee(int year)
             return null;
         }
 
-        private HolidaySpecification QueensStateFuneral(int year)
+        private HolidaySpecification? QueensStateFuneral(int year)
         {
             if (year == 2022)
             {
@@ -215,7 +215,7 @@ private HolidaySpecification QueensStateFuneral(int year)
             return null;
         }
 
-        private HolidaySpecification CoronationBankHoliday(int year)
+        private HolidaySpecification? CoronationBankHoliday(int year)
         {
             if (year == 2023)
             {

diff --git a/src/Nager.Date/HolidayProviders/JapanHolidayProvider.cs b/src/Nager.Date/HolidayProviders/JapanHolidayProvider.cs
@@ -141,7 +141,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
         /// <see href="https://en.wikipedia.org/wiki/The_Emperor%27s_Birthday#Emperor_birthday_list" />
         /// <param name="year"></param>
         /// <returns>Emperors Birthday object or null</returns>
-        private HolidaySpecification EmperorsBirthday(int year)
+        private HolidaySpecification? EmperorsBirthday(int year)
         {
             if (year < 1868)
             {
@@ -197,7 +197,7 @@ private HolidaySpecification EmperorsBirthday(int year)
             };
         }
 
-        private HolidaySpecification SportsDay(int year)
+        private HolidaySpecification? SportsDay(int year)
         {
             if (year <= 1965)
             {
@@ -261,7 +261,7 @@ private HolidaySpecification SportsDay(int year)
             return null;
         }
 
-        private HolidaySpecification VernalEquinox(int year)
+        private HolidaySpecification? VernalEquinox(int year)
         {
             if (year < 1850 || year > 2151)
             {
@@ -296,7 +296,7 @@ private HolidaySpecification VernalEquinox(int year)
             };
         }
 
-        private HolidaySpecification AutumnalEquinox(int year)
+        private HolidaySpecification? AutumnalEquinox(int year)
         {
             if (year < 1850 || year > 2151)
             {

diff --git a/src/Nager.Date/HolidayProviders/MexicoHolidayProvider.cs b/src/Nager.Date/HolidayProviders/MexicoHolidayProvider.cs
@@ -101,7 +101,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification InaugurationDay(int year)
+        private HolidaySpecification? InaugurationDay(int year)
         {
             // The president in Mexico is usually elected every 6 years
             // A reform was introduced in 2014 that changes the date from 2024

diff --git a/src/Nager.Date/HolidayProviders/NetherlandsHolidayProvider.cs b/src/Nager.Date/HolidayProviders/NetherlandsHolidayProvider.cs
@@ -75,7 +75,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification LiberationDay(int year)
+        private HolidaySpecification? LiberationDay(int year)
         {
             var liberationDay = new HolidaySpecification
             {

diff --git a/src/Nager.Date/HolidayProviders/NewZealandHolidayProvider.cs b/src/Nager.Date/HolidayProviders/NewZealandHolidayProvider.cs
@@ -14,7 +14,7 @@ namespace Nager.Date.HolidayProviders
     internal sealed class NewZealandHolidayProvider : AbstractHolidayProvider, ISubdivisionCodesProvider
     {
         private readonly ICatholicProvider _catholicProvider;
-        private IDictionary<int, DateTime> _matariki;
+        private readonly Dictionary<int, DateTime> _matariki;
 
         /// <summary>
         /// New Zealand HolidayProvider
@@ -24,7 +24,7 @@ public NewZealandHolidayProvider(
             ICatholicProvider catholicProvider) : base(CountryCode.NZ)
         {
             this._catholicProvider = catholicProvider;
-            this.InitMatariki();
+            this._matariki = this.InitMatariki();
         }
 
         /// <inheritdoc/>
@@ -264,7 +264,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
             return holidaySpecifications;
         }
 
-        private HolidaySpecification Matariki(int year)
+        private HolidaySpecification? Matariki(int year)
         {
             if (this._matariki.TryGetValue(year, out var matariki))
             {
@@ -282,7 +282,7 @@ private HolidaySpecification Matariki(int year)
 
         private HolidaySpecification WaitangiDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
 
             if (year >= 2016)
             {
@@ -305,7 +305,7 @@ private HolidaySpecification WaitangiDay(int year)
 
         private HolidaySpecification AnzacDay(int year)
         {
-            ObservedRuleSet observedRuleSet = null;
+            ObservedRuleSet? observedRuleSet = null;
 
             if (year >= 2015)
             {
@@ -345,7 +345,7 @@ private HolidaySpecification MonarchBirthday(int year)
             };
         }
 
-        private HolidaySpecification MemorialDayForQueenElizabeth(int year)
+        private HolidaySpecification? MemorialDayForQueenElizabeth(int year)
         {
             if (year == 2022)
             {
@@ -370,9 +370,9 @@ private HolidaySpecification MemorialDayForQueenElizabeth(int year)
         /// The dates have been chosen to account for adjustments between the Maori lunar calendar and
         /// the Gregorian calendar, while ensuring the public holiday falls on a Friday.
         /// </summary>
-        private void InitMatariki()
+        private Dictionary<int, DateTime> InitMatariki()
         {
-            this._matariki = new DateTime[]
+            return new DateTime[]
             {
                 new DateTime(2022, 6, 24),
                 new DateTime(2023, 7, 14),
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,7 +289,7 @@ private HolidaySpecification[] MonarchBirthday(int year) @@
                 ];
             }
-            private HolidaySpecification MourningForQueenElizabeth(int year)
+            private HolidaySpecification? MourningForQueenElizabeth(int year)
             {
                 if (year == 2022)
                 {
@@ Expand Down @@