Enable NRT for EncodableDataType, FreeBusyEntry, GeographicLocation, Occurrence, RequestStatus, StatusCode, Trigger, UTCOffset, WeekDay

Ical.Net/CalendarComponents/Alarm.cs

@@ -125,8 +125,11 @@
         }
         else
         {
-            var dt = Trigger.DateTime.Copy();
-            occurrences.Add(new AlarmOccurrence(this, dt, rc));
+            var dt = Trigger?.DateTime?.Copy();
+            if (dt != null)
+            {
+                occurrences.Add(new AlarmOccurrence(this, dt, rc));
+            }
         }
 
         // If a REPEAT and DURATION value were specified,
@@ -150,8 +153,7 @@
         var results = new List<AlarmOccurrence>();
 
         // Evaluate the alarms to determine the recurrences
-        var rc = Parent as RecurringComponent;
-        if (rc == null)
+        if (Parent is not RecurringComponent rc)
         {
             return results;
         }

Ical.Net/DataTypes/EncodableDataType.cs

@@ -3,16 +3,17 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 namespace Ical.Net.DataTypes;
 
 /// <summary>
 /// An abstract class from which all iCalendar data types inherit.
 /// </summary>
 public class EncodableDataType : CalendarDataType, IEncodableDataType
 {
-    public virtual string Encoding
+    public virtual string? Encoding
     {
         get => Parameters.Get("ENCODING");
         set => Parameters.Set("ENCODING", value);
     }
-}
+}

Ical.Net/DataTypes/FreeBusyEntry.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 namespace Ical.Net.DataTypes;
 
 public class FreeBusyEntry : Period
@@ -16,8 +17,8 @@ public FreeBusyEntry()
 
     public FreeBusyEntry(Period period, FreeBusyStatus status)
     {
-        //Sets the status associated with a given period, which requires copying the period values
-        //Probably the Period object should just have a FreeBusyStatus directly?
+        // Sets the status associated with a given period, which requires copying the period values
+        // Probably the Period object should just have a FreeBusyStatus directly?
         CopyFrom(period);
         Status = status;
     }
@@ -32,4 +33,4 @@ public override void CopyFrom(ICopyable obj)
             Status = fb.Status;
         }
     }
-}
+}

Ical.Net/DataTypes/GeographicLocation.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System.Diagnostics;
 using Ical.Net.CalendarComponents;
 using Ical.Net.Serialization.DataTypes;
@@ -52,7 +53,7 @@ public override void CopyFrom(ICopyable obj)
 
     protected bool Equals(GeographicLocation other) => Latitude.Equals(other.Latitude) && Longitude.Equals(other.Longitude);
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj)) return false;
         if (ReferenceEquals(this, obj)) return true;
@@ -66,4 +67,4 @@ public override int GetHashCode()
             return (Latitude.GetHashCode() * 397) ^ Longitude.GetHashCode();
         }
     }
-}
+}

Ical.Net/DataTypes/Occurrence.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System;
 using Ical.Net.CalendarComponents;
 
@@ -27,13 +28,13 @@ public Occurrence(IRecurrable recurrable, Period period)
 
     public bool Equals(Occurrence other) => Equals(Period, other.Period) && Equals(Source, other.Source);
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj))
         {
             return false;
         }
-        return obj is Occurrence && Equals((Occurrence) obj);
+        return obj is Occurrence occurrence && Equals(occurrence);
     }
 
     public override int GetHashCode()
@@ -44,21 +45,7 @@ public override int GetHashCode()
         }
     }
 
-    public override string ToString()
-    {
-        var s = "Occurrence";
-        if (Source != null)
-        {
-            s = Source.GetType().Name + " ";
-        }
-
-        if (Period != null)
-        {
-            s += "(" + Period.StartTime + ")";
-        }
-
-        return s;
-    }
+    public override string ToString() => $"Occurrence {Source.GetType().Name} ({Period.StartTime})";
 
-    public int CompareTo(Occurrence other) => Period.CompareTo(other.Period);
-}
+    public int CompareTo(Occurrence? other) => Period.CompareTo(other?.Period);
+}

Ical.Net/DataTypes/RequestStatus.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System.IO;
 using Ical.Net.Serialization.DataTypes;
 
@@ -13,23 +14,23 @@
 /// </summary>
 public class RequestStatus : EncodableDataType
 {
-    private string _mDescription;
-    private string _mExtraData;
-    private StatusCode _mStatusCode;
+    private string? _mDescription;
+    private string? _mExtraData;
+    private StatusCode? _mStatusCode;
 
-    public virtual string Description
+    public virtual string? Description
     {
         get => _mDescription;
         set => _mDescription = value;
     }
 
-    public virtual string ExtraData
+    public virtual string? ExtraData
     {
         get => _mExtraData;
         set => _mExtraData = value;
     }
 
-    public virtual StatusCode StatusCode
+    public virtual StatusCode? StatusCode
     {
         get => _mStatusCode;
         set => _mStatusCode = value;
@@ -40,7 +41,10 @@
     public RequestStatus(string value) : this()
     {
         var serializer = new RequestStatusSerializer();
-        CopyFrom(serializer.Deserialize(new StringReader(value)) as ICopyable);
+        if (serializer.Deserialize(new StringReader(value)) is ICopyable deserializedObject)
+        {
+            CopyFrom(deserializedObject);
+        }
     }
 
     /// <inheritdoc/>
@@ -52,10 +56,7 @@
             return;
         }
 
-        if (rs.StatusCode != null)
-        {
-            StatusCode = rs.StatusCode;
-        }
+        StatusCode = rs.StatusCode;
         Description = rs.Description;
         ExtraData = rs.ExtraData;
     }
@@ -69,7 +70,7 @@
     protected bool Equals(RequestStatus other) => string.Equals(_mDescription, other._mDescription) && string.Equals(_mExtraData, other._mExtraData) &&
                                                   Equals(_mStatusCode, other._mStatusCode);
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj))
         {
@@ -96,4 +97,4 @@
             return hashCode;
         }
     }
-}
+}

Ical.Net/DataTypes/StatusCode.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System.IO;
 using System.Linq;
 using Ical.Net.Serialization.DataTypes;
@@ -37,7 +38,10 @@
         ? Parts[2]
         : 0;
 
-    public StatusCode() { }
+    public StatusCode()
+    {
+        Parts = System.Array.Empty<int>();
+    }
 
     public StatusCode(int[] parts)
     {
@@ -47,7 +51,11 @@
     public StatusCode(string value) : this()
     {
         var serializer = new StatusCodeSerializer();
-        CopyFrom(serializer.Deserialize(new StringReader(value)) as ICopyable);
+        var deserialized = serializer.Deserialize(new StringReader(value)) as ICopyable;
+        if (deserialized != null)
+        {
+            CopyFrom(deserialized);
+        }
     }
 
     /// <inheritdoc/>
@@ -64,7 +72,7 @@
 
     protected bool Equals(StatusCode other) => Parts.SequenceEqual(other.Parts);
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj))
         {
@@ -82,4 +90,4 @@
     }
 
     public override int GetHashCode() => CollectionHelpers.GetHashCode(Parts);
-}
+}

Ical.Net/DataTypes/Trigger.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System;
 using System.IO;
 using Ical.Net.Serialization.DataTypes;
@@ -15,11 +16,11 @@
 /// </summary>
 public class Trigger : EncodableDataType
 {
-    private CalDateTime _mDateTime;
+    private CalDateTime? _mDateTime;
     private Duration? _mDuration;
     private string _mRelated = TriggerRelation.Start;
 
-    public virtual CalDateTime DateTime
+    public virtual CalDateTime? DateTime
     {
         get => _mDateTime;
         set
@@ -30,9 +31,6 @@
                 return;
             }
 
-            // NOTE: this, along with the "Duration" setter, fixes the bug tested in
-            // TODO11(), as well as this thread: https://sourceforge.net/forum/forum.php?thread_id=1926742&forum_id=656447
-
             // DateTime and Duration are mutually exclusive
             Duration = null;
 
@@ -52,8 +50,6 @@
             _mDuration = value;
             if (_mDuration != null)
             {
-                // NOTE: see above.
-
                 // DateTime and Duration are mutually exclusive
                 DateTime = null;
             }
@@ -78,7 +74,10 @@
     public Trigger(string value) : this()
     {
         var serializer = new TriggerSerializer();
-        CopyFrom(serializer.Deserialize(new StringReader(value)) as ICopyable);
+        if (serializer.Deserialize(new StringReader(value)) is ICopyable deserializedObject)
+        {
+            CopyFrom(deserializedObject);
+        }
     }
 
     /// <inheritdoc/>
@@ -97,7 +96,7 @@
 
     protected bool Equals(Trigger other) => Equals(_mDateTime, other._mDateTime) && _mDuration.Equals(other._mDuration) && _mRelated == other._mRelated;
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj))
         {

Ical.Net/DataTypes/UTCOffset.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license.
 //
 
+#nullable enable
 using System;
 using Ical.Net.Serialization.DataTypes;
 
@@ -45,7 +46,7 @@ public UtcOffset(TimeSpan ts)
 
     protected bool Equals(UtcOffset other) => Offset == other.Offset;
 
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         if (ReferenceEquals(null, obj))
         {
@@ -76,4 +77,4 @@ public override void CopyFrom(ICopyable obj)
             Offset = o.Offset;
         }
     }
-}
+}