Apply remaining review suggestions

nexus-main · Jul 25, 2024 · 8155d90 · 8155d90
1 parent 5427b04
commit 8155d90
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/Nexus/Extensibility/DataSource/DataSourceController.cs b/src/Nexus/Extensibility/DataSource/DataSourceController.cs
@@ -417,9 +417,7 @@ private async Task ReadOriginalAsync(
 
             try
             {
-                var pipelinePosition = 0;
-
-                foreach (var dataSource in _dataSources)
+                for (int pipelinePosition = 0; pipelinePosition < _dataSources.Length; pipelinePosition++)
                 {
                     var currentReadRequests = readRequests
                         .Where(request =>
@@ -428,15 +426,13 @@ request.CatalogItem.Resource.Properties is null ||
                         )
                         .ToArray();
 
-                    await dataSource.ReadAsync(
+                    await _dataSources[pipelinePosition].ReadAsync(
                         begin,
                         end,
                         currentReadRequests,
                         readDataHandler,
                         progress,
                         cancellationToken);
-
-                    pipelinePosition++;
                 }
             }
             catch (OutOfMemoryException)
@@ -680,7 +676,6 @@ private async Task ReadResampledAsync(
         try
         {
             /* load and process data from source */
-            var elementSize = baseItem.Representation.ElementSize;
             var sourceSamplePeriod = baseSamplePeriod;
             var targetSamplePeriod = samplePeriod;
 

diff --git a/src/Nexus/Extensions/Sources/Sample.cs b/src/Nexus/Extensions/Sources/Sample.cs
@@ -13,7 +13,8 @@ namespace Nexus.Sources;
     "https://github.com/nexus-main/nexus/blob/master/src/Nexus/Extensions/Sources/Sample.cs")]
 internal class Sample : IDataSource
 {
-    public static Guid PipelineId = new("c2c724ab-9002-4879-9cd9-2147844bee96");
+    public static readonly Guid PipelineId = new("c2c724ab-9002-4879-9cd9-2147844bee96");
+
     private static readonly double[] DATA =
     [
         6.5,
@@ -146,7 +147,7 @@ public async Task ReadAsync(
     {
         var tasks = requests.Select(request =>
         {
-            var (originalResourceName, catalogItem, data, status) = request;
+            var (_, catalogItem, data, status) = request;
 
             return Task.Run(() =>
             {

diff --git a/src/Nexus/Services/DataControllerService.cs b/src/Nexus/Services/DataControllerService.cs
@@ -45,8 +45,6 @@ public async Task<IDataSourceController> GetDataSourceControllerAsync(
         DataSourcePipeline pipeline,
         CancellationToken cancellationToken)
     {
-        var logger = _loggerFactory.CreateLogger<DataSourceController>();
-
         var dataSources = pipeline.Registrations
             .Select(registration => _extensionHive.GetInstance<IDataSource>(registration.Type))
             .ToArray();
@@ -60,12 +58,13 @@ public async Task<IDataSourceController> GetDataSourceControllerAsync(
         var controller = new DataSourceController(
             dataSources,
             pipeline.Registrations,
-            systemConfiguration: clonedSystemConfiguration,
-            requestConfiguration: requestConfiguration,
+            clonedSystemConfiguration,
+            requestConfiguration,
             _processingService,
             _cacheService,
             _dataOptions,
-            logger);
+            _loggerFactory.CreateLogger<DataSourceController>()
+        );
 
         var catalogCache = _appState.CatalogState.Cache.GetOrAdd(
             pipeline,

diff --git a/tests/Nexus.Tests/Services/DataControllerServiceTests.cs b/tests/Nexus.Tests/Services/DataControllerServiceTests.cs
@@ -123,12 +123,17 @@ public async Task CanCreateAndInitializeDataWriterController()
             Options.Create(new DataOptions()),
             loggerFactory);
 
-        var actual = await dataControllerService.GetDataWriterControllerAsync(
-            resourceLocator,
-            exportParameters,
-            CancellationToken.None);
+        async Task action()
+        {
+            var _ = await dataControllerService.GetDataWriterControllerAsync(
+                resourceLocator,
+                exportParameters,
+                CancellationToken.None);
+        };
+
+        var actual = await Record.ExceptionAsync(action);
 
         // Assert
-        /* nothing to assert */
+        Assert.NotNull(actual);
     }
 }