[R] Expression bodies, usings, null check

i4004 · i4004 · commit 85386f8b1c6b · 2021-02-26T23:19:30.000+06:00
diff --git a/src/Simplify.Scheduler/Jobs/Crontab/CrontabProcessor.cs b/src/Simplify.Scheduler/Jobs/Crontab/CrontabProcessor.cs
@@ -58,10 +58,7 @@ public CrontabProcessor(string crontabExpression)
 		/// <summary>
 		/// Calculates the next occurrences.
 		/// </summary>
-		public void CalculateNextOccurrences()
-		{
-			CalculateNextOccurrences(TimeProvider.Current.Now);
-		}
+		public void CalculateNextOccurrences() => CalculateNextOccurrences(TimeProvider.Current.Now);
 
 		/// <summary>
 		/// Calculates the next occurrences.
@@ -93,9 +90,6 @@ public bool IsMatching(DateTime time)
 		/// Determines whether current time is matching next occurrence.
 		/// </summary>
 		/// <returns></returns>
-		public bool IsMatching()
-		{
-			return IsMatching(TimeProvider.Current.Now);
-		}
+		public bool IsMatching() => IsMatching(TimeProvider.Current.Now);
 	}
 }
diff --git a/src/Simplify.Scheduler/Jobs/Crontab/CrontabProcessorFactory.cs b/src/Simplify.Scheduler/Jobs/Crontab/CrontabProcessorFactory.cs
@@ -10,9 +10,6 @@ public class CrontabProcessorFactory : ICrontabProcessorFactory
 		/// </summary>
 		/// <param name="crontabExpression">The crontab expression.</param>
 		/// <returns></returns>
-		public ICrontabProcessor Create(string crontabExpression)
-		{
-			return new CrontabProcessor(crontabExpression);
-		}
+		public ICrontabProcessor Create(string crontabExpression) => new CrontabProcessor(crontabExpression);
 	}
 }
diff --git a/src/Simplify.Scheduler/Jobs/Crontab/CrontabSchedulerJob.cs b/src/Simplify.Scheduler/Jobs/Crontab/CrontabSchedulerJob.cs
@@ -93,10 +93,7 @@ public override void Start()
 		/// <summary>
 		/// Stops and disposes job timer.
 		/// </summary>
-		public override void Stop()
-		{
-			Dispose();
-		}
+		public override void Stop() => Dispose();
 
 		/// <summary>
 		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
diff --git a/src/Simplify.Scheduler/Jobs/SchedulerJobFactory.cs b/src/Simplify.Scheduler/Jobs/SchedulerJobFactory.cs
@@ -30,11 +30,7 @@ public SchedulerJobFactory(string appName)
 		/// <param name="invokeMethodName">Name of the invoke method.</param>
 		/// <param name="startupArgs">The startup arguments.</param>
 		/// <returns></returns>
-		public ISchedulerJob CreateJob<T>(string invokeMethodName,
-			object? startupArgs)
-		{
-			return new SchedulerJob<T>(invokeMethodName, CreateJobArgs(startupArgs));
-		}
+		public ISchedulerJob CreateJob<T>(string invokeMethodName, object? startupArgs) => new SchedulerJob<T>(invokeMethodName, CreateJobArgs(startupArgs));
 
 		/// <summary>
 		/// Creates the crontab-based scheduler job.
@@ -66,9 +62,6 @@ private static string FormatConfigurationSectionName<T>(string? configurationSec
 			return type.Name + "Settings";
 		}
 
-		private IJobArgs CreateJobArgs(object? startupArgs)
-		{
-			return new JobArgs(_appName, startupArgs);
-		}
+		private IJobArgs CreateJobArgs(object? startupArgs) => new JobArgs(_appName, startupArgs);
 	}
 }
diff --git a/src/Simplify.Scheduler/MultitaskScheduler.cs b/src/Simplify.Scheduler/MultitaskScheduler.cs
@@ -16,10 +16,7 @@ public class MultitaskScheduler : SchedulerJobsHandler
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MultitaskScheduler" /> class.
 		/// </summary>
-		public MultitaskScheduler()
-		{
-			Console.CancelKeyPress += StopJobs;
-		}
+		public MultitaskScheduler() => Console.CancelKeyPress += StopJobs;
 
 		/// <summary>
 		/// Gets or sets the current command line processor.
diff --git a/src/Simplify.Scheduler/SchedulerJobsHandler.cs b/src/Simplify.Scheduler/SchedulerJobsHandler.cs
@@ -237,16 +237,15 @@ private void Run(object state)
 
 		private void RunScoped(ISchedulerJobRepresentation job)
 		{
-			using (var scope = DIContainer.Current.BeginLifetimeScope())
-			{
-				var jobObject = scope.Resolver.Resolve(job.JobClassType);
+			using var scope = DIContainer.Current.BeginLifetimeScope();
 
-				OnJobStart?.Invoke(job);
+			var jobObject = scope.Resolver.Resolve(job.JobClassType);
 
-				InvokeJobMethod(job, jobObject);
+			OnJobStart?.Invoke(job);
 
-				OnJobFinish?.Invoke(job);
-			}
+			InvokeJobMethod(job, jobObject);
+
+			OnJobFinish?.Invoke(job);
 		}
 
 		private void RunBasicJob(ISchedulerJobRepresentation job)
diff --git a/src/Simplify.WindowsServices/CommandLine/CommandLineProcessor.cs b/src/Simplify.WindowsServices/CommandLine/CommandLineProcessor.cs
@@ -44,6 +44,12 @@ public virtual ProcessCommandLineResult ProcessCommandLineArguments(string[]? ar
 
 				case CommandLineAction.RunAsConsole:
 					return ProcessCommandLineResult.SkipServiceStart;
+
+				case CommandLineAction.UndefinedAction:
+					break;
+
+				default:
+					throw new ArgumentOutOfRangeException();
 			}
 
 			Console.WriteLine($"Undefined service parameters: '{string.Concat(args)}'");
diff --git a/src/Simplify.WindowsServices/CommandLine/InstallationController.cs b/src/Simplify.WindowsServices/CommandLine/InstallationController.cs
@@ -1,4 +1,5 @@
-﻿using System.Configuration.Install;
+﻿using System;
+using System.Configuration.Install;
 using System.Reflection;
 
 namespace Simplify.WindowsServices.CommandLine
@@ -12,26 +13,17 @@ public class InstallationController : IInstallationController
 		/// <summary>
 		/// Installs the service.
 		/// </summary>
-		public virtual void InstallService()
-		{
-			ManagedInstallerClass.InstallHelper(new[] { "/LogFile=", "/LogToConsole=true", GetEntryAssemblyLocation() });
-		}
+		public virtual void InstallService() => ManagedInstallerClass.InstallHelper(new[] { "/LogFile=", "/LogToConsole=true", GetEntryAssemblyLocation() });
 
 		/// <summary>
 		/// Uninstalls the service.
 		/// </summary>
-		public virtual void UninstallService()
-		{
-			ManagedInstallerClass.InstallHelper(new[] { "/u", "/LogFile=", "/LogToConsole=true", GetEntryAssemblyLocation() });
-		}
+		public virtual void UninstallService() => ManagedInstallerClass.InstallHelper(new[] { "/u", "/LogFile=", "/LogToConsole=true", GetEntryAssemblyLocation() });
 
 		/// <summary>
 		/// Gets the entry assembly location.
 		/// </summary>
 		/// <returns></returns>
-		protected string GetEntryAssemblyLocation()
-		{
-			return Assembly.GetEntryAssembly().Location;
-		}
+		protected string GetEntryAssemblyLocation() => Assembly.GetEntryAssembly()?.Location ?? throw new InvalidOperationException("Entry assembly location is null");
 	}
 }
diff --git a/src/Simplify.WindowsServices/Jobs/Crontab/CrontabProcessor.cs b/src/Simplify.WindowsServices/Jobs/Crontab/CrontabProcessor.cs
@@ -58,10 +58,7 @@ public CrontabProcessor(string crontabExpression)
 		/// <summary>
 		/// Calculates the next occurrences.
 		/// </summary>
-		public void CalculateNextOccurrences()
-		{
-			CalculateNextOccurrences(TimeProvider.Current.Now);
-		}
+		public void CalculateNextOccurrences() => CalculateNextOccurrences(TimeProvider.Current.Now);
 
 		/// <summary>
 		/// Calculates the next occurrences.
@@ -93,9 +90,6 @@ public bool IsMatching(DateTime time)
 		/// Determines whether current time is matching next occurrence.
 		/// </summary>
 		/// <returns></returns>
-		public bool IsMatching()
-		{
-			return IsMatching(TimeProvider.Current.Now);
-		}
+		public bool IsMatching() => IsMatching(TimeProvider.Current.Now);
 	}
 }
diff --git a/src/Simplify.WindowsServices/Jobs/Crontab/CrontabProcessorFactory.cs b/src/Simplify.WindowsServices/Jobs/Crontab/CrontabProcessorFactory.cs
@@ -10,9 +10,6 @@ public class CrontabProcessorFactory : ICrontabProcessorFactory
 		/// </summary>
 		/// <param name="crontabExpression">The crontab expression.</param>
 		/// <returns></returns>
-		public ICrontabProcessor Create(string crontabExpression)
-		{
-			return new CrontabProcessor(crontabExpression);
-		}
+		public ICrontabProcessor Create(string crontabExpression) => new CrontabProcessor(crontabExpression);
 	}
 }
diff --git a/src/Simplify.WindowsServices/Jobs/Crontab/CrontabServiceJob.cs b/src/Simplify.WindowsServices/Jobs/Crontab/CrontabServiceJob.cs
@@ -93,10 +93,7 @@ public override void Start()
 		/// <summary>
 		/// Stops and disposes job timer.
 		/// </summary>
-		public override void Stop()
-		{
-			Dispose();
-		}
+		public override void Stop() => Dispose();
 
 		/// <summary>
 		/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
diff --git a/src/Simplify.WindowsServices/Jobs/ServiceJobFactory.cs b/src/Simplify.WindowsServices/Jobs/ServiceJobFactory.cs
@@ -85,9 +85,6 @@ private static string FormatConfigurationSectionName<T>(string? configurationSec
 			return type.Name + "Settings";
 		}
 
-		private IJobArgs CreateJobArgs(object? startupArgs)
-		{
-			return new JobArgs(_serviceName, startupArgs);
-		}
+		private IJobArgs CreateJobArgs(object? startupArgs) => new JobArgs(_serviceName, startupArgs);
 	}
 }
diff --git a/src/Simplify.WindowsServices/MultitaskServiceHandler.cs b/src/Simplify.WindowsServices/MultitaskServiceHandler.cs
@@ -133,10 +133,8 @@ public void AddJob<T>(IConfiguration configuration,
 		/// <typeparam name="T"></typeparam>
 		/// <param name="automaticallyRegisterUserType">if set to <c>true</c> then user type T will be registered in DIContainer with transient lifetime.</param>
 		public void AddJob<T>(bool automaticallyRegisterUserType)
-			where T : class
-		{
+			where T : class =>
 			AddJob<T>(null, "Run", automaticallyRegisterUserType);
-		}
 
 		/// <summary>
 		/// Adds the service job.
@@ -146,10 +144,8 @@ public void AddJob<T>(bool automaticallyRegisterUserType)
 		/// <param name="automaticallyRegisterUserType">if set to <c>true</c> then user type T will be registered in DIContainer with transient lifetime.</param>
 		public void AddJob<T>(IConfiguration configuration,
 			bool automaticallyRegisterUserType)
-			where T : class
-		{
+			where T : class =>
 			AddJob<T>(configuration, null, "Run", automaticallyRegisterUserType);
-		}
 
 		/// <summary>
 		/// Adds the basic service job.
@@ -319,16 +315,15 @@ private void Run(object state)
 
 		private void RunScoped(IServiceJobRepresentation job)
 		{
-			using (var scope = DIContainer.Current.BeginLifetimeScope())
-			{
-				var jobObject = scope.Resolver.Resolve(job.JobClassType);
+			using var scope = DIContainer.Current.BeginLifetimeScope();
 
-				OnJobStart?.Invoke(job);
+			var jobObject = scope.Resolver.Resolve(job.JobClassType);
 
-				InvokeJobMethod(job, jobObject);
+			OnJobStart?.Invoke(job);
 
-				OnJobFinish?.Invoke(job);
-			}
+			InvokeJobMethod(job, jobObject);
+
+			OnJobFinish?.Invoke(job);
 		}
 
 		private void RunBasicJob(IServiceJobRepresentation job)
diff --git a/src/Simplify.WindowsServices/ServiceInstallerBase.cs b/src/Simplify.WindowsServices/ServiceInstallerBase.cs
@@ -95,10 +95,7 @@ public ServiceInstallerBase(ServiceAccount account, string userName = null, stri
 		/// <param name="account">Account type under which to run this service</param>
 		/// <param name="userName">User name under which to run this service</param>
 		/// <param name="password">Password under which to run this service</param>
-		public ServiceInstallerBase(string description, string displayName, string serviceName, ServiceAccount account, string userName, string password)
-		{
-			Initialize(description, displayName, serviceName, account, userName, password);
-		}
+		public ServiceInstallerBase(string description, string displayName, string serviceName, ServiceAccount account, string userName, string password) => Initialize(description, displayName, serviceName, account, userName, password);
 
 		/// <summary>
 		/// Perform the installation of service (used by system)
@@ -115,23 +112,14 @@ public override void Install(IDictionary stateSaver)
 			base.Install(stateSaver);
 		}
 
-		private static ServiceAccount TryParseServiceAccountFieldData(string data)
-		{
-			switch (data)
+		private static ServiceAccount TryParseServiceAccountFieldData(string data) =>
+			data switch
 			{
-				case "NetworkService":
-					return ServiceAccount.NetworkService;
-
-				case "LocalSystem":
-					return ServiceAccount.LocalSystem;
-
-				case "User":
-					return ServiceAccount.User;
-
-				default:
-					return ServiceAccount.LocalService;
-			}
-		}
+				"NetworkService" => ServiceAccount.NetworkService,
+				"LocalSystem" => ServiceAccount.LocalSystem,
+				"User" => ServiceAccount.User,
+				_ => ServiceAccount.LocalService
+			};
 
 		private void Initialize(string description, string displayName, string serviceName, ServiceAccount account,
 			string userName, string password)
@@ -179,9 +167,6 @@ private void TryToLoadRunAsUserSettings(Assembly serviceAssembly = null)
 			_serviceAccount = !IsRunAsUserSet() ? TryParseServiceAccountFieldData(serviceAccount) : ServiceAccount.User;
 		}
 
-		private bool IsRunAsUserSet()
-		{
-			return !string.IsNullOrEmpty(_userName) && !string.IsNullOrEmpty(_password);
-		}
+		private bool IsRunAsUserSet() => !string.IsNullOrEmpty(_userName) && !string.IsNullOrEmpty(_password);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,6 @@ public class CrontabProcessorFactory : ICrontabProcessorFactory`
`10`	`10`	`/// </summary>`
`11`	`11`	`/// <param name="crontabExpression">The crontab expression.</param>`
`12`	`12`	`/// <returns></returns>`
`13`		`- public ICrontabProcessor Create(string crontabExpression)`
`14`		`- {`
`15`		`- return new CrontabProcessor(crontabExpression);`
`16`		`- }`
	`13`	`+ public ICrontabProcessor Create(string crontabExpression) => new CrontabProcessor(crontabExpression);`
`17`	`14`	`}`
`18`	`15`	`}`