Skip to content

Commit a4dbf77

Browse files
Rob-HagueRob-Hague
authored
Replace Array<T>.Empty with Array.Empty<T>() (#1137)
1 parent 27976bb commit a4dbf77

16 files changed

+28
-37
lines changed

‎src/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Init()
2222
[TestMethod]
2323
public void ShouldReturnSecondWhenFirstIsEmpty()
2424
{
25-
var first = Array<byte>.Empty;
25+
var first = Array.Empty<byte>();
2626
var second = CreateBuffer(16);
2727

2828
var actual = Extensions.Concat(first, second);
@@ -47,7 +47,7 @@ public void ShouldReturnSecondWhenFirstIsNull()
4747
public void ShouldReturnFirstWhenSecondIsEmpty()
4848
{
4949
var first = CreateBuffer(16);
50-
var second = Array<byte>.Empty;
50+
var second = Array.Empty<byte>();
5151

5252
var actual = Extensions.Concat(first, second);
5353

@@ -101,7 +101,7 @@ public void ShouldConcatSecondToFirstWhenBothAreNotEmpty()
101101
[TestCategory("Performance")]
102102
public void Performance_LargeArray_FirstEmpty()
103103
{
104-
var first = Array<byte>.Empty;
104+
var first = Array.Empty<byte>();
105105
var second = CreateBuffer(50000);
106106
const int runs = 10000;
107107

@@ -115,7 +115,7 @@ public void Performance_LargeArray_FirstEmpty()
115115
public void Performance_LargeArray_SecondEmpty()
116116
{
117117
var first = CreateBuffer(50000);
118-
var second = Array<byte>.Empty;
118+
var second = Array.Empty<byte>();
119119
const int runs = 10000;
120120

121121
Performance(first, second, runs);

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public async Task ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqual
138138
public async Task ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
139139
{
140140
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
141-
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default)).ReturnsAsync(Array<byte>.Empty);
141+
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default)).ReturnsAsync(Array.Empty<byte>());
142142

143143
var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
144144

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public async Task SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndR
118118
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
119119
SftpSessionMock.InSequence(MockSequence)
120120
.Setup(p => p.RequestReadAsync(_handle, (ulong) _actual, _readBufferSize, default))
121-
.ReturnsAsync(Array<byte>.Empty);
121+
.ReturnsAsync(Array.Empty<byte>());
122122

123123
var buffer = _originalBuffer.Copy();
124124
var actual = await _target.ReadAsync(buffer, 0, buffer.Length);
@@ -136,7 +136,7 @@ public async Task SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndN
136136
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
137137
SftpSessionMock.InSequence(MockSequence)
138138
.Setup(p => p.RequestReadAsync(_handle, (ulong)_actual, _readBufferSize, default))
139-
.ReturnsAsync(Array<byte>.Empty);
139+
.ReturnsAsync(Array.Empty<byte>());
140140
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
141141

142142
await _target.ReadAsync(new byte[10], 0, 10);

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public async Task SubsequentReadShouldReturnAllRemaningBytesFromReadBufferWhenCo
124124
public async Task SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
125125
{
126126
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
127-
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData.Length), _readBufferSize, default)).ReturnsAsync(Array<byte>.Empty);
127+
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestReadAsync(_handle, (ulong)(_serverData.Length), _readBufferSize, default)).ReturnsAsync(Array.Empty<byte>());
128128

129129
var buffer = new byte[_numberOfBytesToWriteToReadBuffer + 1];
130130

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void ReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsEqualToNumb
136136
public void ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
137137
{
138138
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
139-
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array<byte>.Empty);
139+
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize)).Returns(Array.Empty<byte>());
140140

141141
var numberOfBytesRemainingInReadBuffer = _serverData1Length + _serverData2Length - _numberOfBytesToRead;
142142

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndReturnZ
116116
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
117117
SftpSessionMock.InSequence(MockSequence)
118118
.Setup(p => p.RequestRead(_handle, (ulong) _actual, _readBufferSize))
119-
.Returns(Array<byte>.Empty);
119+
.Returns(Array.Empty<byte>());
120120

121121
var buffer = _originalBuffer.Copy();
122122
var actual = _target.Read(buffer, 0, buffer.Length);
@@ -134,7 +134,7 @@ public void SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndNotUpda
134134
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
135135
SftpSessionMock.InSequence(MockSequence)
136136
.Setup(p => p.RequestRead(_handle, (ulong)_actual, _readBufferSize))
137-
.Returns(Array<byte>.Empty);
137+
.Returns(Array.Empty<byte>());
138138
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
139139

140140
_target.Read(new byte[10], 0, 10);

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Read_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public void SubsequentReadShouldReturnAllRemaningBytesFromReadBufferWhenCountIsE
122122
public void SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhenCountIsGreaterThanNumberOfRemainingBytesAndNewReadReturnsZeroBytes()
123123
{
124124
SftpSessionMock.InSequence(MockSequence).Setup(p => p.IsOpen).Returns(true);
125-
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize)).Returns(Array<byte>.Empty);
125+
SftpSessionMock.InSequence(MockSequence).Setup(p => p.RequestRead(_handle, (ulong)(_serverData.Length), _readBufferSize)).Returns(Array.Empty<byte>());
126126

127127
var buffer = new byte[_numberOfBytesToWriteToReadBuffer + 1];
128128

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInReadBuffer_NewLengthLessThanPosition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void ReadShouldStartFromEndOfStream()
137137
SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
138138
SftpSessionMock.InSequence(_sequence)
139139
.Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
140-
.Returns(Array<byte>.Empty);
140+
.Returns(Array.Empty<byte>());
141141

142142
var byteRead = _sftpFileStream.ReadByte();
143143

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_DataInWriteBuffer_NewLengthLessThanPosition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void ReadShouldStartFromEndOfStream()
160160
SftpSessionMock.InSequence(_sequence).Setup(p => p.IsOpen).Returns(true);
161161
SftpSessionMock.InSequence(_sequence)
162162
.Setup(p => p.RequestRead(_handle, (uint) _length, _readBufferSize))
163-
.Returns(Array<byte>.Empty);
163+
.Returns(Array.Empty<byte>());
164164

165165
var byteRead = _sftpFileStream.ReadByte();
166166

‎src/Renci.SshNet/Common/Array.cs

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/Renci.SshNet/Common/Extensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static byte[] Take(this byte[] value, int offset, int count)
180180

181181
if (count == 0)
182182
{
183-
return Array<byte>.Empty;
183+
return Array.Empty<byte>();
184184
}
185185

186186
if (offset == 0 && value.Length == count)
@@ -215,7 +215,7 @@ public static byte[] Take(this byte[] value, int count)
215215

216216
if (count == 0)
217217
{
218-
return Array<byte>.Empty;
218+
return Array.Empty<byte>();
219219
}
220220

221221
if (value.Length == count)

‎src/Renci.SshNet/Connection/Socks4Connector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private static byte[] GetProxyUserBytes(string proxyUser)
124124
{
125125
if (proxyUser == null)
126126
{
127-
return Array<byte>.Empty;
127+
return Array.Empty<byte>();
128128
}
129129

130130
return Encoding.ASCII.GetBytes(proxyUser);

‎src/Renci.SshNet/Messages/Authentication/RequestMessageKeyboardInteractive.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Renci.SshNet.Common;
1+
using System;
22

33
namespace Renci.SshNet.Messages.Authentication
44
{
@@ -44,8 +44,8 @@ protected override int BufferCapacity
4444
public RequestMessageKeyboardInteractive(ServiceName serviceName, string username)
4545
: base(serviceName, username, "keyboard-interactive")
4646
{
47-
Language = Array<byte>.Empty;
48-
SubMethods = Array<byte>.Empty;
47+
Language = Array.Empty<byte>();
48+
SubMethods = Array.Empty<byte>();
4949
}
5050

5151
/// <summary>

‎src/Renci.SshNet/Messages/Transport/IgnoreMessage.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Globalization;
33
using Renci.SshNet.Abstractions;
4-
using Renci.SshNet.Common;
54

65
namespace Renci.SshNet.Messages.Transport
76
{
@@ -23,7 +22,7 @@ public class IgnoreMessage : Message
2322
/// </summary>
2423
public IgnoreMessage()
2524
{
26-
Data = Array<byte>.Empty;
25+
Data = Array.Empty<byte>();
2726
}
2827

2928
/// <summary>
@@ -71,7 +70,7 @@ protected override void LoadData()
7170
if (dataLength > (DataStream.Length - DataStream.Position))
7271
{
7372
DiagnosticAbstraction.Log("SSH_MSG_IGNORE: Length exceeds data bytes, data ignored.");
74-
Data = Array<byte>.Empty;
73+
Data = Array.Empty<byte>();
7574
}
7675
else
7776
{

‎src/Renci.SshNet/Sftp/Responses/SftpNameResponse.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Text;
34

4-
using Renci.SshNet.Common;
5-
65
namespace Renci.SshNet.Sftp.Responses
76
{
87
internal sealed class SftpNameResponse : SftpResponse
@@ -21,7 +20,7 @@ public override SftpMessageTypes SftpMessageType
2120
public SftpNameResponse(uint protocolVersion, Encoding encoding)
2221
: base(protocolVersion)
2322
{
24-
Files = Array<KeyValuePair<string, SftpFileAttributes>>.Empty;
23+
Files = Array.Empty<KeyValuePair<string, SftpFileAttributes>>();
2524
Encoding = encoding;
2625
}
2726

‎src/Renci.SshNet/Sftp/SftpSession.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ public SftpReadAsyncResult BeginRead(byte[] handle, ulong offset, uint length, A
690690
}
691691
else
692692
{
693-
asyncResult.SetAsCompleted(Array<byte>.Empty, completedSynchronously: false);
693+
asyncResult.SetAsCompleted(Array.Empty<byte>(), completedSynchronously: false);
694694
}
695695
});
696696
SendRequest(request);
@@ -767,7 +767,7 @@ public byte[] RequestRead(byte[] handle, ulong offset, uint length)
767767
}
768768
else
769769
{
770-
data = Array<byte>.Empty;
770+
data = Array.Empty<byte>();
771771
}
772772

773773
_ = wait.Set();
@@ -804,7 +804,7 @@ public async Task<byte[]> RequestReadAsync(byte[] handle, ulong offset, uint len
804804
{
805805
if (response.StatusCode == StatusCodes.Eof)
806806
{
807-
_ = tcs.TrySetResult(Array<byte>.Empty);
807+
_ = tcs.TrySetResult(Array.Empty<byte>());
808808
}
809809
else
810810
{

0 commit comments

Comments
 (0)