Skip to content

Commit 318fbc9

Browse files
committed
more fixups
1 parent 2e56379 commit 318fbc9

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

src/SignalR/server/Core/src/SerializedHubMessage.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,8 @@ public ReadOnlyMemory<byte> GetSerializedMessage(IHubProtocol protocol)
7070
}
7171
}
7272

73-
/// <summary>
74-
/// Gets all serialized hub messages for all protocols used on this <see cref="SerializedHubMessage"/> instance.
75-
/// </summary>
76-
/// <returns>An <see cref="IEnumerable{T}"/> of already serialized hub messages for each protocol.</returns>
77-
public IReadOnlyList<SerializedMessage> GetAllSerializations()
73+
// Used for unit testing.
74+
internal IReadOnlyList<SerializedMessage> GetAllSerializations()
7875
{
7976
// Even if this is only used in tests, let's do it right.
8077
lock (_lock)

src/SignalR/server/StackExchangeRedis/src/Internal/DefaultHubMessageSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public DefaultHubMessageSerializer(IHubProtocolResolver hubProtocolResolver, ILi
2525
}
2626
}
2727

28-
public SerializedHubMessage SerializeMessage(HubMessage message)
28+
public IReadOnlyList<SerializedMessage> SerializeMessage(HubMessage message)
2929
{
3030
var list = new List<SerializedMessage>(_hubProtocols.Count);
3131
foreach (var protocol in _hubProtocols)
3232
{
3333
list.Add(new SerializedMessage(protocol.Name, protocol.GetMessageBytes(message)));
3434
}
3535

36-
return new SerializedHubMessage(list);
36+
return list;
3737
}
3838
}
3939
}

src/SignalR/server/StackExchangeRedis/src/Internal/RedisProtocol.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,11 @@ private void WriteHubMessage(Stream stream, HubMessage message)
190190
}
191191
else
192192
{
193-
var serializedHubMessage = _messageSerializer.SerializeMessage(message);
194-
var serializedMessages = serializedHubMessage.GetAllSerializations();
193+
var serializedHubMessages = _messageSerializer.SerializeMessage(message);
195194

196-
MessagePackBinary.WriteMapHeader(stream, serializedMessages.Count);
195+
MessagePackBinary.WriteMapHeader(stream, serializedHubMessages.Count);
197196

198-
foreach (var serializedMessage in serializedMessages)
197+
foreach (var serializedMessage in serializedHubMessages)
199198
{
200199
MessagePackBinary.WriteString(stream, serializedMessage.ProtocolName);
201200

src/SignalR/server/StackExchangeRedis/test/DefaultHubMessageSerializerTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ public void SerializeMessages(string testName)
2727
var serializer = new DefaultHubMessageSerializer(resolver, protocolNames, hubSupportedProtocols: null);
2828
var serializedHubMessage = serializer.SerializeMessage(_testMessage);
2929

30-
var serializedMessages = serializedHubMessage.GetAllSerializations();
31-
3230
var allBytes = new List<byte>();
33-
Assert.Equal(testData.SerializedCount, serializedMessages.Count);
34-
foreach (var message in serializedMessages)
31+
Assert.Equal(testData.SerializedCount, serializedHubMessage.Count);
32+
foreach (var message in serializedHubMessage)
3533
{
3634
allBytes.AddRange(message.Serialized.ToArray());
3735
}

0 commit comments

Comments
 (0)