NRT clean-up after all NRT pull requests got merged

Ical.Net.Tests/EncodingProviderTests.cs

@@ -5,6 +5,7 @@
 
 #nullable enable
 using System;
+using System.Runtime.Serialization;
 using Ical.Net.Serialization;
 using NUnit.Framework;
 using EncodingProvider = Ical.Net.Serialization.EncodingProvider;
@@ -33,7 +34,7 @@ public void Encode_ShouldBeNull_WhenInvalidEncodingIsProvided()
         const string encoding = "Invalid-Encoding";
         var data = "Hello"u8.ToArray();
 
-        Assert.That(GetEncodingProvider().Encode(encoding, data), Is.Null);
+        Assert.That(() => GetEncodingProvider().Encode(encoding, data), Throws.TypeOf<SerializationException>());
     }
 
     [Test]
@@ -53,7 +54,7 @@ public void Decode_ShouldBeNull_WhenInvalidEncodingIsProvided()
         const string encoding = "Invalid-Encoding";
         const string data = "Hello";
 
-        Assert.That(GetEncodingProvider().DecodeString(encoding, data), Is.Null);
+        Assert.That(() => GetEncodingProvider().DecodeString(encoding, data), Throws.TypeOf<SerializationException>());
     }
 
     [Test]

Ical.Net.Tests/PeriodListWrapperTests.cs

@@ -185,7 +185,7 @@ public void AddRPeriod_ShouldCreate_DedicatePeriodList()
         ]);
 
         var serializer = new CalendarSerializer(cal);
-        var serialized = serializer.SerializeToString();
+        var serialized = serializer.SerializeToString()!;
         // Assign the deserialized event
         cal = Calendar.Load(serialized)!;
         evt = cal.Events[0];

Ical.Net.Tests/RecurrenceTests.cs

@@ -3940,7 +3940,7 @@ public void TestDtStartTimezone(string? tzId)
     [TestCase(1, TestMaxIncrementCountWithoutGaps, false)]
     public void TestMaxIncrementCount(int? limit, string ical, bool expectException)
     {
-        var cal = Calendar.Load(ical);
+        var cal = Calendar.Load(ical)!;
 
         var options = new EvaluationOptions
         {

Ical.Net.Tests/RecurrenceWithExDateTests.cs

@@ -55,7 +55,7 @@ public void ShouldNotOccurOnLocalExceptionDate(bool useExDateWithTime)
 
         // Act
         var serializer = new CalendarSerializer();
-        var ics = serializer.SerializeToString(calendar);
+        var ics = serializer.SerializeToString(calendar)!;
 
         var deserializedCalendar = Calendar.Load(ics)!;
         var occurrences = deserializedCalendar.GetOccurrences<CalendarEvent>().ToList();
@@ -102,7 +102,7 @@ public void ShouldNotOccurOnUtcExceptionDate()
         var serializer = new CalendarSerializer();
         ics = serializer.SerializeToString(cal);
         // serialize and deserialize to ensure the exclusion dates de/serialized
-        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString())!;
+        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString()!)!;
 
         // Start date: 2024-10-19 at 18:00 (GMT Standard Time)
         // Recurrence: Every hour, 4 occurrences
@@ -150,7 +150,7 @@ public void MultipleExclusionDatesSameTimeZoneShouldBeExcluded()
         var serializer = new CalendarSerializer();
         ics = serializer.SerializeToString(cal);
         // serialize and deserialize to ensure the exclusion dates de/serialized
-        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString())!;
+        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString()!)!;
 
         // Occurrences:
         // 2023-10-25 09:00 (UTC Offset: +0200)
@@ -206,7 +206,7 @@ public void MultipleExclusionDatesDifferentZoneShouldBeExcluded()
 
         var cal = Calendar.Load(ics)!;
         // serialize and deserialize to ensure the exclusion dates de/serialized
-        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString())!;
+        cal = Calendar.Load(new CalendarSerializer(cal).SerializeToString()!)!;
         var occurrences = cal.GetOccurrences<CalendarEvent>().ToList();
 
         // Occurrences:

Ical.Net/Calendar.cs

@@ -121,7 +121,7 @@ public override int GetHashCode()
     {
         unchecked
         {
-            var hashCode = Name?.GetHashCode() ?? 0;
+            var hashCode = Name.GetHashCode();
             hashCode = (hashCode * 397) ^ CollectionHelpers.GetHashCode(UniqueComponents);
             hashCode = (hashCode * 397) ^ CollectionHelpers.GetHashCode(Events);
             hashCode = (hashCode * 397) ^ CollectionHelpers.GetHashCode(Todos);
@@ -227,7 +227,7 @@ public virtual IEnumerable<Occurrence> GetOccurrences<T>(CalDateTime? startTime
         // These are the UID/RECURRENCE-ID combinations that replace other occurrences.
         var recurrenceIdsAndUids = this.Children.OfType<IRecurrable>()
             .Where(r => r.RecurrenceId != null)
-            .Select(r => new { (r as IUniqueComponent).Uid, Dt = r.RecurrenceId!.Value })
+            .Select(r => new { (r as IUniqueComponent)?.Uid, Dt = r.RecurrenceId!.Value })
             .Where(r => r.Uid != null)
             .ToDictionary(x => x);
 
@@ -290,14 +290,12 @@ public virtual void MergeWith(IMergeable obj)
             return;
         }
 
-        Name ??= c.Name;
-
         Method = c.Method;
         Version = c.Version;
         ProductId = c.ProductId;
         Scale = c.Scale;
 
-        foreach (var p in c.Properties.Where(p => p.Name != null && !Properties.ContainsKey(p.Name)))
+        foreach (var p in c.Properties.Where(p => !Properties.ContainsKey(p.Name)))
         {
             Properties.Add(p);
         }

Ical.Net/CalendarCollection.cs

@@ -74,7 +74,7 @@ private FreeBusy CombineFreeBusy(FreeBusy? main, FreeBusy current)
         return this.Aggregate<Calendar, FreeBusy?>(null, (current, iCal) =>
         {
             var freeBusy = iCal.GetFreeBusy(freeBusyRequest);
-            return current is null ? freeBusy : CombineFreeBusy(current, freeBusy);
+            return current is null || freeBusy is null ? freeBusy : CombineFreeBusy(current, freeBusy);
         });
     }
 
@@ -83,7 +83,7 @@ private FreeBusy CombineFreeBusy(FreeBusy? main, FreeBusy current)
         return this.Aggregate<Calendar, FreeBusy?>(null, (current, iCal) =>
         {
             var freeBusy = iCal.GetFreeBusy(organizer, contacts, fromInclusive, toExclusive);
-            return current is null ? freeBusy : CombineFreeBusy(current, freeBusy);
+            return current is null || freeBusy is null ? freeBusy : CombineFreeBusy(current, freeBusy);
         });
     }
 

Ical.Net/CalendarComponents/Alarm.cs

@@ -172,7 +172,7 @@ private void AddRepeatedItems(List<AlarmOccurrence> occurrences)
         for (var i = 0; i < len; i++)
         {
             var ao = occurrences[i];
-            if (ao?.DateTime == null || ao.Component == null)
+            if (ao.DateTime == null || ao.Component == null)
             {
                 continue;
             }

Ical.Net/CalendarComponents/Todo.cs

@@ -85,7 +85,7 @@
     public virtual IList<string> Resources
     {
         get => Properties.GetMany<string>("RESOURCES");
-        set => Properties.Set("RESOURCES", value ?? new List<string>());
+        set => Properties.Set("RESOURCES", value);
     }
 
     /// <summary>

Ical.Net/CalendarComponents/VTimeZone.cs

@@ -324,7 +324,7 @@
                 return;
             }
 
             _nodaZone = DateUtil.GetZone(value);
             var id = _nodaZone.Id;
             if (string.IsNullOrWhiteSpace(id))
             {
@@ -383,7 +383,7 @@
     {
         unchecked
         {
-            var hashCode = Name?.GetHashCode() ?? 0;
+            var hashCode = Name.GetHashCode();
             hashCode = (hashCode * 397) ^ (TzId?.GetHashCode() ?? 0);
             hashCode = (hashCode * 397) ^ (Url?.GetHashCode() ?? 0);
             return hashCode;

Ical.Net/Collections/Proxies/GroupedValueListProxy.cs

@@ -64,7 +64,7 @@
         foreach (var obj in _realObject)
         {
             // Get the number of items of the target value i this object
-            var count = obj.Values?.OfType<TNewValue>().Count() ?? 0;
+            var count = obj.Values.OfType<TNewValue>().Count();
 
             // Perform some action on this item
             if (!action(obj, i, count))

Ical.Net/DataTypes/Attachment.cs

@@ -113,8 +113,8 @@ public override int GetHashCode()
         unchecked
         {
             var hashCode = Uri?.GetHashCode() ?? 0;
-            hashCode = (hashCode * 397) ^ (CollectionHelpers.GetHashCode(Data));
-            hashCode = (hashCode * 397) ^ (ValueEncoding?.GetHashCode() ?? 0);
+            hashCode = (hashCode * 397) ^ (Data != null ? CollectionHelpers.GetHashCode(Data) : 0);
+            hashCode = (hashCode * 397) ^ (ValueEncoding.GetHashCode());
             return hashCode;
         }
     }

Ical.Net/DataTypes/Occurrence.cs

@@ -41,7 +41,7 @@
     {
         unchecked
         {
-            return ((Period?.GetHashCode() ?? 0) * 397) ^ (Source?.GetHashCode() ?? 0);
+            return ((Period.GetHashCode()) * 397) ^ (Source.GetHashCode());
         }
     }
 

Ical.Net/DataTypes/PeriodList.cs

@@ -125,7 +125,7 @@ public void Insert(int index, Period item)
     }
 
     /// <inheritdoc/>
-    public void RemoveAt(int index) => Periods?.RemoveAt(index);
+    public void RemoveAt(int index) => Periods.RemoveAt(index);
 
     /// <summary>
     /// Adds a <see cref="Period"/> to the list if it does not already exist.<br/>
@@ -159,7 +159,7 @@ public void Add(CalDateTime dt)
     public bool Contains(Period item) => Periods.Contains(item);
 
     /// <inheritdoc/>
-    public void CopyTo(Period[] array, int arrayIndex) => Periods?.CopyTo(array, arrayIndex);
+    public void CopyTo(Period[] array, int arrayIndex) => Periods.CopyTo(array, arrayIndex);
 
     /// <inheritdoc/>
     public IEnumerator<Period> GetEnumerator() => Periods.GetEnumerator();

Ical.Net/DataTypes/Trigger.cs

@@ -119,7 +119,7 @@
         {
             var hashCode = _mDateTime?.GetHashCode() ?? 0;
             hashCode = (hashCode * 397) ^ _mDuration.GetHashCode();
-            hashCode = (hashCode * 397) ^ _mRelated?.GetHashCode() ?? 0;
+            hashCode = (hashCode * 397) ^ _mRelated.GetHashCode();
             return hashCode;
         }
     }

Ical.Net/Evaluation/RecurrencePatternEvaluator.cs

@@ -100,10 +100,10 @@ private RecurrencePattern ProcessRecurrencePattern(CalDateTime referenceDate)
 
         // Pre-order those BY values that don't allow for negative values. Those with negative values can only
         // be ordered once the individual position is known.
-        if (r.BySecond?.Count > 0) r.BySecond = r.BySecond.OrderBy(x => x).ToList();
-        if (r.ByMinute?.Count > 0) r.ByMinute = r.ByMinute.OrderBy(x => x).ToList();
-        if (r.ByHour?.Count > 0) r.ByHour = r.ByHour.OrderBy(x => x).ToList();
-        if (r.ByMonth?.Count > 0) r.ByMonth = r.ByMonth.OrderBy(x => x).ToList();
+        if (r.BySecond.Count > 0) r.BySecond = r.BySecond.OrderBy(x => x).ToList();
+        if (r.ByMinute.Count > 0) r.ByMinute = r.ByMinute.OrderBy(x => x).ToList();
+        if (r.ByHour.Count > 0) r.ByHour = r.ByHour.OrderBy(x => x).ToList();
+        if (r.ByMonth.Count > 0) r.ByMonth = r.ByMonth.OrderBy(x => x).ToList();
 
         return r;
     }

Ical.Net/Serialization/ComponentSerializer.cs

@@ -45,7 +45,7 @@ public ComponentSerializer(SerializationContext ctx) : base(ctx) { }
         foreach (var p in properties)
         {
             // Get a serializer for each property.
-            var serializer = sf?.Build(p.GetType(), SerializationContext) as IStringSerializer;
+            var serializer = sf.Build(p.GetType(), SerializationContext) as IStringSerializer;
             var val = serializer?.SerializeToString(p);
             if (val != null) sb.Append(val);
         }

Ical.Net/Serialization/DataTypes/DataTypeSerializer.cs

@@ -23,7 +23,7 @@ protected DataTypeSerializer(SerializationContext ctx) : base(ctx) { }
             return null;
         }
 
-        if (SerializationContext?.Peek() is ICalendarObject associatedObject)
+        if (SerializationContext.Peek() is ICalendarObject associatedObject)
         {
             dt.AssociatedObject = associatedObject;
         }

Ical.Net/Serialization/DataTypes/DateTimeSerializer.cs

@@ -68,7 +68,7 @@ public DateTimeSerializer(SerializationContext ctx) : base(ctx) { }
         var value = tr.ReadToEnd();
 
         // CalDateTime is defined as the Target type
-        var parent = SerializationContext?.Peek();
+        var parent = SerializationContext.Peek();
 
         // The associated object is an ICalendarObject of type CalendarProperty
         // that contains any timezone ("TZID" property) deserialized in a prior step

Ical.Net/Serialization/DataTypes/EncodableDataTypeSerializer.cs

@@ -28,9 +28,8 @@
 
         // Return the value in the current encoding
         var encodingStack = GetService<EncodingStack>();
-        return encodingStack?.Current == null
-            ? value
-            : Encode(dt, encodingStack.Current.GetBytes(value));
+
+        return Encode(dt, encodingStack.Current.GetBytes(value));
     }
 
     protected string? Encode(IEncodableDataType dt, byte[]? data)
@@ -44,11 +43,11 @@
         {
             // Default to the current encoding
             var encodingStack = GetService<EncodingStack>();
-            return encodingStack?.Current.GetString(data);
+            return encodingStack.Current.GetString(data);
         }
 
         var encodingProvider = GetService<IEncodingProvider>();
-        return encodingProvider?.Encode(dt.Encoding, data);
+        return encodingProvider.Encode(dt.Encoding, data);
     }
 
     protected string? Decode(IEncodableDataType dt, string value)
@@ -66,7 +65,7 @@
 
         // Default to the current encoding
         var encodingStack = GetService<EncodingStack>();
-        return encodingStack?.Current.GetString(data);
+        return encodingStack.Current.GetString(data);
     }
 
     protected byte[]? DecodeData(IEncodableDataType dt, string? value)
@@ -80,10 +79,10 @@
         {
             // Default to the current encoding
             var encodingStack = GetService<EncodingStack>();
-            return encodingStack?.Current.GetBytes(value);
+            return encodingStack.Current.GetBytes(value);
         }
 
         var encodingProvider = GetService<IEncodingProvider>();
-        return encodingProvider?.DecodeData(dt.Encoding, value);
+        return encodingProvider.DecodeData(dt.Encoding, value);
     }
 }

Ical.Net/Serialization/DataTypes/EnumSerializer.cs

@@ -30,7 +30,7 @@ public EnumSerializer(Type enumType, SerializationContext ctx) : base(ctx)
     {
         try
         {
-            if (SerializationContext?.Peek() is ICalendarObject calObject)
+            if (SerializationContext.Peek() is ICalendarObject calObject)
             {
                 // Encode the value as needed.
                 var dt = new EncodableDataType
@@ -53,7 +53,7 @@ public EnumSerializer(Type enumType, SerializationContext ctx) : base(ctx)
 
         try
         {
-            if (SerializationContext?.Peek() is ICalendarObject obj)
+            if (SerializationContext.Peek() is ICalendarObject obj)
             {
                 // Decode the value, if necessary!
                 var dt = new EncodableDataType

Ical.Net/Serialization/DataTypes/IntegerSerializer.cs

@@ -24,7 +24,7 @@ public IntegerSerializer(SerializationContext ctx) : base(ctx) { }
         {
             var i = Convert.ToInt32(obj);
 
-            if (SerializationContext?.Peek() is ICalendarObject calObject)
+            if (SerializationContext.Peek() is ICalendarObject calObject)
             {
                 // Encode the value as needed.
                 var dt = new EncodableDataType
@@ -47,7 +47,7 @@ public IntegerSerializer(SerializationContext ctx) : base(ctx) { }
 
         try
         {
-            if (SerializationContext?.Peek() is ICalendarObject obj)
+            if (SerializationContext.Peek() is ICalendarObject obj)
             {
                 // Decode the value, if necessary!
                 var dt = new EncodableDataType

Ical.Net/Serialization/DataTypes/PeriodSerializer.cs

@@ -29,7 +29,7 @@ public PeriodSerializer(SerializationContext ctx) : base(ctx) { }
         }
 
         // Push the period onto the serialization context stack
-        SerializationContext?.Push(p);
+        SerializationContext.Push(p);
 
         try
         {
@@ -71,7 +71,7 @@ public PeriodSerializer(SerializationContext ctx) : base(ctx) { }
         finally
         {
             // Pop the period off the serialization context stack
-            SerializationContext?.Pop();
+            SerializationContext.Pop();
         }
     }
 

Ical.Net/Serialization/DataTypes/RequestStatusSerializer.cs

@@ -40,7 +40,7 @@
             try
             {
                 var factory = GetService<ISerializerFactory>();
-                var serializer = factory?.Build(typeof(StatusCode), SerializationContext) as IStringSerializer;
+                var serializer = factory.Build(typeof(StatusCode), SerializationContext) as IStringSerializer;
                 if (serializer == null)
                 {
                     return null;
@@ -60,7 +60,7 @@
             finally
             {
                 // Pop the object off the serialization stack
-                SerializationContext?.Pop();
+                SerializationContext.Pop();
             }
         }
         catch
@@ -128,7 +128,7 @@
         finally
         {
             // Pop the object off the serialization stack
-            SerializationContext?.Pop();
+            SerializationContext.Pop();
         }
         return null;
     }