Skip to content

Commit 2ab1b62

Browse files
GarrettBeattyGarrettBeatty
committed
cleanup
1 parent 4a9aba1 commit 2ab1b62

File tree

2 files changed

+15
-28
lines changed

2 files changed

+15
-28
lines changed

‎sdk/src/Services/S3/Custom/Transfer/Internal/BufferedMultipartStream.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ internal class BufferedMultipartStream : Stream
3939
{
4040
private readonly IDownloadManager _downloadCoordinator;
4141
private readonly IPartBufferManager _partBufferManager;
42-
private readonly BufferedDownloadConfiguration _config;
4342

4443
private bool _initialized = false;
4544
private bool _disposed = false;
@@ -59,12 +58,10 @@ internal class BufferedMultipartStream : Stream
5958
/// </summary>
6059
/// <param name="downloadCoordinator"><see cref="IDownloadManager"/> that coordinates download discovery and orchestration.</param>
6160
/// <param name="partBufferManager"><see cref="IPartBufferManager"/> that manages part buffer lifecycle and synchronization.</param>
62-
/// <param name="config"><see cref="BufferedDownloadConfiguration"/> with settings for the stream.</param>
63-
public BufferedMultipartStream(IDownloadManager downloadCoordinator, IPartBufferManager partBufferManager, BufferedDownloadConfiguration config)
61+
public BufferedMultipartStream(IDownloadManager downloadCoordinator, IPartBufferManager partBufferManager)
6462
{
6563
_downloadCoordinator = downloadCoordinator ?? throw new ArgumentNullException(nameof(downloadCoordinator));
6664
_partBufferManager = partBufferManager ?? throw new ArgumentNullException(nameof(partBufferManager));
67-
_config = config ?? throw new ArgumentNullException(nameof(config));
6865
}
6966

7067
/// <summary>
@@ -96,7 +93,7 @@ public static BufferedMultipartStream Create(IAmazonS3 s3Client, TransferUtility
9693
var dataHandler = new BufferedPartDataHandler(partBufferManager, config);
9794
var downloadCoordinator = new MultipartDownloadManager(s3Client, request, config, dataHandler, requestEventHandler);
9895

99-
return new BufferedMultipartStream(downloadCoordinator, partBufferManager, config);
96+
return new BufferedMultipartStream(downloadCoordinator, partBufferManager);
10097
}
10198

10299
/// <summary>

‎sdk/test/Services/S3/UnitTests/Custom/BufferedMultipartStreamTests.cs‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void Setup()
5353

5454
private BufferedMultipartStream CreateStream()
5555
{
56-
return new BufferedMultipartStream(_mockCoordinator.Object, _mockBufferManager.Object, _config);
56+
return new BufferedMultipartStream(_mockCoordinator.Object, _mockBufferManager.Object);
5757
}
5858

5959
private async Task<BufferedMultipartStream> CreateInitializedStreamAsync(
@@ -99,20 +99,18 @@ public void Constructor_WithValidDependencies_CreatesStream()
9999
}
100100

101101
[DataTestMethod]
102-
[DataRow(null, "bufferManager", "config", DisplayName = "Null Coordinator")]
103-
[DataRow("coordinator", null, "config", DisplayName = "Null Buffer Manager")]
104-
[DataRow("coordinator", "bufferManager", null, DisplayName = "Null Config")]
102+
[DataRow(null, "bufferManager", DisplayName = "Null Coordinator")]
103+
[DataRow("coordinator", null, DisplayName = "Null Buffer Manager")]
105104
[ExpectedException(typeof(ArgumentNullException))]
106105
public void Constructor_WithNullParameter_ThrowsArgumentNullException(
107-
string coordinatorKey, string bufferManagerKey, string configKey)
106+
string coordinatorKey, string bufferManagerKey)
108107
{
109108
// Arrange
110109
var coordinator = coordinatorKey != null ? _mockCoordinator.Object : null;
111110
var bufferManager = bufferManagerKey != null ? _mockBufferManager.Object : null;
112-
var config = configKey != null ? _config : null;
113111

114112
// Act
115-
var stream = new BufferedMultipartStream(coordinator, bufferManager, config);
113+
var stream = new BufferedMultipartStream(coordinator, bufferManager);
116114
}
117115

118116
#endregion
@@ -173,8 +171,7 @@ public async Task InitializeAsync_SinglePart_UsesSinglePartHandler()
173171
.ReturnsAsync(discoveryResult);
174172

175173
var mockBufferManager = new Mock<IPartBufferManager>();
176-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
177-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
174+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
178175

179176
// Act
180177
await stream.InitializeAsync(CancellationToken.None);
@@ -203,8 +200,7 @@ public async Task InitializeAsync_SinglePart_CallsStartDownloads()
203200
.Returns(Task.CompletedTask);
204201

205202
var mockBufferManager = new Mock<IPartBufferManager>();
206-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
207-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
203+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
208204

209205
// Act
210206
await stream.InitializeAsync(CancellationToken.None);
@@ -237,8 +233,7 @@ public async Task InitializeAsync_Multipart_UsesMultipartHandler()
237233
.Returns(Task.CompletedTask);
238234

239235
var mockBufferManager = new Mock<IPartBufferManager>();
240-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
241-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
236+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
242237

243238
// Act
244239
await stream.InitializeAsync(CancellationToken.None);
@@ -265,8 +260,7 @@ public async Task InitializeAsync_Multipart_StartsDownloads()
265260
.Returns(Task.CompletedTask);
266261

267262
var mockBufferManager = new Mock<IPartBufferManager>();
268-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
269-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
263+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
270264

271265
// Act
272266
await stream.InitializeAsync(CancellationToken.None);
@@ -297,8 +291,7 @@ public async Task InitializeAsync_SetsDiscoveryResult()
297291
.ReturnsAsync(discoveryResult);
298292

299293
var mockBufferManager = new Mock<IPartBufferManager>();
300-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
301-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
294+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
302295

303296
// Act
304297
await stream.InitializeAsync(CancellationToken.None);
@@ -326,8 +319,7 @@ public async Task InitializeAsync_CalledTwice_ThrowsInvalidOperationException()
326319
.ReturnsAsync(discoveryResult);
327320

328321
var mockBufferManager = new Mock<IPartBufferManager>();
329-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
330-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
322+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
331323

332324
// Act
333325
await stream.InitializeAsync(CancellationToken.None);
@@ -345,8 +337,7 @@ public async Task ReadAsync_BeforeInitialize_ThrowsInvalidOperationException()
345337
// Arrange
346338
var mockCoordinator = new Mock<IDownloadManager>();
347339
var mockBufferManager = new Mock<IPartBufferManager>();
348-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
349-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
340+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
350341

351342
var buffer = new byte[1024];
352343

@@ -361,8 +352,7 @@ public async Task ReadAsync_AfterDispose_ThrowsObjectDisposedException()
361352
// Arrange
362353
var mockCoordinator = new Mock<IDownloadManager>();
363354
var mockBufferManager = new Mock<IPartBufferManager>();
364-
var config = MultipartDownloadTestHelpers.CreateBufferedDownloadConfiguration();
365-
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object, config);
355+
var stream = new BufferedMultipartStream(mockCoordinator.Object, mockBufferManager.Object);
366356

367357
stream.Dispose();
368358
var buffer = new byte[1024];

0 commit comments

Comments
 (0)