Refactor JSON classes

Author: jdomnitz

README.md

@@ -22,4 +22,6 @@ An implementation of ZWave Plus using the 2024a public specification.
 #### Other Projects
 * Check out my other projects for [HomeKit](https://github.com/SmartHomeOS/HomeKitDotNet)
 
+Support is always appreciated:<br/><a href="https://www.buymeacoffee.com/jdomnitz" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Pizza" style="height: 60px !important;width: 217px !important;" ></a>
+
 Testers, Tickets, Feedback and PRs are welcome.

ZWaveDotNet/Entities/Controller.cs

@@ -22,6 +22,7 @@
 using ZWaveDotNet.CommandClassReports;
 using ZWaveDotNet.CommandClassReports.Enums;
 using ZWaveDotNet.Entities.Enums;
+using ZWaveDotNet.Entities.JSON;
 using ZWaveDotNet.Enums;
 using ZWaveDotNet.Provisioning;
 using ZWaveDotNet.Security;

ZWaveDotNet/Entities/CommandClassJson.cs …DotNet/Entities/JSON/CommandClassJSON.csZWaveDotNet/Entities/CommandClassJson.cs renamed to ZWaveDotNet/Entities/JSON/CommandClassJSON.cs ZWaveDotNet/Entities/CommandClassJson.cs renamed to ZWaveDotNet/Entities/JSON/CommandClassJSON.cs

@@ -12,12 +12,15 @@
 
 using ZWaveDotNet.Enums;
 
-namespace ZWaveDotNet.Entities
+namespace ZWaveDotNet.Entities.JSON
 {
+    #pragma warning disable CS1591
     public class CommandClassJson
+
     {
         public byte Version { get; set; }
         public CommandClass CommandClass { get; set; }
         public bool Secure { get; set; }
     }
+    #pragma warning restore CS1591
 }

ZWaveDotNet/Entities/ControllerJSON.cs …veDotNet/Entities/JSON/ControllerJSON.csZWaveDotNet/Entities/ControllerJSON.cs renamed to ZWaveDotNet/Entities/JSON/ControllerJSON.cs ZWaveDotNet/Entities/ControllerJSON.cs renamed to ZWaveDotNet/Entities/JSON/ControllerJSON.cs

@@ -10,15 +10,17 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace ZWaveDotNet.Entities
+namespace ZWaveDotNet.Entities.JSON
 {
+    #pragma warning disable CS1591
     public class ControllerJSON
     {
         #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
-        public uint HomeID { get ; set; }
+        public uint HomeID { get; set; }
         public ushort ID { get; set; }
         public byte DbVersion { get; set; }
         public NodeJSON[] Nodes { get; set; }
         #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     }
+    #pragma warning restore CS1591
 }

ZWaveDotNet/Entities/NodeJSON.cs ZWaveDotNet/Entities/JSON/NodeJSON.csZWaveDotNet/Entities/NodeJSON.cs renamed to ZWaveDotNet/Entities/JSON/NodeJSON.cs

@@ -13,16 +13,18 @@
 using ZWaveDotNet.CommandClasses.Enums;
 using ZWaveDotNet.SerialAPI.Messages;
 
-namespace ZWaveDotNet.Entities
+namespace ZWaveDotNet.Entities.JSON
 {
+    #pragma warning disable CS1591
     public class NodeJSON
     {
         #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public NodeProtocolInfo NodeProtocolInfo { get; set; }
         public bool Interviewed { get; set; }
         public ushort ID { get; set; }
-        public CommandClassJson[] CommandClasses {  get; set; }
+        public CommandClassJson[] CommandClasses { get; set; }
         public SecurityKey[] GrantedKeys { get; set; }
         #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
     }
+    #pragma warning restore CS1591
 }

ZWaveDotNet/Entities/Node.cs

@@ -22,6 +22,7 @@
 using ZWaveDotNet.CommandClassReports;
 using ZWaveDotNet.CommandClassReports.Enums;
 using ZWaveDotNet.Entities.Enums;
+using ZWaveDotNet.Entities.JSON;
 using ZWaveDotNet.Enums;
 using ZWaveDotNet.Security;
 using ZWaveDotNet.SerialAPI;
@@ -34,21 +35,21 @@ namespace ZWaveDotNet.Entities
 {
     public class Node
     {
-        protected enum InterviewState { None, Started, Complete };
-        public const ushort BROADCAST_ID = 0xFFFF;
-        public const ushort MULTICAST_ID = 0xFFFE;
-        public const ushort UNINITIALIZED_ID = 0x0000;
+        private enum InterviewState { None, Started, Complete };
+        internal const ushort BROADCAST_ID = 0xFFFF;
+        internal const ushort MULTICAST_ID = 0xFFFE;
+        internal const ushort UNINITIALIZED_ID = 0x0000;
 
         public event NodeEventHandler? InterviewComplete;
 
         public readonly ushort ID;
-        protected readonly Controller controller;
-        protected readonly NodeProtocolInfo? nodeInfo;
-        protected bool failed;
-        protected InterviewState interviewed;
-        
-        protected ConcurrentDictionary<CommandClass, CommandClassBase> commandClasses = new ConcurrentDictionary<CommandClass, CommandClassBase>();
-        protected List<EndPoint> endPoints = new List<EndPoint>();
+        private readonly Controller controller;
+        private readonly NodeProtocolInfo? nodeInfo;
+        private bool failed;
+        private InterviewState interviewed;
+
+        private ConcurrentDictionary<CommandClass, CommandClassBase> commandClasses = new ConcurrentDictionary<CommandClass, CommandClassBase>();
+        private List<EndPoint> endPoints = new List<EndPoint>();
 
         public Controller Controller { get { return controller; } }
         public bool LongRange {  get { return nodeInfo?.IsLongRange ?? false; } }