Merge branch 'bugfix/RelatedTopicCollection-isInternal-overloads' into develop

JeremyCaney · JeremyCaney · commit c780f4e535f6 · 2020-12-17T16:58:35.000-08:00
In a previous set of commits, I moved the `RelatedTopicCollection` overloads which accepted `isIncoming` to be marked as `internal` (5e40470, 5706897). In setting up their public overloads, however, I inadvertantly introduced an infinite loop by a) failing to ensure they passed a value for `isIncoming`, and b) creating an ambiguous reference for the internal overload by making the `isIncoming` parameter optional. Whoops! This fixes that issue by ensuring the `public` version of `RemoveTopic()` defaults to setting `isIncoming` to `false`, and the `internal` version of `RemoveTopic()` doesn't assume a default for `isIncoming`.
diff --git a/OnTopic/Collections/RelatedTopicCollection.cs b/OnTopic/Collections/RelatedTopicCollection.cs
@@ -133,7 +133,7 @@ public void ClearTopics(string relationshipKey) {
     ///   Returns true if the <see cref="Topic"/> is removed; returns false if either the relationship key or the
     ///   <see cref="Topic"/> cannot be found.
     /// </returns>
-    public bool RemoveTopic(string relationshipKey, string topicKey) => RemoveTopic(relationshipKey, topicKey);
+    public bool RemoveTopic(string relationshipKey, string topicKey) => RemoveTopic(relationshipKey, topicKey, false);
 
     /// <summary>
     ///   Removes a specific <see cref="Topic"/> object associated with a specific relationship key.
@@ -147,7 +147,7 @@ public void ClearTopics(string relationshipKey) {
     ///   Returns true if the <see cref="Topic"/> is removed; returns false if either the relationship key or the
     ///   <see cref="Topic"/> cannot be found.
     /// </returns>
-    internal bool RemoveTopic(string relationshipKey, string topicKey, bool isIncoming = false) {
+    internal bool RemoveTopic(string relationshipKey, string topicKey, bool isIncoming) {
 
       /*------------------------------------------------------------------------------------------------------------------------
       | Validate contracts
@@ -181,7 +181,7 @@ internal bool RemoveTopic(string relationshipKey, string topicKey, bool isIncomi
     ///   Returns true if the <see cref="Topic"/> is removed; returns false if either the relationship key or the
     ///   <see cref="Topic"/> cannot be found.
     /// </returns>
-    public bool RemoveTopic(string relationshipKey, Topic topic) => RemoveTopic(relationshipKey, topic);
+    public bool RemoveTopic(string relationshipKey, Topic topic) => RemoveTopic(relationshipKey, topic, false);
 
 
     /// <summary>
@@ -196,7 +196,7 @@ internal bool RemoveTopic(string relationshipKey, string topicKey, bool isIncomi
     ///   Returns true if the <see cref="Topic"/> is removed; returns false if either the relationship key or the
     ///   <see cref="Topic"/> cannot be found.
     /// </returns>
-    internal bool RemoveTopic(string relationshipKey, Topic topic, bool isIncoming = false) {
+    internal bool RemoveTopic(string relationshipKey, Topic topic, bool isIncoming) {
 
       /*------------------------------------------------------------------------------------------------------------------------
       | Validate contracts
@@ -300,7 +300,7 @@ internal void SetTopic(string relationshipKey, Topic topic, bool? isDirty, bool
             nameof(isIncoming)
           );
         }
-        topic.IncomingRelationships.SetTopic(relationshipKey, _parent, true);
+        topic.IncomingRelationships.SetTopic(relationshipKey, _parent, isDirty, true);
       }
 
     }
