fix: Correctly pass options to object saver (#387)

* Correctly pass options to object saver

* formatting

src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs

@@ -20,10 +20,10 @@ public sealed class ObjectSaver(
   ISqLiteJsonCacheManager sqLiteJsonCacheManager,
   IServerObjectManager serverObjectManager,
   ILogger<ObjectSaver> logger,
-  CancellationToken cancellationToken,
+  SerializeProcessOptions options,
+  CancellationToken cancellationToken
 #pragma warning disable CS9107
 #pragma warning disable CA2254
-  SerializeProcessOptions? options = null
 ) : ChannelSaver<BaseItem>, IObjectSaver
 #pragma warning restore CA2254
 #pragma warning restore CS9107

src/Speckle.Sdk/Serialisation/V2/Send/SerializeProcess.cs

@@ -37,8 +37,8 @@ public sealed class SerializeProcess(
   IBaseChildFinder baseChildFinder,
   IBaseSerializer baseSerializer,
   ILoggerFactory loggerFactory,
-  CancellationToken cancellationToken,
-  SerializeProcessOptions? options = null
+  SerializeProcessOptions options,
+  CancellationToken cancellationToken
 ) : ISerializeProcess
 {
   private static readonly Dictionary<Id, NodeInfo> EMPTY_CLOSURES = new();
@@ -64,7 +64,6 @@ public sealed class SerializeProcess(
     ThreadPriority.BelowNormal,
     Environment.ProcessorCount * 2
   );
-  private readonly SerializeProcessOptions _options = options ?? new();
 
   private readonly Pool<Dictionary<Id, NodeInfo>> _currentClosurePool = Pools.CreateDictionaryPool<Id, NodeInfo>();
   private readonly Pool<ConcurrentDictionary<Id, NodeInfo>> _childClosurePool = Pools.CreateConcurrentDictionaryPool<
@@ -113,13 +112,13 @@ public sealed class SerializeProcess(
     try
     {
       var channelTask = objectSaver.Start(
-        options?.MaxParallelism,
-        options?.MaxHttpSendBatchSize,
-        options?.MaxCacheBatchSize,
+        options.MaxParallelism,
+        options.MaxHttpSendBatchSize,
+        options.MaxCacheBatchSize,
         _processSource.Token
       );
       var findTotalObjectsTask = Task.CompletedTask;
-      if (!_options.SkipFindTotalObjects)
+      if (!options.SkipFindTotalObjects)
       {
         ThrowIfFailed();
         findTotalObjectsTask = Task.Factory.StartNew(
@@ -249,7 +248,7 @@ public sealed class SerializeProcess(
         return EMPTY_CLOSURES;
       }
 
-      var items = baseSerializer.Serialise(obj, childClosures, _options.SkipCacheRead, _processSource.Token);
+      var items = baseSerializer.Serialise(obj, childClosures, options.SkipCacheRead, _processSource.Token);
 
       if (IsCancelled())
       {

src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs

@@ -44,13 +44,14 @@ public class SerializeProcessFactory(
         sqLiteJsonCacheManager,
         serverObjectManager,
         loggerFactory.CreateLogger<ObjectSaver>(),
+        options ?? new SerializeProcessOptions(),
         cancellationToken
       ),
       baseChildFinder,
       new BaseSerializer(sqLiteJsonCacheManager, objectSerializerFactory),
       loggerFactory,
-      cancellationToken,
-      options
+      options ?? new SerializeProcessOptions(),
+      cancellationToken
     );
 
   public ISerializeProcess CreateSerializeProcess(

tests/Speckle.Sdk.Serialization.Tests/DataObjectTests.cs

@@ -41,7 +41,7 @@ public class DataObjectTests
       new DummyServerObjectManager(),
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true)
+      new SerializeProcessOptions(false, false, true, true)
     );
     await serializeProcess.Serialize(x);
     await VerifyJson(json.Single().Value.Value).UseParameters(type);

tests/Speckle.Sdk.Serialization.Tests/DetachedTests.cs

@@ -41,7 +41,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
     await serializeProcess.Serialize(@base);
 
@@ -123,7 +123,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -150,7 +150,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -172,7 +172,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -239,7 +239,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
 
     var results = await serializeProcess.Serialize(@base);
@@ -272,7 +272,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
     var results = await serializeProcess.Serialize(@base);
     await VerifyJsonDictionary(objects);

tests/Speckle.Sdk.Tests.Unit/Serialisation/SerializeProcessRecordExceptionTests.cs

@@ -31,6 +31,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new Exception("Test error");
@@ -67,6 +68,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new OperationCanceledException();
@@ -98,6 +100,7 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
+      new(),
       cts.Token
     );
     var ex = new AggregateException(new OperationCanceledException());