Remove BeginSubscription from Unsubscriber.

Author: tosh-coding

src/AsyncFiberWorks/Channels/Unsubscriber.cs

@@ -1,12 +1,11 @@
-using AsyncFiberWorks.Core;
 using System;
 
 namespace AsyncFiberWorks.Channels
 {
     /// <summary>
     /// Disposables.
     /// </summary>
-    public class Unsubscriber: ISubscriptionRegistry, IDisposable
+    public class Unsubscriber: IDisposable
     {
         private readonly object _lock = new object();
         private Action _actionUnsubscribe;
@@ -33,52 +32,28 @@ public Unsubscriber(Action action)
         /// <summary>
         /// Add a disposable.
         /// </summary>
-        /// <param name="action"></param>
-        public void Add(Action action)
+        /// <param name="disposingAction">A disposable.</param>
+        public void Add(Action disposingAction)
         {
             bool added = false;
             lock (_lock)
             {
                 if (!_disposed)
                 {
-                    _actionUnsubscribe += action;
+                    _actionUnsubscribe += disposingAction;
                     added = true;
                 }
             }
             if (!added)
             {
-                action();
+                disposingAction();
             }
         }
 
         /// <summary>
-        /// Create and register a new Unsubscriber.
-        /// It will be disposed when the subscription target ends.
+        /// Add a disposable.
         /// </summary>
-        /// <returns>Created unsubscriber.</returns>
-        public Unsubscriber BeginSubscription()
-        {
-            var unsubscriber = new Unsubscriber();
-            Action action = () => unsubscriber.Dispose();
-            this.Add(action);
-            Action disposable = () => this.Remove(action);
-            unsubscriber.Add(disposable);
-            return unsubscriber;
-        }
-
-        private bool Remove(Action action)
-        {
-            lock (_lock)
-            {
-                if (!_disposed)
-                {
-                    _actionUnsubscribe -= action;
-                    return true;
-                }
-            }
-            return false;
-        }
-
+        /// <param name="disposable">A disposable.</param>
         public void AddDisposable(IDisposable disposable)
         {
             this.Add(() => disposable.Dispose());

src/AsyncFiberWorks/Core/ISubscriptionRegistry.cs

@@ -8,9 +8,9 @@ namespace AsyncFiberWorks.Core
     public interface ISubscriptionRegistry
     {
         /// <summary>
-        /// Create an unsubscriber who unsubscribes when the fiber is discarded.
+        /// Begin subscription.
         /// </summary>
-        /// <returns>Unsubscriber with the unregister process as an element.</returns>
+        /// <returns>Unsubscribers. It is also discarded when the subscription subject is terminated.</returns>
         Unsubscriber BeginSubscription();
     }
 }

src/AsyncFiberWorks/Core/Subscriptions.cs

@@ -19,7 +19,7 @@ public class Subscriptions : ISubscriptionRegistry, IDisposable
         /// </summary>
         /// <param name="toAdd"></param>
         /// <returns>A disposer to unregister the subscription.</returns>
-        public IDisposable RegisterSubscription(IDisposable toAdd)
+        private IDisposable RegisterSubscription(IDisposable toAdd)
         {
             bool added = false;
             lock (_lock)

src/AsyncFiberWorks/Fibers/ISubscribableFiber.cs

@@ -7,12 +7,7 @@ namespace AsyncFiberWorks.Fibers
     /// Enqueue pending actions to the execution context.
     /// Subscription available for continued fiber use. All are cancelled when fiber is destroyed.
     /// </summary>
-    public interface ISubscribableFiber : IExecutionContext
+    public interface ISubscribableFiber : IExecutionContext, ISubscriptionRegistry
     {
-        /// <summary>
-        /// Begin subscription.
-        /// </summary>
-        /// <returns>Unsubscribers. It is also discarded when the subscription subject is terminated.</returns>
-        Unsubscriber BeginSubscription();
     }
 }

src/AsyncFiberWorks/Fibers/PoolFiber.cs

@@ -47,7 +47,7 @@ public void Dispose()
         }
 
         /// <summary>
-        /// <see cref="Subscriptions.BeginSubscription"/>
+        /// <see cref="ISubscriptionRegistry.BeginSubscription"/>
         /// </summary>
         /// <returns></returns>
         public Unsubscriber BeginSubscription()
@@ -56,7 +56,7 @@ public Unsubscriber BeginSubscription()
         }
 
         /// <summary>
-        /// <see cref="ISubscriptionRegistry.NumSubscriptions"/>
+        /// <see cref="ISubscriptionRegistryViewing.NumSubscriptions"/>
         /// </summary>
         public int NumSubscriptions
         {

src/AsyncFiberWorks/Fibers/StubFiber.cs

@@ -41,7 +41,7 @@ public void Dispose()
         }
 
         /// <summary>
-        /// <see cref="Subscriptions.BeginSubscription"/>
+        /// <see cref="ISubscriptionRegistry.BeginSubscription"/>
         /// </summary>
         /// <returns></returns>
         public Unsubscriber BeginSubscription()
@@ -50,7 +50,7 @@ public Unsubscriber BeginSubscription()
         }
 
         /// <summary>
-        /// <see cref="ISubscriptionRegistry.NumSubscriptions"/>
+        /// <see cref="ISubscriptionRegistryViewing.NumSubscriptions"/>
         /// </summary>
         public int NumSubscriptions
         {

src/AsyncFiberWorks/Fibers/ThreadFiber.cs

@@ -102,7 +102,7 @@ public void Dispose()
         }
 
         /// <summary>
-        /// <see cref="Subscriptions.BeginSubscription"/>
+        /// <see cref="ISubscriptionRegistry.BeginSubscription"/>
         /// </summary>
         /// <returns></returns>
         public Unsubscriber BeginSubscription()
@@ -111,7 +111,7 @@ public Unsubscriber BeginSubscription()
         }
 
         /// <summary>
-        /// <see cref="ISubscriptionRegistry.NumSubscriptions"/>
+        /// <see cref="ISubscriptionRegistryViewing.NumSubscriptions"/>
         /// </summary>
         public int NumSubscriptions
         {

src/WpfExample/DispatcherFiber.cs

@@ -90,7 +90,7 @@ public void Stop()
         }
 
         /// <summary>
-        /// <see cref="Subscriptions.BeginSubscription"/>
+        /// <see cref="ISubscriptionRegistry.BeginSubscription"/>
         /// </summary>
         /// <returns></returns>
         public Unsubscriber BeginSubscription()
@@ -99,7 +99,7 @@ public Unsubscriber BeginSubscription()
         }
 
         /// <summary>
-        /// <see cref="ISubscriptionRegistry.NumSubscriptions"/>
+        /// <see cref="ISubscriptionRegistryViewing.NumSubscriptions"/>
         /// </summary>
         public int NumSubscriptions
         {

src/WpfExample/FormFiber.cs

@@ -39,7 +39,7 @@ public void Stop()
         }
 
         /// <summary>
-        /// <see cref="Subscriptions.BeginSubscription"/>
+        /// <see cref="ISubscriptionRegistry.BeginSubscription"/>
         /// </summary>
         /// <returns></returns>
         public Unsubscriber BeginSubscription()
@@ -48,7 +48,7 @@ public Unsubscriber BeginSubscription()
         }
 
         /// <summary>
-        /// <see cref="ISubscriptionRegistry.NumSubscriptions"/>
+        /// <see cref="ISubscriptionRegistryViewing.NumSubscriptions"/>
         /// </summary>
         public int NumSubscriptions
         {