Refactor some abstract classes. No functional changes, just syntactic sugar.

hass-workstation-service/Domain/AbstractDiscoverable.cs

@@ -12,16 +12,8 @@ namespace hass_workstation_service.Domain
     {
         public abstract string Domain { get; }
         public string Name { get; protected set; }
-
+        public string ObjectId => Regex.Replace(Name, "[^a-zA-Z0-9_-]", "_");
-        public string ObjectId
-        {
-            get
-            {
-                return Regex.Replace(this.Name, "[^a-zA-Z0-9_-]", "_");
-            }
-        }
         public Guid Id { get; protected set; }
-
         public abstract DiscoveryConfigModel GetAutoDiscoveryConfig();
     }
 }

hass-workstation-service/Domain/Commands/AbstractCommand.cs

@@ -5,72 +5,60 @@ using MQTTnet;
 
 namespace hass_workstation_service.Domain.Commands
 {
-
     public abstract class AbstractCommand : AbstractDiscoverable
     {
         /// <summary>
         /// The update interval in seconds. It checks state only if the interval has passed.
         /// </summary>
-        public int UpdateInterval { get => 1; }
+        public static int UpdateInterval { get => 1; }
         public DateTime? LastUpdated { get; protected set; }
         public string PreviousPublishedState { get; protected set; }
         public MqttPublisher Publisher { get; protected set; }
         public override string Domain { get => "switch"; }
-        public AbstractCommand(MqttPublisher publisher, string name, Guid id = default(Guid))
-        {
-            if (id == Guid.Empty)
-            {
-                this.Id = Guid.NewGuid();
-            }
-            else
-            {
-                this.Id = id;
-            }
-            this.Name = name;
-            this.Publisher = publisher;
-            publisher.Subscribe(this);
 
-        }
+        public AbstractCommand(MqttPublisher publisher, string name, Guid id = default)
-        protected CommandDiscoveryConfigModel _autoDiscoveryConfigModel;
-        protected CommandDiscoveryConfigModel SetAutoDiscoveryConfigModel(CommandDiscoveryConfigModel config)
         {
-            this._autoDiscoveryConfigModel = config;
+            Id = id == Guid.Empty ? Guid.NewGuid() : id;
-            return config;
+            Name = name;
+            Publisher = publisher;
+            publisher.Subscribe(this);
         }
 
         public abstract string GetState();
 
         public async Task PublishStateAsync()
-        {
-            if (LastUpdated.HasValue && LastUpdated.Value.AddSeconds(this.UpdateInterval) > DateTime.UtcNow)
         {
             // dont't even check the state if the update interval hasn't passed
+            if (LastUpdated.HasValue && LastUpdated.Value.AddSeconds(UpdateInterval) > DateTime.UtcNow)
                 return;
-            }
+
-            string state = this.GetState();
+            string state = GetState();
-            if (this.PreviousPublishedState == state)
-            {
             // don't publish the state if it hasn't changed
+            if (PreviousPublishedState == state)
                 return;
-            }
+
             var message = new MqttApplicationMessageBuilder()
-            .WithTopic(this.GetAutoDiscoveryConfig().State_topic)
+                                                .WithTopic(GetAutoDiscoveryConfig().State_topic)
                                                 .WithPayload(state)
                                                 .WithExactlyOnceQoS()
                                                 .WithRetainFlag()
                                                 .Build();
             await Publisher.Publish(message);
-            this.PreviousPublishedState = state;
+            PreviousPublishedState = state;
-            this.LastUpdated = DateTime.UtcNow;
+            LastUpdated = DateTime.UtcNow;
         }
-        public async void PublishAutoDiscoveryConfigAsync()
+
-        {
+        public async void PublishAutoDiscoveryConfigAsync() => await Publisher.AnnounceAutoDiscoveryConfig(this, Domain);
-            await this.Publisher.AnnounceAutoDiscoveryConfig(this, this.Domain);
+
-        }
+        public async Task UnPublishAutoDiscoveryConfigAsync() => await Publisher.AnnounceAutoDiscoveryConfig(this, Domain, true);
-        public async Task UnPublishAutoDiscoveryConfigAsync()
+
+        protected CommandDiscoveryConfigModel _autoDiscoveryConfigModel;
+        protected CommandDiscoveryConfigModel SetAutoDiscoveryConfigModel(CommandDiscoveryConfigModel config)
         {
-            await this.Publisher.AnnounceAutoDiscoveryConfig(this, this.Domain, true);
+            _autoDiscoveryConfigModel = config;
+            return config;
         }
+
         public abstract void TurnOn();
         public abstract void TurnOff();
     }

hass-workstation-service/Domain/Sensors/AbstractSensor.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using hass_workstation_service.Communication;
 using MQTTnet;
 
 namespace hass_workstation_service.Domain.Sensors
 {
-
     public abstract class AbstractSensor : AbstractDiscoverable
     {
         /// <summary>
@@ -17,61 +15,48 @@ namespace hass_workstation_service.Domain.Sensors
         public string PreviousPublishedState { get; protected set; }
         public MqttPublisher Publisher { get; protected set; }
         public override string Domain { get => "sensor"; }
-        public AbstractSensor(MqttPublisher publisher, string name, int updateInterval = 10, Guid id = default(Guid))
-        {
-            if (id == Guid.Empty)
-            {
-                this.Id = Guid.NewGuid();
-            }
-            else
-            {
-                this.Id = id;
-            }
-            this.Name = name;
-            this.Publisher = publisher;
-            this.UpdateInterval = updateInterval;
 
-        }
+        public AbstractSensor(MqttPublisher publisher, string name, int updateInterval = 10, Guid id = default)
-        protected SensorDiscoveryConfigModel _autoDiscoveryConfigModel;
-        protected SensorDiscoveryConfigModel SetAutoDiscoveryConfigModel(SensorDiscoveryConfigModel config)
         {
-            this._autoDiscoveryConfigModel = config;
+            Id = id == Guid.Empty ? Guid.NewGuid() : id;
-            return config;
+            Name = name;
+            Publisher = publisher;
+            UpdateInterval = updateInterval;
         }
 
         public abstract string GetState();
 
         public async Task PublishStateAsync()
-        {
-            if (LastUpdated.HasValue && LastUpdated.Value.AddSeconds(this.UpdateInterval) > DateTime.UtcNow)
         {
             // dont't even check the state if the update interval hasn't passed
+            if (LastUpdated.HasValue && LastUpdated.Value.AddSeconds(UpdateInterval) > DateTime.UtcNow)
                 return;
-            }
+
-            string state = this.GetState();
+            string state = GetState();
-            if (this.PreviousPublishedState == state)
-            {
             // don't publish the state if it hasn't changed
+            if (PreviousPublishedState == state)
                 return;
-            }
+
             var message = new MqttApplicationMessageBuilder()
-            .WithTopic(this.GetAutoDiscoveryConfig().State_topic)
+                                                .WithTopic(GetAutoDiscoveryConfig().State_topic)
                                                 .WithPayload(state)
                                                 .WithExactlyOnceQoS()
                                                 .WithRetainFlag()
                                                 .Build();
             await Publisher.Publish(message);
-            this.PreviousPublishedState = state;
+            PreviousPublishedState = state;
-            this.LastUpdated = DateTime.UtcNow;
+            LastUpdated = DateTime.UtcNow;
         }
-        public async void PublishAutoDiscoveryConfigAsync()
+
-        {
+        public async void PublishAutoDiscoveryConfigAsync() => await Publisher.AnnounceAutoDiscoveryConfig(this, Domain);
-            await this.Publisher.AnnounceAutoDiscoveryConfig(this, this.Domain);
+
-        }
+        public async Task UnPublishAutoDiscoveryConfigAsync() => await Publisher.AnnounceAutoDiscoveryConfig(this, Domain, true);
-        public async Task UnPublishAutoDiscoveryConfigAsync()
+
+        protected SensorDiscoveryConfigModel _autoDiscoveryConfigModel;
+        protected SensorDiscoveryConfigModel SetAutoDiscoveryConfigModel(SensorDiscoveryConfigModel config)
         {
-            await this.Publisher.AnnounceAutoDiscoveryConfig(this, this.Domain, true);
+            _autoDiscoveryConfigModel = config;
+            return config;
         }
-
     }
 }