Skip to content

Commit d8854e0

Browse files
Sergio0694Sergio0694
committed
Renamed messenger types
1 parent 2613c56 commit d8854e0

File tree

7 files changed

+87
-87
lines changed

7 files changed

+87
-87
lines changed

‎Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public abstract class ObservableRecipient : ObservableObject
2626
/// Initializes a new instance of the <see cref="ObservableRecipient"/> class.
2727
/// </summary>
2828
/// <remarks>
29-
/// This constructor will produce an instance that will use the <see cref="Messaging.Messenger.Default"/> instance
29+
/// This constructor will produce an instance that will use the <see cref="WeakReferenceMessenger.Default"/> instance
3030
/// to perform requested operations. It will also be available locally through the <see cref="Messenger"/> property.
3131
/// </remarks>
3232
protected ObservableRecipient()
33-
: this(Messaging.Messenger.Default)
33+
: this(WeakReferenceMessenger.Default)
3434
{
3535
}
3636

Microsoft.Toolkit.Mvvm/Messaging/Messenger.cs renamed to Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
1919
/// This <see cref="IMessenger"/> implementation uses strong references to track the registered
2020
/// recipients, so it is necessary to manually unregister them when they're no longer needed.
2121
/// </remarks>
22-
public sealed class Messenger : IMessenger
22+
public sealed class StrongReferenceMessenger : IMessenger
2323
{
24-
// The Messenger class uses the following logic to link stored instances together:
24+
// This messenger uses the following logic to link stored instances together:
2525
// --------------------------------------------------------------------------------------------------------
2626
// DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
2727
// | \________________[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
@@ -84,9 +84,9 @@ public sealed class Messenger : IMessenger
8484
private readonly DictionarySlim<Type2, IMapping> typesMap = new DictionarySlim<Type2, IMapping>();
8585

8686
/// <summary>
87-
/// Gets the default <see cref="Messenger"/> instance.
87+
/// Gets the default <see cref="StrongReferenceMessenger"/> instance.
8888
/// </summary>
89-
public static Messenger Default { get; } = new Messenger();
89+
public static StrongReferenceMessenger Default { get; } = new StrongReferenceMessenger();
9090

9191
/// <inheritdoc/>
9292
public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)

Microsoft.Toolkit.Mvvm/Messaging/WeakRefMessenger.cs renamed to Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#if NETSTANDARD2_1
1212
using RecipientsTable = System.Runtime.CompilerServices.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
1313
#else
14-
using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.WeakRefMessenger.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
14+
using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.WeakReferenceMessenger.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
1515
#endif
1616

1717
namespace Microsoft.Toolkit.Mvvm.Messaging
@@ -23,9 +23,9 @@ namespace Microsoft.Toolkit.Mvvm.Messaging
2323
/// This <see cref="IMessenger"/> implementation uses weak references to track the registered
2424
/// recipients, so it is not necessary to manually unregister them when they're no longer needed.
2525
/// </remarks>
26-
public sealed class WeakRefMessenger : IMessenger
26+
public sealed class WeakReferenceMessenger : IMessenger
2727
{
28-
// The WeakRefMessenger class uses the following logic to link stored instances together:
28+
// This messenger uses the following logic to link stored instances together:
2929
// --------------------------------------------------------------------------------------------------------
3030
// DictionarySlim<TToken, MessageHandler<TRecipient, TMessage>> mapping
3131
// / / /
@@ -48,9 +48,9 @@ public sealed class WeakRefMessenger : IMessenger
4848
private readonly DictionarySlim<Type2, RecipientsTable> recipientsMap = new DictionarySlim<Type2, RecipientsTable>();
4949

5050
/// <summary>
51-
/// Gets the default <see cref="WeakRefMessenger"/> instance.
51+
/// Gets the default <see cref="WeakReferenceMessenger"/> instance.
5252
/// </summary>
53-
public static WeakRefMessenger Default { get; } = new WeakRefMessenger();
53+
public static WeakReferenceMessenger Default { get; } = new WeakReferenceMessenger();
5454

5555
/// <inheritdoc/>
5656
public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)

‎UnitTests/UnitTests.Shared/Mvvm/Test_Ioc.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void Test_Ioc_LambdaInitialization_ConcreteType()
6262
public void Test_Ioc_LambdaInitialization_ConstructorInjection()
6363
{
6464
var ioc = new Ioc();
65-
var messenger = new Messenger();
65+
var messenger = new StrongReferenceMessenger();
6666

6767
ioc.ConfigureServices(services =>
6868
{

‎UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public partial class Test_Messenger
1515
{
1616
[TestCategory("Mvvm")]
1717
[TestMethod]
18-
[DataRow(typeof(Messenger))]
19-
[DataRow(typeof(WeakRefMessenger))]
18+
[DataRow(typeof(StrongReferenceMessenger))]
19+
[DataRow(typeof(WeakReferenceMessenger))]
2020
public void Test_Messenger_RequestMessage_Ok(Type type)
2121
{
2222
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -44,8 +44,8 @@ void Receive(object recipient, NumberRequestMessage m)
4444

4545
[TestCategory("Mvvm")]
4646
[TestMethod]
47-
[DataRow(typeof(Messenger))]
48-
[DataRow(typeof(WeakRefMessenger))]
47+
[DataRow(typeof(StrongReferenceMessenger))]
48+
[DataRow(typeof(WeakReferenceMessenger))]
4949
[ExpectedException(typeof(InvalidOperationException))]
5050
public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
5151
{
@@ -56,8 +56,8 @@ public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
5656

5757
[TestCategory("Mvvm")]
5858
[TestMethod]
59-
[DataRow(typeof(Messenger))]
60-
[DataRow(typeof(WeakRefMessenger))]
59+
[DataRow(typeof(StrongReferenceMessenger))]
60+
[DataRow(typeof(WeakReferenceMessenger))]
6161
[ExpectedException(typeof(InvalidOperationException))]
6262
public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
6363
{
@@ -81,8 +81,8 @@ public class NumberRequestMessage : RequestMessage<int>
8181

8282
[TestCategory("Mvvm")]
8383
[TestMethod]
84-
[DataRow(typeof(Messenger))]
85-
[DataRow(typeof(WeakRefMessenger))]
84+
[DataRow(typeof(StrongReferenceMessenger))]
85+
[DataRow(typeof(WeakReferenceMessenger))]
8686
public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
8787
{
8888
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -106,8 +106,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
106106

107107
[TestCategory("Mvvm")]
108108
[TestMethod]
109-
[DataRow(typeof(Messenger))]
110-
[DataRow(typeof(WeakRefMessenger))]
109+
[DataRow(typeof(StrongReferenceMessenger))]
110+
[DataRow(typeof(WeakReferenceMessenger))]
111111
public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
112112
{
113113
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -138,8 +138,8 @@ void Receive(object recipient, AsyncNumberRequestMessage m)
138138

139139
[TestCategory("Mvvm")]
140140
[TestMethod]
141-
[DataRow(typeof(Messenger))]
142-
[DataRow(typeof(WeakRefMessenger))]
141+
[DataRow(typeof(StrongReferenceMessenger))]
142+
[DataRow(typeof(WeakReferenceMessenger))]
143143
[ExpectedException(typeof(InvalidOperationException))]
144144
public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
145145
{
@@ -150,8 +150,8 @@ public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
150150

151151
[TestCategory("Mvvm")]
152152
[TestMethod]
153-
[DataRow(typeof(Messenger))]
154-
[DataRow(typeof(WeakRefMessenger))]
153+
[DataRow(typeof(StrongReferenceMessenger))]
154+
[DataRow(typeof(WeakReferenceMessenger))]
155155
[ExpectedException(typeof(InvalidOperationException))]
156156
public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
157157
{
@@ -175,8 +175,8 @@ public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
175175

176176
[TestCategory("Mvvm")]
177177
[TestMethod]
178-
[DataRow(typeof(Messenger))]
179-
[DataRow(typeof(WeakRefMessenger))]
178+
[DataRow(typeof(StrongReferenceMessenger))]
179+
[DataRow(typeof(WeakReferenceMessenger))]
180180
public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
181181
{
182182
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -195,8 +195,8 @@ void Receive(object recipient, NumbersCollectionRequestMessage m)
195195

196196
[TestCategory("Mvvm")]
197197
[TestMethod]
198-
[DataRow(typeof(Messenger))]
199-
[DataRow(typeof(WeakRefMessenger))]
198+
[DataRow(typeof(StrongReferenceMessenger))]
199+
[DataRow(typeof(WeakReferenceMessenger))]
200200
public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
201201
{
202202
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -250,8 +250,8 @@ public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
250250

251251
[TestCategory("Mvvm")]
252252
[TestMethod]
253-
[DataRow(typeof(Messenger))]
254-
[DataRow(typeof(WeakRefMessenger))]
253+
[DataRow(typeof(StrongReferenceMessenger))]
254+
[DataRow(typeof(WeakReferenceMessenger))]
255255
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
256256
{
257257
var messenger = (IMessenger)Activator.CreateInstance(type);
@@ -270,8 +270,8 @@ void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
270270

271271
[TestCategory("Mvvm")]
272272
[TestMethod]
273-
[DataRow(typeof(Messenger))]
274-
[DataRow(typeof(WeakRefMessenger))]
273+
[DataRow(typeof(StrongReferenceMessenger))]
274+
[DataRow(typeof(WeakReferenceMessenger))]
275275
public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
276276
{
277277
var messenger = (IMessenger)Activator.CreateInstance(type);

0 commit comments

Comments
 (0)