From 1f3b24d20faba1fd91be4c1d25ebd512c7b4ad10 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Wed, 18 Oct 2017 17:14:13 +0200 Subject: [PATCH] Refactoring --- .../Implementations/MqttCommunicationAdapterFactory.cs | 8 +++++++- .../Implementations/MqttTcpChannel.cs | 2 +- .../MqttCommunicationAdapterFactory.cs | 2 +- Tests/MQTTnet.TestApp.NetCore/Program.cs | 9 ++++----- Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttCommunicationAdapterFactory.cs b/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttCommunicationAdapterFactory.cs index 2bb7c5ef..36a34b1f 100644 --- a/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttCommunicationAdapterFactory.cs +++ b/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttCommunicationAdapterFactory.cs @@ -7,7 +7,7 @@ namespace MQTTnet.Implementations { public class MqttCommunicationAdapterFactory : IMqttCommunicationAdapterFactory { - public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientQueuedOptions options) + public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientOptions options) { if (options == null) throw new ArgumentNullException(nameof(options)); @@ -21,6 +21,12 @@ namespace MQTTnet.Implementations return new MqttChannelCommunicationAdapter(new MqttWebSocketChannel(webSocketOptions), new MqttPacketSerializer { ProtocolVersion = options.ProtocolVersion }); } + if (options is MqttClientQueuedOptions queuedOptions) + { + return new MqttChannelCommunicationAdapter(new MqttTcpChannel(queuedOptions), new MqttPacketSerializer { ProtocolVersion = options.ProtocolVersion }); + } + + throw new NotSupportedException(); } } diff --git a/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs b/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs index db102912..03206f1f 100644 --- a/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs +++ b/Frameworks/MQTTnet.UniversalWindows/Implementations/MqttTcpChannel.cs @@ -89,7 +89,7 @@ namespace MQTTnet.Implementations RawReceiveStream = ReceiveStream; } - private static Certificate LoadCertificate(MqttClientQueuedOptions options) + private static Certificate LoadCertificate(MqttClientOptions options) { if (options.TlsOptions.Certificates == null || !options.TlsOptions.Certificates.Any()) { diff --git a/Tests/MQTTnet.Core.Tests/MqttCommunicationAdapterFactory.cs b/Tests/MQTTnet.Core.Tests/MqttCommunicationAdapterFactory.cs index 1b451ee4..c83f83ae 100644 --- a/Tests/MQTTnet.Core.Tests/MqttCommunicationAdapterFactory.cs +++ b/Tests/MQTTnet.Core.Tests/MqttCommunicationAdapterFactory.cs @@ -12,7 +12,7 @@ namespace MQTTnet.Core.Tests _adapter = adapter; } - public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientQueuedOptions options) + public IMqttCommunicationAdapter CreateMqttCommunicationAdapter(MqttClientOptions options) { return _adapter; } diff --git a/Tests/MQTTnet.TestApp.NetCore/Program.cs b/Tests/MQTTnet.TestApp.NetCore/Program.cs index be69c9a7..63e43808 100644 --- a/Tests/MQTTnet.TestApp.NetCore/Program.cs +++ b/Tests/MQTTnet.TestApp.NetCore/Program.cs @@ -6,7 +6,6 @@ using MQTTnet.Core.Protocol; using MQTTnet.Core.Server; using System; using System.Collections.Generic; -using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -297,16 +296,16 @@ namespace MQTTnet.TestApp.NetCore private class TestStorage : IMqttClientQueuedStorage { - string serializationFile = Path.Combine(Environment.CurrentDirectory, "messages.bin"); + string serializationFile = System.IO.Path.Combine(Environment.CurrentDirectory, "messages.bin"); private IList _messages = new List(); public Task> LoadInflightMessagesAsync() { //deserialize // MqttApplicationMessage is not serializable - if (File.Exists(serializationFile)) + if (System.IO.File.Exists(serializationFile)) { - using (Stream stream = File.Open(serializationFile, FileMode.Open)) + using (System.IO.Stream stream = System.IO.File.Open(serializationFile, System.IO.FileMode.Open)) { var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter(); @@ -325,7 +324,7 @@ namespace MQTTnet.TestApp.NetCore _messages = messages; //serialize // MqttApplicationMessage is not serializable - using (System.IO.Stream stream = File.Open(serializationFile, FileMode.Create)) + using (System.IO.Stream stream = System.IO.File.Open(serializationFile, System.IO.FileMode.Create)) { var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter(); IList temp = new List(); diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs index 8a22f5ea..07d5955f 100644 --- a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs +++ b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs @@ -41,7 +41,7 @@ namespace MQTTnet.TestApp.UniversalWindows private async void Connect(object sender, RoutedEventArgs e) { - MqttClientQueuedOptions options = null; + MqttClientOptions options = null; if (UseTcp.IsChecked == true) { options = new MqttClientTcpOptions