Remove dead code and cleanup

net-daemon · Feb 6, 2021 · b49c87f · b49c87f
1 parent 0fc3148
commit b49c87f
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 199 deletions.
diff --git a/src/App/NetDaemon.App/Common/ExternalEvents.cs b/src/App/NetDaemon.App/Common/ExternalEvents.cs
@@ -18,54 +18,4 @@ public class ExternalEventBase
     public class AppsInformationEvent : ExternalEventBase
     {
     }
-
-    /// <summary>
-    ///     Information about the application
-    /// </summary>
-    public class ApplicationInfo
-    {
-        /// <summary>
-        ///     Unique id
-        /// </summary>
-        public string? Id { get; set; }
-        /// <summary>
-        ///     All application dependencies
-        /// </summary>
-        public IEnumerable<string>? Dependencies { get; set; }
-
-        /// <summary>
-        ///     If app is enabled or disabled
-        /// </summary>
-        public bool IsEnabled { get; set; }
-
-        /// <summary>
-        ///     Application description
-        /// </summary>
-        public string? Description { get; set; }
-
-        /// <summary>
-        ///     Next scheduled event
-        /// </summary>
-        public DateTime? NextScheduledEvent { get; set; }
-
-        /// <summary>
-        ///     Last known error message
-        /// </summary>
-        public string? LastErrorMessage { get; set; }
-    }
-
-    /// <summary>
-    ///     All config information
-    /// </summary>
-    public class ConfigInfo
-    {
-        /// <summary>
-        ///     Settings for NetDaemon
-        /// </summary>
-        public NetDaemonSettings? DaemonSettings { get; set; }
-        /// <summary>
-        ///     Settings Home Assistant related
-        /// </summary>
-        public HomeAssistantSettings? HomeAssistantSettings { get; set; }
-    }
 }
diff --git a/src/App/NetDaemon.App/Common/INetDaemon.cs b/src/App/NetDaemon.App/Common/INetDaemon.cs
@@ -40,7 +40,6 @@ public interface INetDaemon : INetDaemonCommon
         /// <param name="waitForResponse">If we should wait for the service to get response from Home Assistant or send/forget scenario</param>
         Task CallServiceAsync(string domain, string service, dynamic? data = null, bool waitForResponse = false);
 
-
         /// <summary>
         ///     Get application instance by application instance id
         /// </summary>

diff --git a/src/App/NetDaemon.App/Common/IScheduler.cs b/src/App/NetDaemon.App/Common/IScheduler.cs
diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Config/ConfigExtensions.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Config/ConfigExtensions.cs
@@ -9,10 +9,6 @@
 
 namespace NetDaemon.Daemon.Config
 {
-    // public interface IDaemonAppConfig
-    // {
-    //     Task InstanceFromDaemonAppConfigs(IEnumerable<Type> netDaemonApps, string codeFolder);
-    // }
     public static class TaskExtensions
     {
         public static async Task InvokeAsync(this MethodInfo mi, object? obj, params object?[]? parameters)
@@ -28,24 +24,6 @@ public static async Task InvokeAsync(this MethodInfo mi, object? obj, params obj
 
     public static class ConfigStringExtensions
     {
-        public static string ToPythonStyle(this string str)
-        {
-            _ = str ??
-                throw new NetDaemonArgumentNullException(nameof(str));
-
-            var build = new StringBuilder(str.Length);
-            bool isStart = true;
-            foreach (char c in str)
-            {
-                if (char.IsUpper(c) && !isStart)
-                    build.Append('_');
-                else
-                    isStart = false;
-                build.Append(char.ToLower(c, CultureInfo.InvariantCulture));
-            }
-            return build.ToString();
-        }
-
         public static string ToCamelCase(this string str)
         {
             _ = str ??

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlAppConfig.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlAppConfig.cs
@@ -153,7 +153,7 @@ public IEnumerable<INetDaemonAppBase> Instances
                                     throw new MissingMemberException($"{scalarPropertyName} is missing from the type {instanceType}");
 
                     var valueType = entry.Value.NodeType;
-                    Object? result = null;
+                    object? result = null;
 
                     switch (valueType)
                     {

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlConfig.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlConfig.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -40,12 +39,9 @@ public IEnumerable<string> GetAllConfigFilePaths()
 
         public string? GetSecretFromPath(string secret, string configPath)
         {
-            if (_secrets.ContainsKey(configPath))
+            if (_secrets.ContainsKey(configPath) && _secrets[configPath].ContainsKey(secret))
             {
-                if (_secrets[configPath].ContainsKey(secret))
-                {
-                    return _secrets[configPath][secret];
-                }
+                return _secrets[configPath][secret];
             }
             if (configPath != _configFolder)
             {
@@ -101,7 +97,7 @@ public IEnumerable<string> GetAllConfigFilePaths()
 
                 if (!result.ContainsKey(fileDirectory))
                 {
-                    result[fileDirectory] = (Dictionary<string, string>?)GetSecretsFromSecretsYaml(file) ??
+                    result[fileDirectory] = GetSecretsFromSecretsYaml(file) ??
                         new Dictionary<string, string>();
                 }
             }

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlExtensions.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlExtensions.cs
@@ -31,8 +31,7 @@ public static class YamlExtensions
 
             // Lets try convert from python style to CamelCase
 
-            var prop = type.GetProperty(propertyName) ?? type.GetProperty(propertyName.ToCamelCase());
-            return prop;
+            return type.GetProperty(propertyName) ?? type.GetProperty(propertyName.ToCamelCase());
         }
 
         public static object? ToObject(this YamlScalarNode node, Type valueType)

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/IHassClientFactory.cs b/src/Daemon/NetDaemon.Daemon/Daemon/IHassClientFactory.cs
@@ -18,7 +18,7 @@ public interface IHassClientFactory
 
     public class HassClientFactory : IHassClientFactory
     {
-        readonly IServiceProvider _serviceProvider;
+        private readonly IServiceProvider _serviceProvider;
         public HassClientFactory(IServiceProvider? serviceProvider = null)
         {
             _serviceProvider = serviceProvider ?? throw new NetDaemonArgumentNullException(nameof(serviceProvider));

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs b/src/Daemon/NetDaemon.Daemon/Daemon/NetDaemonHost.cs
@@ -91,7 +91,7 @@ public class NetDaemonHost : INetDaemonHost, IAsyncDisposable
         /// <summary>
         ///     Constructor
         /// </summary>
-        /// <param name="hassClient">Client to use</param>
+        /// <param name="hassClientFactory">Factory to use for instance HassClients</param>
         /// <param name="repository">Repository to use</param>
         /// <param name="loggerFactory">The loggerfactory</param>
         /// <param name="httpHandler">Http handler to use</param>
@@ -814,10 +814,8 @@ internal static IList<INetDaemonAppBase> SortByDependency(IEnumerable<INetDaemon
                         edges.Add(new Tuple<INetDaemonAppBase, INetDaemonAppBase>(instance, dependentApp));
                     }
                 }
-                var sortedInstances = TopologicalSort<INetDaemonAppBase>(unsortedList.ToHashSet(), edges) ??
+                return TopologicalSort(unsortedList.ToHashSet(), edges) ??
                     throw new NetDaemonException("Application dependencies is wrong, please check dependencies for circular dependencies!");
-
-                return sortedInstances;
             }
             return unsortedList.ToList();
         }
@@ -1378,7 +1376,7 @@ private async Task PostExternalEvent(ExternalEventBase ev)
 
             await callbackTaskList.WhenAll(_cancelToken).ConfigureAwait(false);
         }
-
+        /// <inheritdoc/>
         public bool HomeAssistantHasNetDaemonIntegration() => HasNetDaemonIntegration;
     }
-}
+}
diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Storage/DataRepository.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Storage/DataRepository.cs
@@ -61,7 +61,7 @@ public async Task Save<T>(string id, T data)
 
             using var jsonStream = File.Open(storageJsonFile, FileMode.Create, FileAccess.Write);
 
-            await JsonSerializer.SerializeAsync<T>(jsonStream, data).ConfigureAwait(false);
+            await JsonSerializer.SerializeAsync(jsonStream, data).ConfigureAwait(false);
         }
     }
 
@@ -91,7 +91,7 @@ public class ExpandoDictionaryConverter : JsonConverter<Dictionary<string, objec
             Dictionary<string, object?> value,
             JsonSerializerOptions options)
         {
-            JsonSerializer.Serialize<Dictionary<string, object?>>(writer, value, options);
+            JsonSerializer.Serialize(writer, value, options);
         }
     }
 
@@ -113,7 +113,7 @@ public static class ExpandoExtensions
                 JsonValueKind.String => ParseString(elem.GetString()),
                 JsonValueKind.False => false,
                 JsonValueKind.True => true,
-                JsonValueKind.Number => elem.TryGetInt64(out Int64 intValue) ? intValue : elem.GetDouble(),
+                JsonValueKind.Number => elem.TryGetInt64(out long intValue) ? intValue : elem.GetDouble(),
                 _ => null
             };
         }

diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/Storage/IPersistData.cs b/src/Daemon/NetDaemon.Daemon/Daemon/Storage/IPersistData.cs
@@ -4,8 +4,18 @@ namespace NetDaemon.Daemon.Storage
 {
     public interface IDataRepository
     {
+        /// <summary>
+        ///     Saves data in a generic repository
+        /// </summary>
+        /// <param name="id">Unique id of data to save</param>
+        /// <param name="data">The data to save</param>
+        /// <typeparam name="T">The type of the data saved</typeparam>
         Task Save<T>(string id, T data);
 
+        /// <summary>
+        ///     Gets data from repositiry
+        /// </summary>
+        /// <typeparam name="T?">Type of data</typeparam>
         ValueTask<T?> Get<T>(string id) where T : class;
     }
 }
diff --git a/src/Daemon/NetDaemon.Daemon/Daemon/StringParser.cs b/src/Daemon/NetDaemon.Daemon/Daemon/StringParser.cs
@@ -1,16 +1,15 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace NetDaemon.Daemon
 {
     internal static class StringParser
     {
         public static object? ParseDataType(string? state)
         {
-            if (Int64.TryParse(state, NumberStyles.Number, CultureInfo.InvariantCulture, out Int64 intValue))
+            if (long.TryParse(state, NumberStyles.Number, CultureInfo.InvariantCulture, out long intValue))
                 return intValue;
 
-            if (Double.TryParse(state, NumberStyles.Number, CultureInfo.InvariantCulture, out Double doubleValue))
+            if (double.TryParse(state, NumberStyles.Number, CultureInfo.InvariantCulture, out double doubleValue))
                 return doubleValue;
 
             return state;

diff --git a/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/JsonElementExtensions.cs b/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/JsonElementExtensions.cs
@@ -33,7 +33,7 @@ internal static class JsonElementExtensions
                     {
                         list.Add(val.ConvertToDynamicValue());
                     }
-                    return (IEnumerable<object?>)list;
+                    return list;
 
                 case JsonValueKind.Object:
                     var obj = new Dictionary<string, object?>();
@@ -42,7 +42,7 @@ internal static class JsonElementExtensions
                     {
                         obj[prop.Name] = prop.Value.ConvertToDynamicValue();
                     }
-                    return (IDictionary<string, object?>)obj;
+                    return obj;
             }
 
             return null;

diff --git a/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/TaskExtensions.cs b/src/Daemon/NetDaemon.Daemon/Infrastructure/Extensions/TaskExtensions.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using NetDaemon.Daemon;
 
 namespace NetDaemon.Infrastructure.Extensions
 {

diff --git a/src/Daemon/NetDaemon.Daemon/Mapping/ContextMapper.cs b/src/Daemon/NetDaemon.Daemon/Mapping/ContextMapper.cs
@@ -5,6 +5,10 @@ namespace NetDaemon.Mapping
 {
     public static class ContextMapper
     {
+        /// <summary>
+        ///     Maps HassContext to Context
+        /// </summary>
+        /// <param name="hassContext">The HassContext to map</param>
         public static Context Map(HassContext? hassContext)
         {
             if (hassContext == null)

diff --git a/src/Daemon/NetDaemon.Daemon/Mapping/EntityStateMapper.cs b/src/Daemon/NetDaemon.Daemon/Mapping/EntityStateMapper.cs
@@ -13,7 +13,7 @@ public static class EntityStateMapper
         /// <summary>
         ///     Converts HassState to EntityState
         /// </summary>
-        /// <param name="hassState"></param>
+        /// <param name="hassState">HassState object to map</param>
         public static EntityState Map(this HassState hassState)
         {
             _ = hassState ??

diff --git a/src/DaemonRunner/DaemonRunner/Infrastructure/Config/HassioConfig.cs b/src/DaemonRunner/DaemonRunner/Infrastructure/Config/HassioConfig.cs
@@ -8,7 +8,7 @@ public class HassioConfig
         public string? LogLevel { get; set; }
 
         [JsonPropertyName("app_source")]
-        public string? AppSource { get; set; } = null;
+        public string? AppSource { get; set; }
 
         [JsonPropertyName("log_messages")]
         public bool? LogMessages { get; set; }