From 4fb64c3e4fc37eac5462f82c04f37b14f74a3266 Mon Sep 17 00:00:00 2001
From: Graham Watts <grahamcharleswatts@gmail.com>
Date: Sun, 2 Jan 2022 10:32:41 +0200
Subject: [PATCH] Clean up method names

Remove "MQTT" from general-purpose publisher methods
---
 src/NRuuviTag.Cli.Linux/Program.cs                        | 6 +++---
 src/NRuuviTag.Cli.Windows/Program.cs                      | 6 +++---
 .../NRuuviTagConfigurationBuilderExtensions.cs            | 2 +-
 src/NRuuviTag.Cli/NRuuviTagHostBuilderExtensions.cs       | 2 +-
 src/NRuuviTag.Cli/NRuuviTagServiceCollectionExtensions.cs | 8 ++++----
 src/NRuuviTag.Cli/TypeResolver.cs                         | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/NRuuviTag.Cli.Linux/Program.cs b/src/NRuuviTag.Cli.Linux/Program.cs
index 7c7de13..c2f66aa 100644
--- a/src/NRuuviTag.Cli.Linux/Program.cs
+++ b/src/NRuuviTag.Cli.Linux/Program.cs
@@ -16,7 +16,7 @@ public class Program {
 
         public static async Task<int> Main(string[] args) {
            return await CreateHostBuilder(args)
-                .BuildAndRunRuuviTagMqttAgent(args)
+                .BuildAndRunRuuviTagPublisher(args)
                 .ConfigureAwait(false);
         }
 
@@ -25,10 +25,10 @@ public class Program {
                 .UseSystemd()
                 .UseContentRoot(AppContext.BaseDirectory)
                 .ConfigureAppConfiguration(config => {
-                    config.AddRuuviTagMqttDeviceConfiguration();
+                    config.AddRuuviTagDeviceConfiguration();
                 })
                 .ConfigureServices((hostContext, services) => {
-                    services.AddRuuviTagMqttAgent(hostContext.Configuration, sp => ActivatorUtilities.CreateInstance<BlueZListener>(sp, BlueZListener.DefaultBluetoothAdapter));
+                    services.AddRuuviTagPublisherCommandApp(hostContext.Configuration, sp => ActivatorUtilities.CreateInstance<BlueZListener>(sp, BlueZListener.DefaultBluetoothAdapter));
                 });
 
     }
diff --git a/src/NRuuviTag.Cli.Windows/Program.cs b/src/NRuuviTag.Cli.Windows/Program.cs
index 055d8bc..96248a4 100644
--- a/src/NRuuviTag.Cli.Windows/Program.cs
+++ b/src/NRuuviTag.Cli.Windows/Program.cs
@@ -16,7 +16,7 @@ public class Program {
 
         public static async Task<int> Main(string[] args) {
             return await CreateHostBuilder(args)
-                .BuildAndRunRuuviTagMqttAgent(args)
+                .BuildAndRunRuuviTagPublisher(args)
                 .ConfigureAwait(false);
         }
 
@@ -24,10 +24,10 @@ public class Program {
             Host.CreateDefaultBuilder(args)
                 .UseContentRoot(AppContext.BaseDirectory)
                 .ConfigureAppConfiguration(config => {
-                    config.AddRuuviTagMqttDeviceConfiguration();
+                    config.AddRuuviTagDeviceConfiguration();
                 })
                 .ConfigureServices((hostContext, services) => {
-                    services.AddRuuviTagMqttAgent<WindowsSdkListener>(hostContext.Configuration);
+                    services.AddRuuviTagPublisherCommandApp<WindowsSdkListener>(hostContext.Configuration);
                 });
 
     }
diff --git a/src/NRuuviTag.Cli/NRuuviTagConfigurationBuilderExtensions.cs b/src/NRuuviTag.Cli/NRuuviTagConfigurationBuilderExtensions.cs
index 8a0c01f..53b7129 100644
--- a/src/NRuuviTag.Cli/NRuuviTagConfigurationBuilderExtensions.cs
+++ b/src/NRuuviTag.Cli/NRuuviTagConfigurationBuilderExtensions.cs
@@ -21,7 +21,7 @@ public static class NRuuviTagConfigurationBuilderExtensions {
         /// <exception cref="ArgumentNullException">
         ///   <paramref name="builder"/> is <see langword="null"/>.
         /// </exception>
-        public static IConfigurationBuilder AddRuuviTagMqttDeviceConfiguration(this IConfigurationBuilder builder) {
+        public static IConfigurationBuilder AddRuuviTagDeviceConfiguration(this IConfigurationBuilder builder) {
             if (builder == null) {
                 throw new ArgumentNullException(nameof(builder));
             }
diff --git a/src/NRuuviTag.Cli/NRuuviTagHostBuilderExtensions.cs b/src/NRuuviTag.Cli/NRuuviTagHostBuilderExtensions.cs
index 1571fc0..9a4f9ca 100644
--- a/src/NRuuviTag.Cli/NRuuviTagHostBuilderExtensions.cs
+++ b/src/NRuuviTag.Cli/NRuuviTagHostBuilderExtensions.cs
@@ -34,7 +34,7 @@ public static class NRuuviTagHostBuilderExtensions {
         /// <exception cref="ArgumentNullException">
         ///   <paramref name="args"/> is <see langword="null"/>.
         /// </exception>
-        public static async Task<int> BuildAndRunRuuviTagMqttAgent(this IHostBuilder builder, IEnumerable<string> args) {
+        public static async Task<int> BuildAndRunRuuviTagPublisher(this IHostBuilder builder, IEnumerable<string> args) {
             if (builder == null) {
                 throw new ArgumentNullException(nameof(builder));
             }
diff --git a/src/NRuuviTag.Cli/NRuuviTagServiceCollectionExtensions.cs b/src/NRuuviTag.Cli/NRuuviTagServiceCollectionExtensions.cs
index dc8c67a..3c1c626 100644
--- a/src/NRuuviTag.Cli/NRuuviTagServiceCollectionExtensions.cs
+++ b/src/NRuuviTag.Cli/NRuuviTagServiceCollectionExtensions.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Extensions.DependencyInjection {
     public static class NRuuviTagServiceCollectionExtensions {
 
         /// <summary>
-        /// Registers services required for a <see cref="CommandApp"/> that will run an <see cref="NRuuviTag.Mqtt.MqttAgent"/>.
+        /// Registers services required for a <see cref="CommandApp"/> that will run a <see cref="NRuuviTag.RuuviTagPublisher"/>.
         /// </summary>
         /// <typeparam name="TListener">
         ///   The <see cref="IRuuviTagListener"/> that the agent will use to listen for RuuviTag 
@@ -39,7 +39,7 @@ public static class NRuuviTagServiceCollectionExtensions {
         /// <exception cref="ArgumentNullException">
         ///   <paramref name="configuration"/> is <see langword="null"/>.
         /// </exception>
-        public static IServiceCollection AddRuuviTagMqttAgent<TListener>(this IServiceCollection services, IConfiguration configuration) where TListener : class, IRuuviTagListener { 
+        public static IServiceCollection AddRuuviTagPublisherCommandApp<TListener>(this IServiceCollection services, IConfiguration configuration) where TListener : class, IRuuviTagListener { 
             if (services == null) {
                 throw new ArgumentNullException(nameof(services));
             }
@@ -85,7 +85,7 @@ public static class NRuuviTagServiceCollectionExtensions {
         /// <exception cref="ArgumentNullException">
         ///   <paramref name="factory"/> is <see langword="null"/>.
         /// </exception>
-        public static IServiceCollection AddRuuviTagMqttAgent<TListener>(this IServiceCollection services, IConfiguration configuration, Func<IServiceProvider, TListener> factory) where TListener : class, IRuuviTagListener {
+        public static IServiceCollection AddRuuviTagPublisherCommandApp<TListener>(this IServiceCollection services, IConfiguration configuration, Func<IServiceProvider, TListener> factory) where TListener : class, IRuuviTagListener {
             if (services == null) {
                 throw new ArgumentNullException(nameof(services));
             }
@@ -102,7 +102,7 @@ public static class NRuuviTagServiceCollectionExtensions {
 
             services.AddSingleton(typeResolver);
             services.AddTransient<IMqttFactory, MqttFactory>();
-            services.AddTransient<IRuuviTagListener, TListener>();
+            services.AddTransient<IRuuviTagListener, TListener>(factory);
             services.AddSingleton(CommandUtilities.BuildCommandApp(typeResolver));
 
             return services;
diff --git a/src/NRuuviTag.Cli/TypeResolver.cs b/src/NRuuviTag.Cli/TypeResolver.cs
index 92e3ce2..4f0e788 100644
--- a/src/NRuuviTag.Cli/TypeResolver.cs
+++ b/src/NRuuviTag.Cli/TypeResolver.cs
@@ -9,7 +9,7 @@ namespace NRuuviTag.Cli {
 
     /// <summary>
     /// Implements both <see cref="ITypeRegistrar"/> and <see cref="ITypeResolver"/> for use in the 
-    /// MQTT publisher <see cref="CommandApp"/>.
+    /// RuuviTag publisher <see cref="CommandApp"/>.
     /// </summary>
     public class TypeResolver : ITypeRegistrar, ITypeResolver {