Improve configuration init; consistent exception types.

Upgrade to MQTTnet 4.x Prefer 'is null' Prefer 'is null'
idatum · Nov 1, 2023 · 6c506bd · 6c506bd
1 parent ed05a38
commit 6c506bd
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 110 deletions.
diff --git a/XbeeSharp/src/TransmitATPacket.cs b/XbeeSharp/src/TransmitATPacket.cs
@@ -11,7 +11,7 @@ public static class TransmitATPacket
     public static bool CreateXbeeFrame(out XbeeFrame? xbeeFrame, XbeeAddress address, byte frameId,
                                        byte[] command, IReadOnlyList<byte> parameterValue, bool escaped)
     {
-        if (command == null || command.Length != 2)
+        if (command is null || command.Length != 2)
         {
             throw new ArgumentException("command");
         }
@@ -66,7 +66,7 @@ public static bool CreateXbeeFrame(out XbeeFrame? xbeeFrame, XbeeAddress address
             throw new InvalidOperationException();
         }
         xbeeFrame = new XbeeFrame(rawData, escaped);
-        if (xbeeFrame == null)
+        if (xbeeFrame is null)
         {
             return false;
         }

diff --git a/XbeeSharp/src/TransmitPacket.cs b/XbeeSharp/src/TransmitPacket.cs
@@ -11,7 +11,7 @@ public static class TransmitPacket
     public static bool CreateXbeeFrame(out XbeeFrame? xbeeFrame, XbeeAddress address,
                                        byte frameId, IReadOnlyList<byte> data, bool escaped=false)
     {
-        if (data == null)
+        if (data is null)
         {
             throw new ArgumentException("data");
         }
@@ -65,7 +65,7 @@ public static bool CreateXbeeFrame(out XbeeFrame? xbeeFrame, XbeeAddress address
             throw new InvalidOperationException();
         }
         xbeeFrame = new XbeeFrame(rawData, escaped);
-        if (xbeeFrame == null)
+        if (xbeeFrame is null)
         {
             return false;
         }

diff --git a/XbeeSharp/src/XbeeAddress.cs b/XbeeSharp/src/XbeeAddress.cs
@@ -65,7 +65,7 @@ private XbeeAddress(IReadOnlyList<byte> address)
     /// </summary>
     public static XbeeAddress Create(IReadOnlyList<byte> address)
     {
-        if (address == null || address.Count != 8)
+        if (address is null || address.Count != 8)
         {
             throw new ArgumentException("address");
         }
@@ -80,7 +80,7 @@ public static XbeeAddress Create(string address)
     {
         // Expecting format like 0x0013010203040506
 
-        if (address == null || address.Length != 18)
+        if (address is null || address.Length != 18)
         {
             throw new ArgumentException("address");
         }

diff --git a/XbeeSharp/src/XbeeSerial.cs b/XbeeSharp/src/XbeeSerial.cs
@@ -23,7 +23,7 @@ public class XbeeSerial
     /// </summary>
     public XbeeSerial(ILogger logger, CancellationToken stoppingToken)
     {
-        if (logger == null)
+        if (logger is null)
         {
             throw new ArgumentNullException("logger");
         }

diff --git a/apps/xbee2mqtt/Program.cs b/apps/xbee2mqtt/Program.cs
@@ -1,6 +1,16 @@
 using xbee2mqtt;
 
+var configuration = new ConfigurationBuilder()
+        .AddJsonFile("appsettings.json", optional:true, reloadOnChange:true)
+        .AddEnvironmentVariables()
+        .Build();
+
 IHost host = Host.CreateDefaultBuilder(args)
+    .ConfigureAppConfiguration(builder =>
+    {
+        builder.Sources.Clear();
+        builder.AddConfiguration(configuration);
+    })
     .ConfigureServices(services =>
     {
         services.AddHostedService<Worker>();