Completes reversal of NotifyAsync change

For scenarios where async notification of events is needed, this might fall in the telemetry category, which does the work in a separte buffered way already, so this wouldn't be necessary at all (i.e. in an OpenTelemetry scenario, for example).

Author: kzu

src/Merq.Abstractions/IMessageBus.cs

@@ -103,7 +103,7 @@ public interface IMessageBus
     /// <param name="callerName">Optional calling member name, provided by default by the compiler.</param>
     /// <param name="callerFile">Optional calling file name, provided by default by the compiler.</param>
     /// <param name="callerLine">Optional calling line number, provided by default by the compiler.</param>
-    ValueTask NotifyAsync<TEvent>(TEvent e, [CallerMemberName] string? callerName = default, [CallerFilePath] string? callerFile = default, [CallerLineNumber] int? callerLine = default);
+    void Notify<TEvent>(TEvent e, [CallerMemberName] string? callerName = default, [CallerFilePath] string? callerFile = default, [CallerLineNumber] int? callerLine = default);
 
     /// <summary>
     /// Observes the events of a given type <typeparamref name="TEvent"/>.

src/Merq.Abstractions/IMessageBusExtensions.cs

@@ -1,8 +1,5 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Merq;
 
@@ -12,32 +9,12 @@ namespace Merq;
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class IMessageBusExtensions
 {
-    /// <summary>
-    /// Notifies the bus of an event.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [Obsolete("Use await NotifyAsync instead.")]
-    public static void Notify<TEvent>(this IMessageBus bus, TEvent e, [CallerMemberName] string? callerName = default, [CallerFilePath] string? callerFile = default, [CallerLineNumber] int? callerLine = default)
-    {
-        var result = bus.NotifyAsync(e, callerName, callerFile, callerLine);
-        while (!result.IsCompleted)
-            Thread.SpinWait(1);
-    }
-
     /// <summary>
     /// Notifies the bus of a new event instance of <typeparamref name="TEvent"/>.
     /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [Obsolete("Use await NotifyAsync instead.")]
     public static void Notify<TEvent>(this IMessageBus bus, [CallerMemberName] string? callerName = default, [CallerFilePath] string? callerFile = default, [CallerLineNumber] int? callerLine = default) where TEvent : new()
         => bus.Notify(new TEvent(), callerName, callerFile, callerLine);
 
-    /// <summary>
-    /// Notifies the bus of a new event instance of <typeparamref name="TEvent"/>.
-    /// </summary>
-    public static ValueTask NotifyAsync<TEvent>(this IMessageBus bus, [CallerMemberName] string? callerName = default, [CallerFilePath] string? callerFile = default, [CallerLineNumber] int? callerLine = default) where TEvent : new()
-        => bus.NotifyAsync(new TEvent(), callerName, callerFile, callerLine);
-
     /// <summary>
     /// Executes the given synchronous command.
     /// </summary>

src/Merq.Abstractions/Merq.Abstractions.csproj

@@ -16,13 +16,12 @@
 
   <ItemGroup>
     <PackageReference Include="NuGetizer" />
-    <PackageReference Include="Microsoft.CSharp" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Condition="$(TargetFramework) == 'netstandard2.0'" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Merq.CodeAnalysis\Merq.CodeAnalysis.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\Merq.CodeFixes\Merq.CodeFixes.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\Merq.CodeAnalysis\Merq.CodeAnalysis.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\Merq.CodeFixes\Merq.CodeFixes.csproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>

src/Merq.CodeAnalysis.Tests/Merq.CodeAnalysis.Tests.csproj

@@ -17,7 +17,6 @@
     <PackageReference Include="Moq" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
-    <PackageReference Include="Microsoft.CSharp" />
     <PackageReference Include="Scriban" />
     <PackageReference Include="SharpYaml" />
     <PackageReference Include="Superpower" PrivateAssets="all" />
@@ -35,4 +34,7 @@
     <Using Include="Xunit.Abstractions" />
   </ItemGroup>
 
+  <Import Project="..\SponsorLink\SponsorLink\buildTransitive\Devlooped.Sponsors.targets" />
+  <Import Project="..\SponsorLink\SponsorLink.Analyzer.Tests.targets" />
+
 </Project>

src/Merq.Tests/DuckTyping.cs

@@ -53,29 +53,29 @@ public abstract class DuckTyping
 
 #if NET6_0_OR_GREATER
     [Fact]
-    public async Task ConvertEvent()
+    public void ConvertEvent()
     {
         var bus = CreateMessageBus();
         string? message = null;
 
         bus.Observe<Library1::Library.DuckEvent>()
             .Subscribe(e => message = e.Message);
 
-        await bus.NotifyAsync(new Library2::Library.DuckEvent("Foo"));
+        bus.Notify(new Library2::Library.DuckEvent("Foo"));
 
         Assert.Equal("Foo", message);
     }
 
     [Fact]
-    public async Task ConvertEventHierarchy()
+    public void ConvertEventHierarchy()
     {
         var bus = CreateMessageBus();
         int sumstarts = 0;
 
         bus.Observe<Library1::Library.OnDidEdit>()
             .Subscribe(e => sumstarts = e.Buffer.Lines.Select(l => l.Start).Sum(p => p.X));
 
-        await bus.NotifyAsync(new Library2::Library.OnDidEdit(
+        bus.Notify(new Library2::Library.OnDidEdit(
             new Library2::Library.Buffer(new[]
             {
                 new Library2::Library.Line(new Library2::Library.Point(1, 2), new Library2::Library.Point(3, 4)) ,
@@ -86,15 +86,15 @@ await bus.NotifyAsync(new Library2::Library.OnDidEdit(
     }
 
     [Fact]
-    public async Task CustomConvertEvent()
+    public void CustomConvertEvent()
     {
         var bus = CreateMessageBus();
         Library2::Library.Line? line = null;
 
         bus.Observe<Library2::Library.OnDidDrawLine>()
             .Subscribe(e => line = e.Line);
 
-        await bus.NotifyAsync(new Library1::Library.OnDidDrawLine(new Library1::Library.Line(new Library1::Library.Point(1, 2), new Library1::Library.Point(3, 4))));
+        bus.Notify(new Library1::Library.OnDidDrawLine(new Library1::Library.Line(new Library1::Library.Point(1, 2), new Library1::Library.Point(3, 4))));
 
         Assert.NotNull(line);
         Assert.Equal(1, line.Start.X);

src/Merq.Tests/Merq.Tests.csproj

@@ -24,7 +24,6 @@
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Microsoft.Reactive.Testing" />
-    <PackageReference Include="Microsoft.CSharp" />
     <PackageReference Include="Scriban" />
     <PackageReference Include="SharpYaml" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />

src/Merq.Tests/MessageBusServiceSpec.cs

@@ -58,7 +58,7 @@ public void given_external_producer_when_subscribing_to_base_then_notifies()
     }
 
     [Fact]
-    public async Task given_external_producer_then_can_notify_event()
+    public void given_external_producer_then_can_notify_event()
     {
         var producer = new Subject<ConcreteEvent>();
 
@@ -74,81 +74,81 @@ public async Task given_external_producer_then_can_notify_event()
 
         bus.Observe<ConcreteEvent>().Subscribe(e => actual = e);
 
-        await bus.NotifyAsync(expected);
+        bus.Notify(expected);
 
         Assert.Equal(expected, actual);
     }
 
     [Fact]
-    public async Task when_subscribing_subject_then_succeeds()
+    public void when_subscribing_subject_then_succeeds()
     {
         int? value = default;
         bus.Observe<int>().Subscribe(i => value = i);
 
-        await bus.NotifyAsync(42);
+        bus.Notify(42);
 
         Assert.Equal(42, value);
     }
 
     [Fact]
-    public async Task when_notifying_null_event_then_throws()
-        => await Assert.ThrowsAsync<ArgumentNullException>(async () => await bus.NotifyAsync<object?>(null));
+    public void when_notifying_null_event_then_throws()
+        => Assert.Throws<ArgumentNullException>(() => bus.Notify<object?>(null));
 
     [Fact]
-    public async Task when_notifying_non_public_event_type_then_calls_subscriber()
+    public void when_notifying_non_public_event_type_then_calls_subscriber()
     {
         var called = false;
 
         bus.Observe<NonPublicEvent>().Subscribe(x => called = true);
 
-        await bus.NotifyAsync(new NonPublicEvent());
+        bus.Notify(new NonPublicEvent());
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_notifying_nested_non_public_event_type_then_calls_subscriber()
+    public void when_notifying_nested_non_public_event_type_then_calls_subscriber()
     {
         var called = false;
 
         bus.Observe<NestedEvent>().Subscribe(x => called = true);
 
-        await bus.NotifyAsync(new NestedEvent());
+        bus.Notify(new NestedEvent());
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_notifying_non_subscribed_event_then_does_not_call_subscriber()
+    public void when_notifying_non_subscribed_event_then_does_not_call_subscriber()
     {
         var called = false;
 
         using var subs = bus.Observe<ConcreteEvent>().Subscribe(c => called = true);
 
-        await bus.NotifyAsync(new AnotherEvent());
+        bus.Notify(new AnotherEvent());
 
         Assert.False(called);
     }
 
     [Fact]
-    public async Task when_notifying_subscribed_event_using_base_type_then_calls_derived_subscriber()
+    public void when_notifying_subscribed_event_using_base_type_then_calls_derived_subscriber()
     {
         var called = false;
         using var subscription = bus.Observe<ConcreteEvent>().Subscribe(c => called = true);
 
         BaseEvent e = new ConcreteEvent();
-        await bus.NotifyAsync(e);
+        bus.Notify(e);
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_subscribing_as_event_interface_then_calls_subscriber()
+    public void when_subscribing_as_event_interface_then_calls_subscriber()
     {
         var called = false;
         using var subs = bus.Observe<IBaseEvent>().Subscribe(c => called = true);
 
-        await bus.NotifyAsync(new ConcreteEvent());
+        bus.Notify(new ConcreteEvent());
 
         Assert.True(called);
     }

src/Merq.Tests/MessageBusSpec.cs

@@ -129,7 +129,7 @@ public void given_external_producer_then_can_notify_event()
         public void given_external_producer_then_can_notify_eventAsync()
         {
     */
-    public async Task given_external_producer_then_can_notify_eventAsync()
+    public void given_external_producer_then_can_notify_eventAsync()
     {
         var producer = new Subject<ConcreteEvent>();
 
@@ -143,81 +143,81 @@ public async Task given_external_producer_then_can_notify_eventAsync()
 
         bus.Observe<ConcreteEvent>().Subscribe(e => actual = e);
 
-        await bus.NotifyAsync(expected);
+        bus.Notify(expected);
 
         Assert.Equal(expected, actual);
     }
 
     [Fact]
-    public async Task when_subscribing_subject_then_succeedsAsync()
+    public void when_subscribing_subject_then_succeedsAsync()
     {
         int? value = default;
         bus.Observe<int>().Subscribe(i => value = i);
 
-        await bus.NotifyAsync(42);
+        bus.Notify(42);
 
         Assert.Equal(42, value);
     }
 
     [Fact]
-    public Task when_notifying_null_event_then_throws()
-        => Assert.ThrowsAsync<ArgumentNullException>(async () => await bus.NotifyAsync<object?>(null));
+    public void when_notifying_null_event_then_throws()
+        => Assert.Throws<ArgumentNullException>(() => bus.Notify<object?>(null));
 
     [Fact]
-    public async Task when_notifying_non_public_event_type_then_calls_subscriber()
+    public void when_notifying_non_public_event_type_then_calls_subscriber()
     {
         var called = false;
 
         bus.Observe<NonPublicEvent>().Subscribe(x => called = true);
 
-        await bus.NotifyAsync(new NonPublicEvent());
+        bus.Notify(new NonPublicEvent());
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_notifying_nested_non_public_event_type_then_calls_subscriber()
+    public void when_notifying_nested_non_public_event_type_then_calls_subscriber()
     {
         var called = false;
 
         bus.Observe<NestedEvent>().Subscribe(x => called = true);
 
-        await bus.NotifyAsync(new NestedEvent());
+        bus.Notify(new NestedEvent());
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_notifying_non_subscribed_event_then_does_not_call_subscriber()
+    public void when_notifying_non_subscribed_event_then_does_not_call_subscriber()
     {
         var called = false;
 
         using var subs = bus.Observe<ConcreteEvent>().Subscribe(c => called = true);
 
-        await bus.NotifyAsync(new AnotherEvent());
+        bus.Notify(new AnotherEvent());
 
         Assert.False(called);
     }
 
     [Fact]
-    public async Task when_notifying_subscribed_event_using_base_type_then_calls_derived_subscriber()
+    public void when_notifying_subscribed_event_using_base_type_then_calls_derived_subscriber()
     {
         var called = false;
         using var subscription = bus.Observe<ConcreteEvent>().Subscribe(c => called = true);
 
         BaseEvent e = new ConcreteEvent();
-        await bus.NotifyAsync(e);
+        bus.Notify(e);
 
         Assert.True(called);
     }
 
     [Fact]
-    public async Task when_subscribing_as_event_interface_then_calls_subscriber()
+    public void when_subscribing_as_event_interface_then_calls_subscriber()
     {
         var called = false;
         using var subs = bus.Observe<IBaseEvent>().Subscribe(c => called = true);
 
-        await bus.NotifyAsync(new ConcreteEvent());
+        bus.Notify(new ConcreteEvent());
 
         Assert.True(called);
     }
@@ -491,19 +491,15 @@ public void when_executing_nested_public_command_then_invokes_handler()
         bus.Execute(command);
 
         handler.Verify(x => x.Execute(command));
-
-        bus.Observe<ConcreteEvent>()
-            .Select(value => Observable.FromAsync(async () => await OnSolutionOpened(value)))
-            .Subscribe();
     }
 
-    async Task OnSolutionOpened(ConcreteEvent e)
+    void OnSolutionOpened(ConcreteEvent e)
     {
         // do something, perhaps execute some command?
         // bus.Execute(new MyCommand("Hello World"));
 
         // perhaps raise further events?
-        await bus.NotifyAsync(new ConcreteEvent());
+        bus.Notify(new ConcreteEvent());
     }
 
     [Fact]
@@ -543,7 +539,7 @@ public async Task when_executing_non_public_àsynccommand_result_then_invokes_ha
     }
 
     [Fact]
-    public async Task when_notifying_can_access_event_from_activity_stop()
+    public void when_notifying_can_access_event_from_activity_stop()
     {
         Activity? activity = default;
         using var listener = new ActivityListener
@@ -559,7 +555,7 @@ public async Task when_notifying_can_access_event_from_activity_stop()
 
         ActivitySource.AddActivityListener(listener);
 
-        await bus.NotifyAsync(new ConcreteEvent());
+        bus.Notify(new ConcreteEvent());
 
         Assert.NotNull(activity);
         Assert.IsType<ConcreteEvent>(activity.GetCustomProperty("Event"));