Enable NRT for EncodableDataType, FreeBusyEntry, GeographicLocation, Occurrence, RequestStatus, StatusCode, Trigger, UTCOffset, WeekDay (#763)

axunonb · web-flow · commit 3c6fec7152e6 · 2025-04-11T13:50:55.000+02:00
* Enable NRT for `EncodableDataType`

* Enable NRT for `FreeBusyEntry`

* Enable NRT for `GeographicLocation`

* Enable NRT for `DataTypes.Occurrence`

* Enable NRT for `RequestStatus`

* Enable NRT for `StatusCode`

* Enable NRT for `Trigger`

* Enable NRT for `UTCOffset`

* Enable NRT for `DataTypes.WeekDay`
diff --git a/Ical.Net/CalendarComponents/Alarm.cs b/Ical.Net/CalendarComponents/Alarm.cs
@@ -125,8 +125,11 @@ public virtual IList<AlarmOccurrence> GetOccurrences(IRecurringComponent rc, Cal
         }
         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 @@ public virtual IList<AlarmOccurrence> Poll(CalDateTime? start, CalDateTime? end,
         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;
         }
diff --git a/Ical.Net/DataTypes/EncodableDataType.cs b/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);
     }
-}
+}
diff --git a/Ical.Net/DataTypes/FreeBusyEntry.cs b/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;
         }
     }
-}
+}
diff --git a/Ical.Net/DataTypes/GeographicLocation.cs b/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();
         }
     }
-}
+}
diff --git a/Ical.Net/DataTypes/Occurrence.cs b/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);
+}
diff --git a/Ical.Net/DataTypes/RequestStatus.cs b/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 @@ namespace Ical.Net.DataTypes;
 /// </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() { }
     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 @@ public override void CopyFrom(ICopyable obj)
             return;
         }
 
-        if (rs.StatusCode != null)
-        {
-            StatusCode = rs.StatusCode;
-        }
+        StatusCode = rs.StatusCode;
         Description = rs.Description;
         ExtraData = rs.ExtraData;
     }
@@ -69,7 +70,7 @@ public override string ToString()
     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 @@ public override int GetHashCode()
             return hashCode;
         }
     }
-}
+}
diff --git a/Ical.Net/DataTypes/StatusCode.cs b/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 @@ public int Primary
         ? Parts[2]
         : 0;
 
-    public StatusCode() { }
+    public StatusCode()
+    {
+        Parts = System.Array.Empty<int>();
+    }
 
     public StatusCode(int[] parts)
     {
@@ -47,7 +51,11 @@ public StatusCode(int[] parts)
     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 @@ public override void CopyFrom(ICopyable obj)
 
     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 bool Equals(object obj)
     }
 
     public override int GetHashCode() => CollectionHelpers.GetHashCode(Parts);
-}
+}
diff --git a/Ical.Net/DataTypes/Trigger.cs b/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 @@ namespace Ical.Net.DataTypes;
 /// </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 @@ public virtual CalDateTime DateTime
                 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 @@ public virtual Duration? Duration
             _mDuration = value;
             if (_mDuration != null)
             {
-                // NOTE: see above.
-
                 // DateTime and Duration are mutually exclusive
                 DateTime = null;
             }
@@ -78,7 +74,10 @@ public Trigger(Duration ts)
     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 @@ public override void CopyFrom(ICopyable obj)
 
     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))
         {
diff --git a/Ical.Net/DataTypes/UTCOffset.cs b/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;
         }
     }
-}
+}
diff --git a/Ical.Net/DataTypes/WeekDay.cs b/Ical.Net/DataTypes/WeekDay.cs

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,11 @@ public virtual IList<AlarmOccurrence> GetOccurrences(IRecurringComponent rc, Cal`
`125`	`125`	`}`
`126`	`126`	`else`
`127`	`127`	`{`
`128`		`- var dt = Trigger.DateTime.Copy();`
`129`		`- occurrences.Add(new AlarmOccurrence(this, dt, rc));`
	`128`	`+ var dt = Trigger?.DateTime?.Copy();`
	`129`	`+ if (dt != null)`
	`130`	`+ {`
	`131`	`+ occurrences.Add(new AlarmOccurrence(this, dt, rc));`
	`132`	`+ }`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	`// If a REPEAT and DURATION value were specified,`
`@@ -150,8 +153,7 @@ public virtual IList<AlarmOccurrence> Poll(CalDateTime? start, CalDateTime? end,`
`150`	`153`	`var results = new List<AlarmOccurrence>();`
`151`	`154`
`152`	`155`	`// Evaluate the alarms to determine the recurrences`
`153`		`- var rc = Parent as RecurringComponent;`
`154`		`- if (rc == null)`
	`156`	`+ if (Parent is not RecurringComponent rc)`
`155`	`157`	`{`
`156`	`158`	`return results;`
`157`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,17 @@`
`3`	`3`	`// Licensed under the MIT license.`
`4`	`4`	`//`
`5`	`5`
	`6`	`+#nullable enable`
`6`	`7`	`namespace Ical.Net.DataTypes;`
`7`	`8`
`8`	`9`	`/// <summary>`
`9`	`10`	`/// An abstract class from which all iCalendar data types inherit.`
`10`	`11`	`/// </summary>`
`11`	`12`	`public class EncodableDataType : CalendarDataType, IEncodableDataType`
`12`	`13`	`{`
`13`		`- public virtual string Encoding`
	`14`	`+ public virtual string? Encoding`
`14`	`15`	`{`
`15`	`16`	`get => Parameters.Get("ENCODING");`
`16`	`17`	`set => Parameters.Set("ENCODING", value);`
`17`	`18`	`}`
`18`		`-}`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// Licensed under the MIT license.`
`4`	`4`	`//`
`5`	`5`
	`6`	`+#nullable enable`
`6`	`7`	`namespace Ical.Net.DataTypes;`
`7`	`8`
`8`	`9`	`public class FreeBusyEntry : Period`
`@@ -16,8 +17,8 @@ public FreeBusyEntry()`
`16`	`17`
`17`	`18`	`public FreeBusyEntry(Period period, FreeBusyStatus status)`
`18`	`19`	`{`
`19`		`- //Sets the status associated with a given period, which requires copying the period values`
`20`		`- //Probably the Period object should just have a FreeBusyStatus directly?`
	`20`	`+ // Sets the status associated with a given period, which requires copying the period values`
	`21`	`+ // Probably the Period object should just have a FreeBusyStatus directly?`
`21`	`22`	`CopyFrom(period);`
`22`	`23`	`Status = status;`
`23`	`24`	`}`
`@@ -32,4 +33,4 @@ public override void CopyFrom(ICopyable obj)`
`32`	`33`	`Status = fb.Status;`
`33`	`34`	`}`
`34`	`35`	`}`
`35`		`-}`
	`36`	`+}`