remove opaque ObjectFactory nonsense in favour of ProjectPathResolver…

…Factory
SMI · Oct 10, 2024 · 9e318f2 · 9e318f2
1 parent 20547c5
commit 9e318f2
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/data/microserviceConfigs/default.yaml b/data/microserviceConfigs/default.yaml
@@ -77,7 +77,7 @@ CohortExtractorOptions:
 
   AuditorType: "SmiServices.Microservices.CohortExtractor.Audit.NullAuditExtractions"
   RequestFulfillerType: "SmiServices.Microservices.CohortExtractor.RequestFulfillers.FromCataloguesExtractionRequestFulfiller"
-  ProjectPathResolverType: "SmiServices.Microservices.CohortExtractor.ProjectPathResolvers.StudySeriesSOPProjectPathResolver"
+  ProjectPathResolverType: "StudySeriesSOPProjectPathResolver"
   ExtractAnonRoutingKey: anon
   ExtractIdentRoutingKey: ident
   # Writes (Producer) to this exchange

diff --git a/docs/config.yaml b/docs/config.yaml
@@ -77,7 +77,7 @@ CohortExtractorOptions:
 
   AuditorType: "Microservices.CohortExtractor.Audit.NullAuditExtractions"
   RequestFulfillerType: "Microservices.CohortExtractor.Execution.RequestFulfillers.FromCataloguesExtractionRequestFulfiller"
-  ProjectPathResolverType: "Microservices.CohortExtractor.Execution.ProjectPathResolvers.StudySeriesSOPProjectPathResolver"
+  ProjectPathResolverType: "StudySeriesSOPProjectPathResolver"
   ExtractAnonRoutingKey: anon
   ExtractIdentRoutingKey: ident
   # Writes (Producer) to this exchange

diff --git a/src/SmiServices/Microservices/CohortExtractor/CohortExtractorHost.cs b/src/SmiServices/Microservices/CohortExtractor/CohortExtractorHost.cs
@@ -162,8 +162,7 @@ private void InitializeExtractionSources(IRDMPPlatformRepositoryServiceLocator r
 
             _pathResolver = string.IsNullOrWhiteSpace(_consumerOptions.ProjectPathResolverType)
                 ? new StudySeriesSOPProjectPathResolver(_fileSystem)
-                : ObjectFactory.CreateInstance<IProjectPathResolver>(
-                    _consumerOptions.ProjectPathResolverType, typeof(IProjectPathResolver).Assembly, repositoryLocator);
+                : ProjectPathResolverFactory.Create(_consumerOptions.ProjectPathResolverType, _fileSystem);
         }
     }
 }
diff --git a/...Services/Microservices/CohortExtractor/ProjectPathResolvers/ProjectPathResolverFactory.cs b/...Services/Microservices/CohortExtractor/ProjectPathResolvers/ProjectPathResolverFactory.cs
@@ -0,0 +1,17 @@
+using System;
+using System.IO.Abstractions;
+
+namespace SmiServices.Microservices.CohortExtractor.ProjectPathResolvers;
+internal class ProjectPathResolverFactory
+{
+    public static IProjectPathResolver Create(string projectPathResolverType, IFileSystem fileSystem)
+    {
+        return projectPathResolverType switch
+        {
+            "StudySeriesSOPProjectPathResolver" => new StudySeriesSOPProjectPathResolver(fileSystem),
+            "NoSuffixProjectPathResolver" => new NoSuffixProjectPathResolver(fileSystem),
+            "StudySeriesOriginalFilenameProjectPathResolver" => new StudySeriesOriginalFilenameProjectPathResolver(fileSystem),
+            _ => throw new NotImplementedException($"No case for IProjectPathResolver type '{projectPathResolverType}'"),
+        };
+    }
+}
diff --git a/...s/SmiServices.UnitTests/Microservices/CohortExtractor/NoSuffixProjectPathResolverTests.cs b/...s/SmiServices.UnitTests/Microservices/CohortExtractor/NoSuffixProjectPathResolverTests.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using SmiServices.Common.Helpers;
 using SmiServices.Common.Messages.Extraction;
 using SmiServices.Microservices.CohortExtractor.ProjectPathResolvers;
 using SmiServices.Microservices.CohortExtractor.RequestFulfillers;
@@ -73,12 +72,5 @@ public void GetOutputPath_Extensions(string expectedOutput, string inputFile)
 
             Assert.That(actualPath, Is.EqualTo(expectedPath));
         }
-
-        [Test]
-        public void CanBeConstructedByReflection()
-        {
-            var instance = new MicroserviceObjectFactory().CreateInstance<IProjectPathResolver>("SmiServices.Microservices.CohortExtractor.ProjectPathResolvers.NoSuffixProjectPathResolver", typeof(IProjectPathResolver).Assembly, _fileSystem);
-            Assert.That(instance, Is.InstanceOf<NoSuffixProjectPathResolver>());
-        }
     }
 }
diff --git a/tests/SmiServices.UnitTests/default.yaml b/tests/SmiServices.UnitTests/default.yaml
@@ -77,7 +77,7 @@ CohortExtractorOptions:
 
   AuditorType: "SmiServices.Microservices.CohortExtractor.Audit.NullAuditExtractions"
   RequestFulfillerType: "SmiServices.Microservices.CohortExtractor.RequestFulfillers.FromCataloguesExtractionRequestFulfiller"
-  ProjectPathResolverType: "SmiServices.Microservices.CohortExtractor.ProjectPathResolvers.StudySeriesSOPProjectPathResolver"
+  ProjectPathResolverType: "StudySeriesSOPProjectPathResolver"
   ExtractAnonRoutingKey: anon
   ExtractIdentRoutingKey: ident
   # Writes (Producer) to this exchange