refactor: clean up code warnings

Denifia · Denifia · commit 1978547e0ff0 · 2019-11-27T18:27:14.000+08:00
diff --git a/SendItems/Services/CommandService.cs b/SendItems/Services/CommandService.cs
@@ -12,7 +12,6 @@ public class CommandService : ICommandService
         private bool _savedGameLoaded = false;
 
         private readonly IMod _mod;
-        private readonly IConfigurationService _configService;
         private readonly IFarmerService _farmerService;
 
         private const string _meCommand = "si_me";
@@ -25,11 +24,9 @@ public class CommandService : ICommandService
 
         public CommandService(
             IMod mod,
-            IConfigurationService configService,
             IFarmerService farmerService)
         {
             _mod = mod;
-            _configService = configService;
             _farmerService = farmerService;
 
             RegisterCommands();
@@ -105,13 +102,13 @@ private void HandleCommand(string command, string[] args)
             switch (command)
             {
                 case _meCommand:
-                    ShowMyDetails(args);
+                    ShowMyDetails();
                     break;
                 case _localFarmersCommand:
-                    ListLocalFarmers(args);
+                    ListLocalFarmers();
                     break;
                 case _addLocalFarmersCommand:
-                    AddLocalFarmers(args);
+                    AddLocalFarmers();
                     break;
                 case _addFriendCommand:
                     AddFriend(args);
@@ -120,25 +117,25 @@ private void HandleCommand(string command, string[] args)
                     RemoveFriend(args);
                     break;
                 case _removeAllFriendsCommand:
-                    RemoveAllFriends(args);
+                    RemoveAllFriends();
                     break;
                 case _myFriendsCommand:
-                    ListMyFriends(args);
+                    ListMyFriends();
                     break;
                 default:
                     throw new NotImplementedException($"Send Items received unknown command '{command}'.");
             }
         }
 
-        private void ShowMyDetails(string[] args)
+        private void ShowMyDetails()
         {
             _mod.Monitor.Log("This is your \"friend command\". Get your friends to run this command in the SMAPI console to add you as a friend. Each farmer (saved game) has it's own list of friends.", LogLevel.Info);
             _mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.ConsoleSafeName} {_farmerService.CurrentFarmer.ConsoleSaveFarmName}", LogLevel.Info);
         }
 
-        private void ListLocalFarmers(string[] args)
+        private void ListLocalFarmers()
         {
-            var farmers = Repository.Instance.Fetch<Domain.Farmer>();
+            var farmers = Repository.Instance.Fetch<Farmer>();
             if (farmers.Any())
             {
                 _mod.Monitor.Log("Here are all the local farmers (saved games)...", LogLevel.Info);
@@ -154,9 +151,9 @@ private void ListLocalFarmers(string[] args)
             }
         }
 
-        private void AddLocalFarmers(string[] args)
+        private void AddLocalFarmers()
         {
-            var farmers = Repository.Instance.Fetch<Domain.Farmer>();
+            var farmers = Repository.Instance.Fetch<Farmer>();
             var count = 0;
             foreach (var farmer in farmers)
             {
@@ -222,7 +219,7 @@ private void RemoveFriend(string[] args)
             }
         }
 
-        private void RemoveAllFriends(string[] args)
+        private void RemoveAllFriends()
         {
             var success = _farmerService.RemoveAllFriendFromCurrentPlayer();
             if (success)
@@ -235,7 +232,7 @@ private void RemoveAllFriends(string[] args)
             }
         }
 
-        private void ListMyFriends(string[] args)
+        private void ListMyFriends()
         {
             var friends = _farmerService.CurrentFarmer.Friends;
             if (friends.Any())
diff --git a/SendItems/Services/ConfigurationService.cs b/SendItems/Services/ConfigurationService.cs
@@ -10,8 +10,8 @@ namespace Denifia.Stardew.SendItems.Services
     // TODO: Add private members for each of the public properties for performance
     public class ConfigurationService : IConfigurationService
     {
-        private IModHelper _modHelper;
-        private ModConfig _modConfig;
+        private readonly IModHelper _modHelper;
+        private readonly ModConfig _modConfig;
         private const string _databaseName = ModConstants.DatabaseName;
         private string _connectionString = string.Empty;
 
diff --git a/SendItems/Services/FarmerService.cs b/SendItems/Services/FarmerService.cs
@@ -113,12 +113,5 @@ private Domain.Farmer GetFarmerById(string id)
         {
             return Repository.Instance.SingleOrDefault<Domain.Farmer>(x => x.Id == id);
         }
-
-        private void DetermineCurrentFarmer()
-        {
-            var name = Game1.player.Name;
-            var farmName = Game1.player.farmName;
-            _currentFarmer = Repository.Instance.FirstOrDefault<Domain.Farmer>(x => x.Name == name && x.FarmName == farmName);
-        }
     }
 }
diff --git a/SendItems/Services/LetterboxService.cs b/SendItems/Services/LetterboxService.cs
@@ -13,14 +13,11 @@ namespace Denifia.Stardew.SendItems.Services
     /// </summary>
     public class LetterboxService : ILetterboxService
     {
-        private readonly IConfigurationService _configService;
         private readonly IFarmerService _farmerService;
 
         public LetterboxService(
-            IConfigurationService configService,
             IFarmerService farmerService)
         {
-            _configService = configService;
             _farmerService = farmerService;
 
             ModEvents.PlayerUsingLetterbox += PlayerUsingLetterbox;
diff --git a/SendItems/Services/PostboxService.cs b/SendItems/Services/PostboxService.cs
@@ -84,7 +84,7 @@ private void MailComposed(object sender, MailComposedEventArgs e)
 
             if (item == null) return;
 
-            var messageText = string.Format(_messageFormat, fromFarmer.Name, item.ParentSheetIndex, item.getStack());
+            var messageText = string.Format(_messageFormat, fromFarmer.Name, item.ParentSheetIndex, item.Stack);
 
             // Consider: Moving this to own service
             var mail = new Mail()
diff --git a/SendItemsApi/Domain/AzureTableStorageRepository.cs b/SendItemsApi/Domain/AzureTableStorageRepository.cs
@@ -9,10 +9,10 @@ namespace Denifia.Stardew.SendItemsApi.Domain
 {
     public class AzureTableStorageRepository : ITableStorageRepository
     {
-        CloudStorageAccount _storageAccount;
-        CloudTableClient _tableClient;
-        CloudTable _table;
-        AzureStorageConfig _azureTableStorageConfig;
+        readonly CloudStorageAccount _storageAccount;
+        readonly CloudTableClient _tableClient;
+        readonly CloudTable _table;
+        readonly AzureStorageConfig _azureTableStorageConfig;
 
         public AzureTableStorageRepository(IOptions<AzureStorageConfig> azureTableStorageConfig)
         {
@@ -59,7 +59,7 @@ public async Task<TEntity> Retrieve<TEntity>(string partitionKey, string rowKey)
             {
 
             }
-            return default(TEntity);
+            return default;
         }
 
         public async Task<bool> Delete<TEntity>(TEntity entity) where TEntity : ITableEntity
diff --git a/SendItemsApi/Program.cs b/SendItemsApi/Program.cs
@@ -6,14 +6,13 @@ namespace Denifia.Stardew.SendItemsApi
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static void Main()
         {
             var host = new WebHostBuilder()
                 .UseKestrel()
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
-                .UseApplicationInsights()
                 .Build();
 
             host.Run();
diff --git a/SendItemsApi/Startup.cs b/SendItemsApi/Startup.cs
@@ -12,10 +12,10 @@ public class Startup
         public Startup(IWebHostEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath);
-                // .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                // .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
-                //.AddEnvironmentVariables();
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
+                .AddEnvironmentVariables();
             Configuration = builder.Build();
         }
 
@@ -30,11 +30,8 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app)
         {
-            // loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            // loggerFactory.AddDebug();
-
             app.UseRouting();
             app.UseStaticFiles();
             app.UseEndpoints(x => 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public class CommandService : ICommandService`
`12`	`12`	`private bool _savedGameLoaded = false;`
`13`	`13`
`14`	`14`	`private readonly IMod _mod;`
`15`		`- private readonly IConfigurationService _configService;`
`16`	`15`	`private readonly IFarmerService _farmerService;`
`17`	`16`
`18`	`17`	`private const string _meCommand = "si_me";`
`@@ -25,11 +24,9 @@ public class CommandService : ICommandService`
`25`	`24`
`26`	`25`	`public CommandService(`
`27`	`26`	`IMod mod,`
`28`		`- IConfigurationService configService,`
`29`	`27`	`IFarmerService farmerService)`
`30`	`28`	`{`
`31`	`29`	`_mod = mod;`
`32`		`- _configService = configService;`
`33`	`30`	`_farmerService = farmerService;`
`34`	`31`
`35`	`32`	`RegisterCommands();`
`@@ -105,13 +102,13 @@ private void HandleCommand(string command, string[] args)`
`105`	`102`	`switch (command)`
`106`	`103`	`{`
`107`	`104`	`case _meCommand:`
`108`		`- ShowMyDetails(args);`
	`105`	`+ ShowMyDetails();`
`109`	`106`	`break;`
`110`	`107`	`case _localFarmersCommand:`
`111`		`- ListLocalFarmers(args);`
	`108`	`+ ListLocalFarmers();`
`112`	`109`	`break;`
`113`	`110`	`case _addLocalFarmersCommand:`
`114`		`- AddLocalFarmers(args);`
	`111`	`+ AddLocalFarmers();`
`115`	`112`	`break;`
`116`	`113`	`case _addFriendCommand:`
`117`	`114`	`AddFriend(args);`
`@@ -120,25 +117,25 @@ private void HandleCommand(string command, string[] args)`
`120`	`117`	`RemoveFriend(args);`
`121`	`118`	`break;`
`122`	`119`	`case _removeAllFriendsCommand:`
`123`		`- RemoveAllFriends(args);`
	`120`	`+ RemoveAllFriends();`
`124`	`121`	`break;`
`125`	`122`	`case _myFriendsCommand:`
`126`		`- ListMyFriends(args);`
	`123`	`+ ListMyFriends();`
`127`	`124`	`break;`
`128`	`125`	`default:`
`129`	`126`	`throw new NotImplementedException($"Send Items received unknown command '{command}'.");`
`130`	`127`	`}`
`131`	`128`	`}`
`132`	`129`
`133`		`- private void ShowMyDetails(string[] args)`
	`130`	`+ private void ShowMyDetails()`
`134`	`131`	`{`
`135`	`132`	`_mod.Monitor.Log("This is your \"friend command\". Get your friends to run this command in the SMAPI console to add you as a friend. Each farmer (saved game) has it's own list of friends.", LogLevel.Info);`
`136`	`133`	`_mod.Monitor.Log($"{_addFriendCommand} {_farmerService.CurrentFarmer.Id} {_farmerService.CurrentFarmer.ConsoleSafeName} {_farmerService.CurrentFarmer.ConsoleSaveFarmName}", LogLevel.Info);`
`137`	`134`	`}`
`138`	`135`
`139`		`- private void ListLocalFarmers(string[] args)`
	`136`	`+ private void ListLocalFarmers()`
`140`	`137`	`{`
`141`		`- var farmers = Repository.Instance.Fetch<Domain.Farmer>();`
	`138`	`+ var farmers = Repository.Instance.Fetch<Farmer>();`
`142`	`139`	`if (farmers.Any())`
`143`	`140`	`{`
`144`	`141`	`_mod.Monitor.Log("Here are all the local farmers (saved games)...", LogLevel.Info);`
`@@ -154,9 +151,9 @@ private void ListLocalFarmers(string[] args)`
`154`	`151`	`}`
`155`	`152`	`}`
`156`	`153`
`157`		`- private void AddLocalFarmers(string[] args)`
	`154`	`+ private void AddLocalFarmers()`
`158`	`155`	`{`
`159`		`- var farmers = Repository.Instance.Fetch<Domain.Farmer>();`
	`156`	`+ var farmers = Repository.Instance.Fetch<Farmer>();`
`160`	`157`	`var count = 0;`
`161`	`158`	`foreach (var farmer in farmers)`
`162`	`159`	`{`
`@@ -222,7 +219,7 @@ private void RemoveFriend(string[] args)`
`222`	`219`	`}`
`223`	`220`	`}`
`224`	`221`
`225`		`- private void RemoveAllFriends(string[] args)`
	`222`	`+ private void RemoveAllFriends()`
`226`	`223`	`{`
`227`	`224`	`var success = _farmerService.RemoveAllFriendFromCurrentPlayer();`
`228`	`225`	`if (success)`
`@@ -235,7 +232,7 @@ private void RemoveAllFriends(string[] args)`
`235`	`232`	`}`
`236`	`233`	`}`
`237`	`234`
`238`		`- private void ListMyFriends(string[] args)`
	`235`	`+ private void ListMyFriends()`
`239`	`236`	`{`
`240`	`237`	`var friends = _farmerService.CurrentFarmer.Friends;`
`241`	`238`	`if (friends.Any())`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,5 @@ private Domain.Farmer GetFarmerById(string id)`
`113`	`113`	`{`
`114`	`114`	`return Repository.Instance.SingleOrDefault<Domain.Farmer>(x => x.Id == id);`
`115`	`115`	`}`
`116`		`-`
`117`		`- private void DetermineCurrentFarmer()`
`118`		`- {`
`119`		`- var name = Game1.player.Name;`
`120`		`- var farmName = Game1.player.farmName;`
`121`		`- _currentFarmer = Repository.Instance.FirstOrDefault<Domain.Farmer>(x => x.Name == name && x.FarmName == farmName);`
`122`		`- }`
`123`	`116`	`}`
`124`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,11 @@ namespace Denifia.Stardew.SendItems.Services`
`13`	`13`	`/// </summary>`
`14`	`14`	`public class LetterboxService : ILetterboxService`
`15`	`15`	`{`
`16`		`- private readonly IConfigurationService _configService;`
`17`	`16`	`private readonly IFarmerService _farmerService;`
`18`	`17`
`19`	`18`	`public LetterboxService(`
`20`		`- IConfigurationService configService,`
`21`	`19`	`IFarmerService farmerService)`
`22`	`20`	`{`
`23`		`- _configService = configService;`
`24`	`21`	`_farmerService = farmerService;`
`25`	`22`
`26`	`23`	`ModEvents.PlayerUsingLetterbox += PlayerUsingLetterbox;`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ namespace Denifia.Stardew.SendItemsApi.Domain`
`9`	`9`	`{`
`10`	`10`	`public class AzureTableStorageRepository : ITableStorageRepository`
`11`	`11`	`{`
`12`		`- CloudStorageAccount _storageAccount;`
`13`		`- CloudTableClient _tableClient;`
`14`		`- CloudTable _table;`
`15`		`- AzureStorageConfig _azureTableStorageConfig;`
	`12`	`+ readonly CloudStorageAccount _storageAccount;`
	`13`	`+ readonly CloudTableClient _tableClient;`
	`14`	`+ readonly CloudTable _table;`
	`15`	`+ readonly AzureStorageConfig _azureTableStorageConfig;`
`16`	`16`
`17`	`17`	`public AzureTableStorageRepository(IOptions<AzureStorageConfig> azureTableStorageConfig)`
`18`	`18`	`{`
`@@ -59,7 +59,7 @@ public async Task<TEntity> Retrieve<TEntity>(string partitionKey, string rowKey)`
`59`	`59`	`{`
`60`	`60`
`61`	`61`	`}`
`62`		`- return default(TEntity);`
	`62`	`+ return default;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public async Task<bool> Delete<TEntity>(TEntity entity) where TEntity : ITableEntity`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,13 @@ namespace Denifia.Stardew.SendItemsApi`
`6`	`6`	`{`
`7`	`7`	`public class Program`
`8`	`8`	`{`
`9`		`- public static void Main(string[] args)`
	`9`	`+ public static void Main()`
`10`	`10`	`{`
`11`	`11`	`var host = new WebHostBuilder()`
`12`	`12`	`.UseKestrel()`
`13`	`13`	`.UseContentRoot(Directory.GetCurrentDirectory())`
`14`	`14`	`.UseIISIntegration()`
`15`	`15`	`.UseStartup<Startup>()`
`16`		`- .UseApplicationInsights()`
`17`	`16`	`.Build();`
`18`	`17`
`19`	`18`	`host.Run();`