Updated sample app to use latest package version.

Updated executor to use constructor inject for some dependencies.
alexboia · Mar 17, 2023 · 73f0e6a · 73f0e6a
1 parent fcee93a
commit 73f0e6a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 17 deletions.
diff --git a/LVD.Stakhanovise.NET.Samples.FileHasher/FileProcessor/Executors/HashFileByHandleExecutor.cs b/LVD.Stakhanovise.NET.Samples.FileHasher/FileProcessor/Executors/HashFileByHandleExecutor.cs
@@ -44,17 +44,31 @@ namespace LVD.Stakhanovise.NET.Samples.FileHasher.FileProcessor.Executors
 {
 	public class HashFileByHandleExecutor : BaseTaskExecutor<HashFileByHandle>
 	{
+		//Keep these dependency injected
+		private readonly ISourceFileRepository mSourceFileRepository;
+
+		private readonly IFileHashRepository mFileHashRepository;
+
+		public HashFileByHandleExecutor( ISourceFileRepository sourceFileRepository, 
+			IFileHashRepository fileHashRepository )
+		{
+			mSourceFileRepository = sourceFileRepository
+				?? throw new ArgumentNullException( nameof( sourceFileRepository ) );
+			mFileHashRepository = fileHashRepository
+				?? throw new ArgumentNullException( nameof( fileHashRepository ) );
+		}
+
 		public override async Task ExecuteAsync( HashFileByHandle payload, ITaskExecutionContext executionContext )
 		{
 			using ( SHA256 sha256 = SHA256.Create() )
 			{
-				FileHandle fileHandle = 
+				FileHandle fileHandle =
 					ResolveFileHandle( payload.HandleId );
 
-				byte[] fileContents = 
+				byte [] fileContents =
 					await ReadFileAsync( fileHandle );
 
-				FileHashInfo fileHashInfo = ComputeHash( fileHandle, 
+				FileHashInfo fileHashInfo = ComputeHash( fileHandle,
 					fileContents );
 
 				StoreFileHashAndNotifyCompletion( fileHashInfo );
@@ -63,19 +77,19 @@ public override async Task ExecuteAsync( HashFileByHandle payload, ITaskExecutio
 
 		private FileHandle ResolveFileHandle( Guid handleId )
 		{
-			return SourceFileRepository.ResolveFileByHandleId( handleId );
+			return mSourceFileRepository.ResolveFileByHandleId( handleId );
 		}
 
-		private async Task<byte[]> ReadFileAsync( FileHandle fileHandle )
+		private async Task<byte []> ReadFileAsync( FileHandle fileHandle )
 		{
 			return await File.ReadAllBytesAsync( fileHandle.Path );
 		}
 
-		private FileHashInfo ComputeHash( FileHandle fileHandle, byte[] fileContents )
+		private FileHashInfo ComputeHash( FileHandle fileHandle, byte [] fileContents )
 		{
 			using ( SHA256 sha256 = SHA256.Create() )
 			{
-				byte[] fileHash = sha256.ComputeHash( fileContents );
+				byte [] fileHash = sha256.ComputeHash( fileContents );
 				FileHashInfo fileHashInfo = new FileHashInfo( fileHandle, fileHash );
 
 				return fileHashInfo;
@@ -84,14 +98,14 @@ private FileHashInfo ComputeHash( FileHandle fileHandle, byte[] fileContents )
 
 		private void StoreFileHashAndNotifyCompletion( FileHashInfo fileHashInfo )
 		{
-			FileHashRepository.AddFileHash( fileHashInfo );
+			mFileHashRepository.AddFileHash( fileHashInfo );
 			ProcessingWatcher.NotifyFileHashed( fileHashInfo.FileHandle );
 		}
 
-		public ISourceFileRepository SourceFileRepository { get; set; }
-
-		public IFileHashRepository FileHashRepository { get; set; }
-
-		public IProcessingWatcher ProcessingWatcher { get; set; }
+		//Keep this property-injected
+		public IProcessingWatcher ProcessingWatcher
+		{
+			get; set;
+		}
 	}
 }
diff --git a/LVD.Stakhanovise.NET.Samples.FileHasher/LVD.Stakhanovise.NET.Samples.FileHasher.csproj b/LVD.Stakhanovise.NET.Samples.FileHasher/LVD.Stakhanovise.NET.Samples.FileHasher.csproj
@@ -25,14 +25,15 @@
 
 	<ItemGroup>
 		<PackageReference Include="Bogus" Version="34.0.2" />
-		<PackageReference Include="LVD.Stakhanovise.NET.Logging.Log4NetLogging" Version="1.0.4" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
 
-		<PackageReference Include="LVD.Stakhanovise.NET" Version="1.0.3" />
-		<PackageReference Include="LVD.Stakhanovise.NET.Producer" Version="1.0.4" />
-		<PackageReference Include="LVD.Stakhanovise.NET.NetCoreConfigurationExtensionsBindings" Version="1.0.3" />
+		<PackageReference Include="LVD.Stakhanovise.NET" Version="1.0.5" />
+		<PackageReference Include="LVD.Stakhanovise.NET.Interfaces" Version="1.0.5" />
+		<PackageReference Include="LVD.Stakhanovise.NET.Producer" Version="1.0.5" />
+		<PackageReference Include="LVD.Stakhanovise.NET.NetCoreConfigurationExtensionsBindings" Version="1.0.5" />
+		<PackageReference Include="LVD.Stakhanovise.NET.Logging.Log4NetLogging" Version="1.0.5" />
 	</ItemGroup>
 </Project>
diff --git a/LVD.Stakhanovise.NET/Properties/launchSettings.json b/LVD.Stakhanovise.NET/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "LVD.Stakhanovise.NET": {
+      "commandName": "Project"
+    }
+  }
+}