Skip to content

Commit 1388896

Browse files
Fix non-todo sonar issues
1 parent 7330708 commit 1388896

13 files changed

Lines changed: 31 additions & 40 deletions

File tree

API/Protocol/IResponseBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace GenHTTP.Api.Protocol;
55
public interface IResponseBuilder : IBuilder<IResponse>
66
{
77

8-
IResponseBuilder Status(ResponseStatus code);
8+
IResponseBuilder Status(ResponseStatus status);
99

1010
IResponseBuilder Connection(Connection mode);
1111

Engine/Internal/Context/ClientContext.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ internal sealed class ClientContext
3131

3232
private PipeWriter? _writer;
3333

34-
private Request _request = new();
34+
private readonly Request _request = new();
3535

36-
private ResponseHandler _responseHandler;
36+
private readonly ResponseHandler _responseHandler;
3737

38-
private ClientHandler _clientHandler;
38+
private readonly ClientHandler _clientHandler;
3939

4040
internal IServer Server => _server ?? throw new InvalidOperationException("Handler has not been initialized");
4141

Engine/Shared/Types/Body/ChunkedBodyStream.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal sealed class ChunkedBodyStream : Stream, IDrainableStream
1515
{
1616
private readonly PipeReader _reader;
1717

18-
private GlyphParser _parser;
18+
private readonly GlyphParser _parser = new();
1919

2020
private bool _completed;
2121

@@ -56,47 +56,47 @@ public ChunkedBodyStream(PipeReader reader)
5656
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
5757
=> ReadAsync(buffer.AsMemory(offset, count), cancellationToken).AsTask();
5858

59-
public override async ValueTask<int> ReadAsync(Memory<byte> destination, CancellationToken cancellationToken = default)
59+
public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
6060
{
61-
if (_completed || destination.IsEmpty)
61+
if (_completed || buffer.IsEmpty)
6262
{
6363
return 0;
6464
}
6565

6666
// Return buffered overflow from a previous large chunk first.
6767
if (_overflowLength > 0)
6868
{
69-
return ConsumeOverflow(destination.Span);
69+
return ConsumeOverflow(buffer.Span);
7070
}
7171

7272
while (true)
7373
{
7474
var result = await _reader.ReadAsync(cancellationToken);
75-
var buffer = result.Buffer;
75+
var readBuffer = result.Buffer;
7676

7777
byte[]? rented = null;
7878
ReadOnlySpan<byte> span;
7979

80-
if (buffer.IsSingleSegment)
80+
if (readBuffer.IsSingleSegment)
8181
{
82-
span = buffer.First.Span;
82+
span = readBuffer.First.Span;
8383
}
8484
else
8585
{
8686
// Linearise the full multi-segment buffer so Glyph11 gets a contiguous view.
8787
// Glyph11 requires the complete chunk to be present before returning Chunk;
8888
// capping would cause perpetual NeedMoreData for chunks larger than the cap.
89-
var len = (int)buffer.Length;
89+
var len = (int)readBuffer.Length;
9090
rented = ArrayPool<byte>.Shared.Rent(len);
91-
buffer.CopyTo(rented);
91+
readBuffer.CopyTo(rented);
9292
span = rented.AsSpan(0, len);
9393
}
9494

9595
try
9696
{
9797
if (span.IsEmpty)
9898
{
99-
_reader.AdvanceTo(buffer.Start, buffer.End);
99+
_reader.AdvanceTo(readBuffer.Start, readBuffer.End);
100100

101101
if (result.IsCompleted)
102102
{
@@ -111,12 +111,12 @@ public override async ValueTask<int> ReadAsync(Memory<byte> destination, Cancell
111111
switch (chunkResult)
112112
{
113113
case ChunkResult.Completed:
114-
_reader.AdvanceTo(buffer.GetPosition(bytesConsumed));
114+
_reader.AdvanceTo(readBuffer.GetPosition(bytesConsumed));
115115
_completed = true;
116116
return 0;
117117

118118
case ChunkResult.NeedMoreData:
119-
_reader.AdvanceTo(buffer.Start, buffer.End);
119+
_reader.AdvanceTo(readBuffer.Start, readBuffer.End);
120120

121121
if (result.IsCompleted)
122122
{
@@ -127,10 +127,10 @@ public override async ValueTask<int> ReadAsync(Memory<byte> destination, Cancell
127127

128128
case ChunkResult.Chunk:
129129
var chunk = span.Slice(dataOffset, dataLength);
130-
var toCopy = Math.Min(destination.Length, dataLength);
130+
var toCopy = Math.Min(buffer.Length, dataLength);
131131

132132
// Copy to caller's buffer BEFORE advancing the pipe reader to keep span valid.
133-
chunk[..toCopy].CopyTo(destination.Span);
133+
chunk[..toCopy].CopyTo(buffer.Span);
134134

135135
if (toCopy < dataLength)
136136
{
@@ -141,7 +141,7 @@ public override async ValueTask<int> ReadAsync(Memory<byte> destination, Cancell
141141
_overflowLength = dataLength - toCopy;
142142
}
143143

144-
_reader.AdvanceTo(buffer.GetPosition(bytesConsumed));
144+
_reader.AdvanceTo(readBuffer.GetPosition(bytesConsumed));
145145
return toCopy;
146146
}
147147
}

Engine/Shared/Types/Body/LengthLimitedStream.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ public LengthLimitedStream(PipeReader reader, long contentLength)
3434
public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
3535
=> ReadAsync(buffer.AsMemory(offset, count), cancellationToken).AsTask();
3636

37-
public override async ValueTask<int> ReadAsync(Memory<byte> destination, CancellationToken cancellationToken = default)
37+
public override async ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
3838
{
3939
if (_bytesRemaining <= 0)
4040
{
4141
return 0;
4242
}
4343

4444
var result = await _reader.ReadAsync(cancellationToken);
45-
var buffer = result.Buffer;
45+
var readBuffer = result.Buffer;
4646

47-
var toRead = (int)Math.Min(Math.Min(destination.Length, _bytesRemaining), buffer.Length);
47+
var toRead = (int)Math.Min(Math.Min(buffer.Length, _bytesRemaining), readBuffer.Length);
4848

4949
if (toRead == 0)
5050
{
51-
_reader.AdvanceTo(buffer.Start, buffer.End);
51+
_reader.AdvanceTo(readBuffer.Start, readBuffer.End);
5252
return 0;
5353
}
5454

55-
buffer.Slice(0, toRead).CopyTo(destination.Span);
55+
readBuffer.Slice(0, toRead).CopyTo(buffer.Span);
5656

57-
_reader.AdvanceTo(buffer.GetPosition(toRead));
57+
_reader.AdvanceTo(readBuffer.GetPosition(toRead));
5858

5959
_bytesRemaining -= toRead;
6060
return toRead;

Engine/Shared/Types/Request.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Request()
8383

8484
#region Functionality
8585

86-
public IRequestBody? GetBody(HeaderAccess headerAccess)
86+
public IRequestBody? GetBody(HeaderAccess headerAccess = HeaderAccess.Retain)
8787
{
8888
if (_bodyLoaded)
8989
{

Modules/Archives/Tree/ArchivedTree.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ public sealed class ArchivedTree(ChangeTrackingResource source) : IResourceTree
2121

2222
public DateTime? Modified => source.Modified;
2323

24-
public async ValueTask<IResourceNode?> TryGetNodeAsync(PathSegment name)
24+
public async ValueTask<IResourceNode?> TryGetNodeAsync(PathSegment segment)
2525
{
2626
await EnsureRoot();
2727

28-
return await _root!.TryGetNodeAsync(name);
28+
return await _root!.TryGetNodeAsync(segment);
2929
}
3030

3131
public async ValueTask<IReadOnlyCollection<IResourceNode>> GetNodes()

Modules/Compression/DecompressedContent.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
namespace GenHTTP.Modules.Compression;
2-
31
/// <summary>
42
/// Provides automatic decompression of incoming request content.
53
/// </summary>

Modules/Compression/Providers/DecompressionConcern.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
namespace GenHTTP.Modules.Compression.Providers;
2-
31
/// <summary>
42
/// Concern that automatically decompresses incoming request content
53
/// based on the Content-Encoding header.

Modules/Compression/Providers/DecompressionConcernBuilder.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
namespace GenHTTP.Modules.Compression.Providers;
2-
31
/// <summary>
42
/// Builder for configuring automatic request content decompression.
53
/// </summary>

Modules/Compression/Providers/WrappedRequest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
namespace GenHTTP.Modules.Compression.Providers;
2-
31
/// <summary>
42
/// Wraps an existing request to provide decompressed content stream.
53
/// </summary>

0 commit comments

Comments
 (0)