Inspection and documentation fixes

Author: Oren (electricessence)

AsyncProcess.cs

@@ -1,14 +1,27 @@
 using Open.Disposable;
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace Open.Threading
 {
+	[SuppressMessage("ReSharper", "MemberCanBeProtected.Global")]
+	[SuppressMessage("ReSharper", "VirtualMemberNeverOverridden.Global")]
+	[SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")]
 	public class AsyncProcess<T> : DisposableBase
 		where T : new()
 	{
+
+		public AsyncProcess(Action<T> closure, TaskScheduler scheduler = null)
+		{
+			Closure = closure;
+
+			Scheduler = scheduler ?? TaskScheduler.Default;
+			Count = 0;
+		}
+
 		protected readonly ReaderWriterLockSlim SyncLock = new ReaderWriterLockSlim();
 
 		protected TaskScheduler Scheduler
@@ -17,10 +30,10 @@ protected TaskScheduler Scheduler
 			private set;
 		}
 
-		protected virtual Action<T> Closure
+		protected Action<T> Closure
 		{
 			get;
-			set;
+			private set;
 		}
 
 		protected Task InternalTask
@@ -41,30 +54,13 @@ public Exception LastFault
 			protected set;
 		}
 
-		protected AsyncProcess(TaskScheduler scheduler = null)
-			: base()
-		{
-			Scheduler = scheduler ?? TaskScheduler.Default;
-			Count = 0;
-		}
-
-		public AsyncProcess(Action<T> closure, TaskScheduler scheduler = null)
-			: this(scheduler)
-		{
-			Closure = closure;
-		}
-
 		public int Count
 		{
 			get;
 			protected set;
 		}
 
-		public bool HasBeenRun
-		{
-			get { return Count != 0; }
-		}
-
+		public bool HasBeenRun => Count != 0;
 
 		//long _processCount = 0;
 		protected virtual void Process(object progress)
@@ -84,13 +80,13 @@ protected virtual void Process(object progress)
 			{
 				SyncLock.Write(() => LastFault = ex);
 			}
-			finally
-			{
-				//Interlocked.Decrement(ref _processCount);
-			}
+			//finally
+			//{
+			//	//Interlocked.Decrement(ref _processCount);
+			//}
 		}
 
-		protected virtual Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefresh)
+		protected virtual Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefresh = null)
 		{
 			Task task = null;
 			SyncLock.ReadWriteConditionalOptimized(
@@ -114,18 +110,8 @@ protected virtual Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefre
 			return task;
 		}
 
-		protected Task EnsureProcess(bool once)
-		{
-			return EnsureProcess(once, null);
-		}
-
-		public bool IsRunning
-		{
-			get
-			{
-				return InternalTask?.IsActive() ?? false;
-			}
-		}
+		// ReSharper disable once MemberCanBeProtected.Global
+		public bool IsRunning => InternalTask?.IsActive() ?? false;
 
 		public void Wait(bool once = true)
 		{
@@ -134,10 +120,9 @@ public void Wait(bool once = true)
 		}
 
 		public bool EnsureActive(bool once = false)
-		{
-			return EnsureProcess(once).IsActive();
-		}
+			=> EnsureProcess(once).IsActive();
 
+		// ReSharper disable once MemberCanBeProtected.Global
 		public virtual T Progress
 		{
 			get
@@ -166,30 +151,23 @@ protected override void OnDispose(bool calledExplicitly)
 
 	public class AsyncProcess : AsyncProcess<Progress>
 	{
-		protected AsyncProcess(TaskScheduler scheduler = null)
-			: base(scheduler)
-		{
-		}
-
+		// ReSharper disable once MemberCanBeProtected.Global
 		public AsyncProcess(Action<Progress> closure, TaskScheduler scheduler = null)
-			: this(scheduler)
+			: base(closure, scheduler)
 		{
-			Closure = closure;
 		}
 
 		public string TimeStatistics
 		{
 			get
 			{
 				var result = string.Empty;
-				if (LatestCompleted != default(DateTime))
+				if (LatestCompleted != default)
 					result += "\n" + (DateTime.Now - LatestCompleted).ToString() + " ago";
 
-				if (IsRunning)
-				{
-					var p = Progress;
-					result += "\n" + p.EstimatedTimeLeftString + " remaining";
-				}
+				if (!IsRunning) return result;
+				var p = Progress;
+				result += "\n" + p.EstimatedTimeLeftString + " remaining";
 
 				return result;
 			}
@@ -208,10 +186,10 @@ protected override void Process(object progress)
 				SyncLock.Write(() => LatestCompleted = DateTime.Now);
 				p.Failed(ex.ToString());
 			}
-			finally
-			{
-				//Interlocked.Decrement(ref _processCount);
-			}
+			//finally
+			//{
+			//	//Interlocked.Decrement(ref _processCount);
+			//}
 		}
 
 	}

AsyncQuery.cs

@@ -20,12 +20,12 @@ protected Task<TResult> InternalTaskValued
 		}
 
 		public AsyncQuery(Func<Progress, TResult> query, TaskScheduler scheduler = null)
-			: base(scheduler)
+			: base(null, scheduler)
 		{
 			Closure = query;
 		}
 
-		protected Task<TResult> EnsureProcessValued(bool once, TimeSpan? timeAllowedBeforeRefresh)
+		protected Task<TResult> EnsureProcessValued(bool once, TimeSpan? timeAllowedBeforeRefresh = null)
 		{
 
 			Task<TResult> task = null;
@@ -52,12 +52,7 @@ protected Task<TResult> EnsureProcessValued(bool once, TimeSpan? timeAllowedBefo
 			return task;
 		}
 
-		protected Task<TResult> EnsureProcessValued(bool once)
-		{
-			return EnsureProcessValued(once, null);
-		}
-
-		protected override Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefresh)
+		protected override Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefresh = null)
 		{
 			return EnsureProcessValued(once, timeAllowedBeforeRefresh);
 		}
@@ -79,11 +74,11 @@ protected override Task EnsureProcess(bool once, TimeSpan? timeAllowedBeforeRefr
 				SyncLock.Write(() => LatestCompleted = DateTime.Now);
 				p.Failed(ex.ToString());
 			}
-			finally
-			{
-				//Interlocked.Decrement(ref _processCount);
-			}
-			return default(TResult);
+			//finally
+			//{
+			//	//Interlocked.Decrement(ref _processCount);
+			//}
+			return default;
 		}
 
 		public bool IsCurrentDataReady
@@ -107,15 +102,12 @@ public override Progress Progress
 			get
 			{
 				var t = InternalTask;
-				if (t == null)
-				{
-					var result = new Progress();
-					if (IsLatestAvailable)
-						result.Finish();
-					return result;
-				}
+				if (t != null) return (Progress)(t.AsyncState);
+				var result = new Progress();
+				if (IsLatestAvailable)
+					result.Finish();
+				return result;
 
-				return (Progress)(t.AsyncState);
 			}
 		}
 
@@ -154,37 +146,22 @@ public virtual void OverrideLatest(TResult value, Func<TResult, TResult, bool> u
 
 		public TResult Latest
 		{
-			get
-			{
-				return GetLatest();
-			}
-			protected set
-			{
-				OverrideLatest(value);
-			}
+			get => GetLatest();
+			protected set => OverrideLatest(value);
 		}
 
 
-		public TResult LatestEnsured
-		{
-			get
-			{
-				return GetLatestOrRunning(out var completed);
-			}
-		}
+		public TResult LatestEnsured => GetLatestOrRunning(out _);
 
 		public bool WaitForRunningToComplete(TimeSpan? waitForCurrentTimeout = null)
 		{
 			var task = SyncLock.ReadValue(() => InternalTaskValued);
-			if (task != null)
-			{
-				if (waitForCurrentTimeout.HasValue)
-					task.Wait(waitForCurrentTimeout.Value);
-				else
-					task.Wait();
-				return true;
-			}
-			return false;
+			if (task == null) return false;
+			if (waitForCurrentTimeout.HasValue)
+				task.Wait(waitForCurrentTimeout.Value);
+			else
+				task.Wait();
+			return true;
 		}
 
 
@@ -226,7 +203,7 @@ public virtual bool TryGetLatest(out TResult latest, out DateTime completed)
 
 		public virtual bool TryGetLatest(out TResult latest)
 		{
-			return TryGetLatest(out latest, out var completed);
+			return TryGetLatest(out latest, out _);
 		}
 
 		public virtual bool TryGetLatestOrStart(out TResult latest, out DateTime completed)
@@ -239,13 +216,11 @@ public virtual bool TryGetLatestOrStart(out TResult latest, out DateTime complet
 
 		public virtual bool TryGetLatestOrStart(out TResult latest)
 		{
-			return TryGetLatestOrStart(out latest, out var completed);
+			return TryGetLatestOrStart(out latest, out _);
 		}
 
 		public virtual bool TryGetLatestOrStart()
-		{
-			return TryGetLatestOrStart(out var latest, out var completed);
-		}
+			=> TryGetLatestOrStart(out _, out _);
 
 
 		public TResult Refresh(TimeSpan? timeAllowedBeforeRefresh = null, TimeSpan? waitForCurrentTimeout = null)
@@ -269,11 +244,9 @@ public TResult GetRunningValue()
 
 		public TResult GetLatestOrRunning(out DateTime completed)
 		{
-			if (!TryGetLatest(out var result, out completed))
-			{
-				result = RunningValue;
-				completed = DateTime.Now;
-			}
+			if (TryGetLatest(out var result, out completed)) return result;
+			result = RunningValue;
+			completed = DateTime.Now;
 			return result;
 		}
 
@@ -282,7 +255,8 @@ public TResult GetLatestOrRunning(out DateTime completed)
 		protected override void OnDispose(bool calledExplicitly)
 		{
 			base.OnDispose(calledExplicitly);
-			_latest = default(TResult);
+			_latest = default;
+			Closure = null;
 		}
 	}
 }