YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-19 19:13:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor namings of serializers etc.

Browse Source
This commit is contained in:
Christian Kratky
2018-11-19 00:14:15 +01:00
parent 3db22eea51
commit 48d5afa799
86 changed files with 709 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/MQTTnet.AspNetCore.Tests/MqttConnectionContextTest.cs
+1 -1
View File
@@ -3,11 +3,11 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.AspNetCore.Tests.Mockups;
using MQTTnet.Exceptions;
using MQTTnet.Packets;
using MQTTnet.Serializer;
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Formatter;
namespace MQTTnet.AspNetCore.Tests
{
Tests/MQTTnet.AspNetCore.Tests/ReaderExtensionsTest.cs
+3 -3
View File
@@ -2,8 +2,8 @@
using System.Buffers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.AspNetCore;
using MQTTnet.Formatter.V311;
using MQTTnet.Packets;
using MQTTnet.Serializer;
namespace MQTTnet.AspNetCore.Tests
{
@@ -13,9 +13,9 @@ namespace MQTTnet.AspNetCore.Tests
[TestMethod]
public void TestTryDeserialize()
{
var serializer = new MqttV311PacketSerializer();
var serializer = new MqttV311PacketFormatter();
var buffer = serializer.Serialize(new MqttPublishPacket() {Topic = "a", Payload = new byte[5]});
var buffer = serializer.Encode(new MqttPublishPacket() {Topic = "a", Payload = new byte[5]});
var sequence = new ReadOnlySequence<byte>(buffer.Array, buffer.Offset, buffer.Count);
Tests/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs
+2 -2
View File
@@ -3,10 +3,10 @@ using MQTTnet.Adapter;
using MQTTnet.Diagnostics;
using MQTTnet.Internal;
using MQTTnet.Packets;
using MQTTnet.Serializer;
using System;
using System.IO;
using System.Threading;
using MQTTnet.Formatter;
namespace MQTTnet.Benchmarks
{
@@ -28,7 +28,7 @@ namespace MQTTnet.Benchmarks
_packet = message.ToPublishPacket();
var serializer = new MqttPacketSerializerAdapter(MqttProtocolVersion.V311);
var serializedPacket = Join(serializer.Serialize(_packet));
var serializedPacket = Join(serializer.Encode(_packet));
_iterations = 10000;
Tests/MQTTnet.Benchmarks/SerializerBenchmark.cs
+7 -6
View File
@@ -1,12 +1,13 @@
using BenchmarkDotNet.Attributes;
using MQTTnet.Packets;
using MQTTnet.Serializer;
using MQTTnet.Internal;
using System;
using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Adapter;
using MQTTnet.Channel;
using MQTTnet.Formatter;
using MQTTnet.Formatter.V311;
namespace MQTTnet.Benchmarks
{
@@ -17,7 +18,7 @@ namespace MQTTnet.Benchmarks
{
private MqttBasePacket _packet;
private ArraySegment<byte> _serializedPacket;
private IMqttPacketSerializer _serializer;
private IMqttPacketFormatter _serializer;
[GlobalSetup]
public void Setup()
@@ -27,8 +28,8 @@ namespace MQTTnet.Benchmarks
.Build();
_packet = message.ToPublishPacket();
_serializer = new MqttV311PacketSerializer();
_serializedPacket = _serializer.Serialize(_packet);
_serializer = new MqttV311PacketFormatter();
_serializedPacket = _serializer.Encode(_packet);
}
[Benchmark]
@@ -36,7 +37,7 @@ namespace MQTTnet.Benchmarks
{
for (var i = 0; i < 10000; i++)
{
_serializer.Serialize(_packet);
_serializer.Encode(_packet);
_serializer.FreeBuffer();
}
}
@@ -58,7 +59,7 @@ namespace MQTTnet.Benchmarks
header.Flags,
new MqttPacketBodyReader(_serializedPacket.Array, _serializedPacket.Count - header.RemainingLength, _serializedPacket.Array.Length));
_serializer.Deserialize(receivedPacket);
_serializer.Decode(receivedPacket);
}
}
Tests/MQTTnet.Core.Tests/MqttPacketReaderTests.cs
+1 -1
View File
@@ -2,8 +2,8 @@
using System.Threading;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Exceptions;
using MQTTnet.Formatter;
using MQTTnet.Internal;
using MQTTnet.Serializer;
namespace MQTTnet.Core.Tests
{
Tests/MQTTnet.Core.Tests/MqttPacketSerializerTests.cs
+21 -19
View File
@@ -5,10 +5,12 @@ using System.Text;
using System.Threading;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Adapter;
using MQTTnet.Formatter;
using MQTTnet.Formatter.V310;
using MQTTnet.Formatter.V311;
using MQTTnet.Internal;
using MQTTnet.Packets;
using MQTTnet.Protocol;
using MQTTnet.Serializer;
namespace MQTTnet.Core.Tests
{
@@ -153,7 +155,7 @@ namespace MQTTnet.Core.Tests
[TestMethod]
public void Serialize_LargePacket()
{
var serializer = new MqttV311PacketSerializer();
var serializer = new MqttV311PacketFormatter();
const int payloadLength = 80000;
@@ -176,7 +178,7 @@ namespace MQTTnet.Core.Tests
Payload = payload
};
var buffer = serializer.Serialize(publishPacket);
var buffer = serializer.Encode(publishPacket);
var testChannel = new TestMqttChannel(new MemoryStream(buffer.Array, buffer.Offset, buffer.Count));
var header = MqttPacketReader.ReadFixedHeaderAsync(
@@ -191,7 +193,7 @@ namespace MQTTnet.Core.Tests
header.Flags,
new MqttPacketBodyReader(buffer.Array, eof - header.RemainingLength, buffer.Count + buffer.Offset));
var packet = (MqttPublishPacket)serializer.Deserialize(receivedPacket);
var packet = (MqttPublishPacket)serializer.Decode(receivedPacket);
Assert.AreEqual(publishPacket.Topic, packet.Topic);
Assert.IsTrue(publishPacket.Payload.SequenceEqual(packet.Payload));
@@ -509,42 +511,42 @@ namespace MQTTnet.Core.Tests
private static void SerializeAndCompare(MqttBasePacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311)
{
IMqttPacketSerializer serializer;
IMqttPacketFormatter serializer;
if (protocolVersion == MqttProtocolVersion.V311)
{
serializer = new MqttV311PacketSerializer();
serializer = new MqttV311PacketFormatter();
}
else if (protocolVersion == MqttProtocolVersion.V310)
{
serializer = new MqttV310PacketSerializer();
serializer = new MqttV310PacketFormatter();
}
else
{
throw new NotSupportedException();
}
var data = serializer.Serialize(packet);
var data = serializer.Encode(packet);
Assert.AreEqual(expectedBase64Value, Convert.ToBase64String(Join(data)));
}
private static void DeserializeAndCompare(MqttBasePacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311)
{
IMqttPacketSerializer serializer;
IMqttPacketFormatter serializer;
if (protocolVersion == MqttProtocolVersion.V311)
{
serializer = new MqttV311PacketSerializer();
serializer = new MqttV311PacketFormatter();
}
else if (protocolVersion == MqttProtocolVersion.V310)
{
serializer = new MqttV310PacketSerializer();
serializer = new MqttV310PacketFormatter();
}
else
{
throw new NotSupportedException();
}
var buffer1 = serializer.Serialize(packet);
var buffer1 = serializer.Encode(packet);
using (var headerStream = new MemoryStream(Join(buffer1)))
{
@@ -555,8 +557,8 @@ namespace MQTTnet.Core.Tests
using (var bodyStream = new MemoryStream(Join(buffer1), (int)headerStream.Position, header.RemainingLength))
{
var deserializedPacket = serializer.Deserialize(new ReceivedMqttPacket(header.Flags, new MqttPacketBodyReader(bodyStream.ToArray(), 0, (int)bodyStream.Length)));
var buffer2 = serializer.Serialize(deserializedPacket);
var deserializedPacket = serializer.Decode(new ReceivedMqttPacket(header.Flags, new MqttPacketBodyReader(bodyStream.ToArray(), 0, (int)bodyStream.Length)));
var buffer2 = serializer.Encode(deserializedPacket);
Assert.AreEqual(expectedBase64Value, Convert.ToBase64String(Join(buffer2)));
}
@@ -566,21 +568,21 @@ namespace MQTTnet.Core.Tests
private static T Roundtrip<T>(T packet, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311)
where T : MqttBasePacket
{
IMqttPacketSerializer serializer;
IMqttPacketFormatter serializer;
if (protocolVersion == MqttProtocolVersion.V311)
{
serializer = new MqttV311PacketSerializer();
serializer = new MqttV311PacketFormatter();
}
else if (protocolVersion == MqttProtocolVersion.V310)
{
serializer = new MqttV310PacketSerializer();
serializer = new MqttV310PacketFormatter();
}
else
{
throw new NotSupportedException();
}
var buffer1 = serializer.Serialize(packet);
var buffer1 = serializer.Encode(packet);
using (var headerStream = new MemoryStream(Join(buffer1)))
{
@@ -592,7 +594,7 @@ namespace MQTTnet.Core.Tests
using (var bodyStream = new MemoryStream(Join(buffer1), (int)headerStream.Position, header.RemainingLength))
{
return (T)serializer.Deserialize(new ReceivedMqttPacket(header.Flags, new MqttPacketBodyReader(bodyStream.ToArray(), 0, (int)bodyStream.Length)));
return (T)serializer.Decode(new ReceivedMqttPacket(header.Flags, new MqttPacketBodyReader(bodyStream.ToArray(), 0, (int)bodyStream.Length)));
}
}
}
Tests/MQTTnet.Core.Tests/MqttPacketWriterTests.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Serializer;
using MQTTnet.Formatter;
namespace MQTTnet.Core.Tests
{
Tests/MQTTnet.Core.Tests/TestMqttCommunicationAdapter.cs
+1 -1
View File
@@ -3,8 +3,8 @@ using System.Collections.Concurrent;
using System.Threading;
using System.Threading.Tasks;
using MQTTnet.Adapter;
using MQTTnet.Formatter;
using MQTTnet.Packets;
using MQTTnet.Serializer;
namespace MQTTnet.Core.Tests
{
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
+11 -3
View File
@@ -37,6 +37,7 @@
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
<TextBlock Grid.Column="0" Grid.Row="0">Server:</TextBlock>
@@ -57,12 +58,19 @@
<TextBlock Grid.Column="0" Grid.Row="5">Keep Alive interval:</TextBlock>
<TextBox Grid.Column="1" Grid.Row="5" x:Name="KeepAliveInterval" Text="5"></TextBox>
<TextBlock Grid.Column="0" Grid.Row="6">Protocol:</TextBlock>
<TextBlock Grid.Column="0" Grid.Row="6">Transport:</TextBlock>
<StackPanel Grid.Column="1" Grid.Row="6" Orientation="Horizontal">
<RadioButton x:Name="UseTcp" IsChecked="True" GroupName="connection">TCP</RadioButton>
<RadioButton x:Name="UseWs" GroupName="connection">WS</RadioButton>
<RadioButton x:Name="UseTcp" IsChecked="True" GroupName="transport">TCP</RadioButton>
<RadioButton x:Name="UseWs" GroupName="transport">WS</RadioButton>
<CheckBox x:Name="UseTls">Use TLS</CheckBox>
</StackPanel>
<TextBlock Grid.Column="0" Grid.Row="7">Protocol:</TextBlock>
<StackPanel Grid.Column="1" Grid.Row="7" Orientation="Horizontal">
<RadioButton x:Name="UseMqtt500" GroupName="protocol">5.0.0</RadioButton>
<RadioButton x:Name="UseMqtt311" GroupName="protocol" IsChecked="True">3.1.1</RadioButton>
<RadioButton x:Name="UseMqtt310" GroupName="protocol">3.1.0</RadioButton>
</StackPanel>
</Grid>
<CheckBox x:Name="CleanSession" IsChecked="True">Clean session</CheckBox>
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs
+17 -4
View File
@@ -12,9 +12,9 @@ using MQTTnet.Diagnostics;
using MQTTnet.Exceptions;
using MQTTnet.Extensions.ManagedClient;
using MQTTnet.Extensions.Rpc;
using MQTTnet.Formatter;
using MQTTnet.Implementations;
using MQTTnet.Protocol;
using MQTTnet.Serializer;
using MQTTnet.Server;
using MqttClientConnectedEventArgs = MQTTnet.Client.MqttClientConnectedEventArgs;
using MqttClientDisconnectedEventArgs = MQTTnet.Client.MqttClientDisconnectedEventArgs;
@@ -124,7 +124,20 @@ namespace MQTTnet.TestApp.UniversalWindows
options.CleanSession = CleanSession.IsChecked == true;
options.KeepAlivePeriod = TimeSpan.FromSeconds(double.Parse(KeepAliveInterval.Text));
if (UseMqtt310.IsChecked == true)
{
options.ProtocolVersion = MqttProtocolVersion.V310;
}
else if (UseMqtt311.IsChecked == true)
{
options.ProtocolVersion = MqttProtocolVersion.V311;
}
else if (UseMqtt500.IsChecked == true)
{
options.ProtocolVersion = MqttProtocolVersion.V500;
}
try
{
if (_mqttClient != null)
@@ -426,14 +439,14 @@ namespace MQTTnet.TestApp.UniversalWindows
_sessions.Clear();
}
private async void RefreshSessions(object sender, RoutedEventArgs e)
private void RefreshSessions(object sender, RoutedEventArgs e)
{
if (_mqttServer == null)
{
return;
}
var sessions = await _mqttServer.GetClientSessionsStatusAsync();
var sessions = _mqttServer.GetClientSessionsStatus();
_sessions.Clear();
foreach (var session in sessions)