Skip to content

Commit 8b67772

Browse files
AnudeepGunukulakarelzKatya Sokolova
authored
removed argument requestId from loopbackserver.cs (#58678)
* removed argument requestId * removed requestId in LoopbackServer.cs * Update src/libraries/Common/tests/System/Net/Http/GenericLoopbackServer.cs Co-authored-by: Karel Zikmund <[email protected]> * commit after changes * removed requestId from LoopbackServer * removed requestId from Http2 and Http3 LoopbackConnection * removed requestId from HttpClientHandlerTest.Http2.cs * commit after modifying http2 test * created new function in http2 * Update src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs Co-authored-by: Katya Sokolova <[email protected]> * Update src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs Co-authored-by: Karel Zikmund <[email protected]> * Update src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs Co-authored-by: Karel Zikmund <[email protected]> * Update src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs Co-authored-by: Karel Zikmund <[email protected]> * removed async keyword Co-authored-by: Karel Zikmund <[email protected]> Co-authored-by: Katya Sokolova <[email protected]>
1 parent b35c0ad commit 8b67772

File tree

4 files changed

+38
-33
lines changed

4 files changed

+38
-33
lines changed

src/libraries/Common/tests/System/Net/Http/GenericLoopbackServer.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,24 @@ public abstract class GenericLoopbackConnection : IDisposable
124124

125125
/// <summary>Sends Response back with provided statusCode, headers and content.
126126
/// If isFinal is false, the body is not completed and you can call SendResponseBodyAsync to send more.</summary>
127-
public abstract Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true, int requestId = 0);
127+
public abstract Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true);
128128
/// <summary>Sends response headers.</summary>
129-
public abstract Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0);
129+
public abstract Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null);
130130
/// <summary>Sends valid but incomplete headers. Once called, there is no way to continue the response past this point.</summary>
131-
public abstract Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0);
131+
public abstract Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null);
132132
/// <summary>Sends Response body after SendResponse was called with isFinal: false.</summary>
133-
public abstract Task SendResponseBodyAsync(byte[] content, bool isFinal = true, int requestId = 0);
133+
public abstract Task SendResponseBodyAsync(byte[] content, bool isFinal = true);
134134

135135
/// <summary>Reads Request, sends Response and closes connection.</summary>
136136
public abstract Task<HttpRequestData> HandleRequestAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "");
137137

138138
/// <summary>Waits for the client to signal cancellation.</summary>
139-
public abstract Task WaitForCancellationAsync(bool ignoreIncomingData = true, int requestId = 0);
139+
public abstract Task WaitForCancellationAsync(bool ignoreIncomingData = true);
140140

141141
/// <summary>Helper function to make it easier to convert old test with strings.</summary>
142-
public async Task SendResponseBodyAsync(string content, bool isFinal = true, int requestId = 0)
142+
public async Task SendResponseBodyAsync(string content, bool isFinal = true)
143143
{
144-
await SendResponseBodyAsync(String.IsNullOrEmpty(content) ? new byte[0] : Encoding.ASCII.GetBytes(content), isFinal, requestId);
144+
await SendResponseBodyAsync(String.IsNullOrEmpty(content) ? new byte[0] : Encoding.ASCII.GetBytes(content), isFinal);
145145
}
146146
}
147147

src/libraries/Common/tests/System/Net/Http/Http2LoopbackConnection.cs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ public override Task<Byte[]> ReadRequestBodyAsync()
864864
return ReadBodyAsync();
865865
}
866866

867-
public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true, int requestId = 0)
867+
public async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true, int requestId = 0)
868868
{
869869
if (headers != null)
870870
{
@@ -910,25 +910,30 @@ public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpSta
910910
else
911911
{
912912
await SendResponseHeadersAsync(streamId, endStream: false, (HttpStatusCode)statusCode, endHeaders: true, headers: headers);
913-
await SendResponseBodyAsync(content, isFinal: isFinal, requestId: streamId);
913+
await SendResponseBodyAsync(content, isFinal: isFinal);
914914
}
915915
}
916916

917-
public override Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
917+
public override Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true)
918918
{
919-
int streamId = requestId == 0 ? _lastStreamId : requestId;
919+
return SendResponseAsync(statusCode, headers, content, isFinal, requestId: 0);
920+
}
921+
922+
public override Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
923+
{
924+
int streamId = _lastStreamId;
920925
return SendResponseHeadersAsync(streamId, endStream: false, statusCode, isTrailingHeader: false, endHeaders: true, headers);
921926
}
922927

923-
public override Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
928+
public override Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
924929
{
925-
int streamId = requestId == 0 ? _lastStreamId : requestId;
930+
int streamId = _lastStreamId;
926931
return SendResponseHeadersAsync(streamId, endStream: false, statusCode, isTrailingHeader: false, endHeaders: false, headers);
927932
}
928933

929-
public override Task SendResponseBodyAsync(byte[] content, bool isFinal = true, int requestId = 0)
934+
public override Task SendResponseBodyAsync(byte[] content, bool isFinal = true)
930935
{
931-
int streamId = requestId == 0 ? _lastStreamId : requestId;
936+
int streamId = _lastStreamId;
932937
return SendResponseBodyAsync(streamId, content, isFinal);
933938
}
934939

@@ -955,9 +960,9 @@ public override async Task<HttpRequestData> HandleRequestAsync(HttpStatusCode st
955960
return requestData;
956961
}
957962

958-
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true, int requestId = 0)
963+
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true)
959964
{
960-
int streamId = requestId == 0 ? _lastStreamId : requestId;
965+
int streamId = _lastStreamId;
961966

962967
Frame frame;
963968
do

src/libraries/Common/tests/System/Net/Http/Http3LoopbackConnection.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,24 +200,24 @@ public override async Task<HttpRequestData> ReadRequestDataAsync(bool readBody =
200200
return await stream.ReadRequestDataAsync(readBody).ConfigureAwait(false);
201201
}
202202

203-
public override Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true, int requestId = 0)
203+
public override Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true)
204204
{
205-
return GetOpenRequest(requestId).SendResponseAsync(statusCode, headers, content, isFinal);
205+
return GetOpenRequest().SendResponseAsync(statusCode, headers, content, isFinal);
206206
}
207207

208-
public override Task SendResponseBodyAsync(byte[] content, bool isFinal = true, int requestId = 0)
208+
public override Task SendResponseBodyAsync(byte[] content, bool isFinal = true)
209209
{
210-
return GetOpenRequest(requestId).SendResponseBodyAsync(content, isFinal);
210+
return GetOpenRequest().SendResponseBodyAsync(content, isFinal);
211211
}
212212

213-
public override Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
213+
public override Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
214214
{
215-
return GetOpenRequest(requestId).SendResponseHeadersAsync(statusCode, headers);
215+
return GetOpenRequest().SendResponseHeadersAsync(statusCode, headers);
216216
}
217217

218-
public override Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
218+
public override Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
219219
{
220-
return GetOpenRequest(requestId).SendPartialResponseHeadersAsync(statusCode, headers);
220+
return GetOpenRequest().SendPartialResponseHeadersAsync(statusCode, headers);
221221
}
222222

223223
public override async Task<HttpRequestData> HandleRequestAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "")
@@ -301,9 +301,9 @@ public async Task WaitForClientDisconnectAsync(bool refuseNewRequests = true)
301301
await CloseAsync(H3_NO_ERROR);
302302
}
303303

304-
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true, int requestId = 0)
304+
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true)
305305
{
306-
await GetOpenRequest(requestId).WaitForCancellationAsync(ignoreIncomingData).ConfigureAwait(false);
306+
await GetOpenRequest().WaitForCancellationAsync(ignoreIncomingData).ConfigureAwait(false);
307307
}
308308
}
309309

src/libraries/Common/tests/System/Net/Http/LoopbackServer.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ public void CompleteRequestProcessing()
872872
_bodyRead = false;
873873
}
874874

875-
public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true, int requestId = 0)
875+
public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, string content = "", bool isFinal = true)
876876
{
877877
MemoryStream headerBytes = new MemoryStream();
878878
int contentLength = -1;
@@ -933,7 +933,7 @@ public override async Task SendResponseAsync(HttpStatusCode statusCode = HttpSta
933933

934934
if (content != null)
935935
{
936-
await SendResponseBodyAsync(content, isFinal: isFinal, requestId: requestId).ConfigureAwait(false);
936+
await SendResponseBodyAsync(content, isFinal: isFinal).ConfigureAwait(false);
937937
}
938938
}
939939

@@ -955,13 +955,13 @@ private string GetResponseHeaderString(HttpStatusCode statusCode, IList<HttpHead
955955
return headerString;
956956
}
957957

958-
public override async Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
958+
public override async Task SendResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
959959
{
960960
string headerString = GetResponseHeaderString(statusCode, headers);
961961
await SendResponseAsync(headerString).ConfigureAwait(false);
962962
}
963963

964-
public override async Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null, int requestId = 0)
964+
public override async Task SendPartialResponseHeadersAsync(HttpStatusCode statusCode = HttpStatusCode.OK, IList<HttpHeaderData> headers = null)
965965
{
966966
string headerString = GetResponseHeaderString(statusCode, headers);
967967

@@ -971,7 +971,7 @@ public override async Task SendPartialResponseHeadersAsync(HttpStatusCode status
971971
await SendResponseAsync(headerString).ConfigureAwait(false);
972972
}
973973

974-
public override async Task SendResponseBodyAsync(byte[] content, bool isFinal = true, int requestId = 0)
974+
public override async Task SendResponseBodyAsync(byte[] content, bool isFinal = true)
975975
{
976976
await SendResponseAsync(content).ConfigureAwait(false);
977977
}
@@ -1047,7 +1047,7 @@ public override async Task<HttpRequestData> HandleRequestAsync(HttpStatusCode st
10471047
return requestData;
10481048
}
10491049

1050-
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true, int requestId = 0)
1050+
public override async Task WaitForCancellationAsync(bool ignoreIncomingData = true)
10511051
{
10521052
var buffer = new byte[1024];
10531053
while (true)

0 commit comments

Comments
 (0)