[BREAKING]: Removed unused serializer parameter from GetEventBatch File Storage Extensions

Author: niemyjski

src/Exceptionless/Extensions/FileStorageExtensions.cs

@@ -38,14 +38,14 @@ public static bool IncrementAttempts(this IObjectStorage storage, ObjectInfo inf
                 throw new ArgumentException($"Path \"{info.Path}\" must contain the number of attempts.");
 
             version++;
-            string newpath = String.Join(".", parts[0], version, parts[2]);
+            string newPath = String.Join(".", parts[0], version, parts[2]);
             if (parts.Length == 4)
-                newpath += "." + parts[3];
+                newPath += "." + parts[3];
 
             string originalPath = info.Path;
-            info.Path = newpath;
+            info.Path = newPath;
 
-            return storage.RenameObject(originalPath, newpath);
+            return storage.RenameObject(originalPath, newPath);
         }
 
         public static int GetAttempts(this ObjectInfo info) {
@@ -94,7 +94,7 @@ public static void ReleaseStaleLocks(this IObjectStorage storage, string queueNa
                 storage.ReleaseFile(file);
         }
 
-        public static IList<Tuple<ObjectInfo, Event>> GetEventBatch(this IObjectStorage storage, string queueName, IJsonSerializer serializer, int batchSize = 50, DateTime? maxCreatedDate = null) {
+        public static IList<Tuple<ObjectInfo, Event>> GetEventBatch(this IObjectStorage storage, string queueName, int batchSize = 50, DateTime? maxCreatedDate = null) {
             var events = new List<Tuple<ObjectInfo, Event>>();
 
             lock (_lockObject) {

src/Exceptionless/Queue/DefaultEventQueue.cs

@@ -57,7 +57,7 @@ public async Task ProcessAsync() {
 
                 DateTime maxCreatedDate = DateTime.Now;
                 int batchSize = _config.SubmissionBatchSize;
-                var batch = _storage.GetEventBatch(queueName, _serializer, batchSize, maxCreatedDate);
+                var batch = _storage.GetEventBatch(queueName, batchSize, maxCreatedDate);
                 while (batch.Any()) {
                     bool deleteBatch = true;
 
@@ -118,7 +118,7 @@ public async Task ProcessAsync() {
                     if (!deleteBatch || IsQueueProcessingSuspended)
                         break;
 
-                    batch = _storage.GetEventBatch(queueName, _serializer, batchSize, maxCreatedDate);
+                    batch = _storage.GetEventBatch(queueName, batchSize, maxCreatedDate);
                 }
             } catch (Exception ex) {
                 _log.Error(typeof(DefaultEventQueue), ex, String.Concat("An error occurred processing the queue: ", ex.Message));

test/Exceptionless.Tests/Storage/FileStorageTestsBase.cs

@@ -97,14 +97,14 @@ public void CanManageQueue() {
             Assert.True(storage.GetQueueFiles(queueName).All(f => f.Path.EndsWith("0.json.x")));
             Assert.True(storage.ReleaseFile(storage.GetObjectList().FirstOrDefault()));
 
-            var batch = storage.GetEventBatch(queueName, serializer);
+            var batch = storage.GetEventBatch(queueName);
             Assert.Equal(1, batch.Count);
 
             Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("1.json.x")));
             Assert.Single(storage.GetObjectList());
 
             Assert.Empty(storage.GetQueueFiles(queueName));
-            Assert.Empty(storage.GetEventBatch(queueName, serializer));
+            Assert.Empty(storage.GetEventBatch(queueName));
 
             Assert.False(storage.LockFile(storage.GetObjectList().FirstOrDefault()));
 
@@ -126,7 +126,7 @@ public void CanManageQueue() {
             storage.ReleaseStaleLocks(queueName, TimeSpan.Zero);
             Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("3.json")));
 
-            batch = storage.GetEventBatch(queueName, serializer);
+            batch = storage.GetEventBatch(queueName);
             Assert.Equal(1, batch.Count);
             Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("4.json.x")));
             storage.DeleteBatch(batch);
@@ -171,7 +171,7 @@ public void CanConcurrentlyManageFiles() {
             var working = new ConcurrentDictionary<string, object>();
 
             Parallel.For(0, 50, i => {
-                var fileBatch = storage.GetEventBatch(queueName, serializer, 2);
+                var fileBatch = storage.GetEventBatch(queueName, 2);
                 foreach (var f in fileBatch) {
                     if (working.ContainsKey(f.Item1.Path))
                         Debug.WriteLine(f.Item1.Path);