improve code a little, get rid of templates and contexts (#12687)

Author: adameat

ydb/core/mon/mon.cpp

@@ -696,12 +696,12 @@ class THttpMonServiceNodeRequest : public TActorBootstrapped<THttpMonServiceNode
     }
 
     TString RewriteWithForwardedFromNode(const TString& response) {
-        NHttp::THttpParser<NHttp::THttpRequest, NHttp::TSocketBuffer> parser(response);
+        NHttp::THttpRequestParser parser(response);
 
         NHttp::THeadersBuilder headers(parser.Headers);
         headers.Set("X-Forwarded-From-Node", TStringBuilder() << Event->Sender.NodeId());
 
-        NHttp::THttpRenderer<NHttp::THttpRequest, NHttp::TSocketBuffer> renderer;
+        NHttp::THttpRequestRenderer renderer;
         renderer.InitRequest(parser.Method, parser.URL, parser.Protocol, parser.Version);
         renderer.Set(headers);
         if (parser.HaveBody()) {
@@ -730,12 +730,12 @@ class THttpMonServiceNodeRequest : public TActorBootstrapped<THttpMonServiceNode
     }
 
     TString RewriteLocationWithNode(const TString& response) {
-        NHttp::THttpParser<NHttp::THttpResponse, NHttp::TSocketBuffer> parser(response);
+        NHttp::THttpResponseParser parser(response);
 
         NHttp::THeadersBuilder headers(parser.Headers);
         headers.Set("Location", TStringBuilder() << "/node/" << TActivationContext::ActorSystem()->NodeId << headers["Location"]);
 
-        NHttp::THttpRenderer<NHttp::THttpResponse, NHttp::TSocketBuffer> renderer;
+        NHttp::THttpResponseRenderer renderer;
         renderer.InitResponse(parser.Protocol, parser.Version, parser.Status, parser.Message);
         renderer.Set(headers);
         if (parser.HaveBody()) {
@@ -839,7 +839,7 @@ class THttpMonServiceMonRequest : public TActorBootstrapped<THttpMonServiceMonRe
         TString responseTxt = ev->Get()->Record.GetHttpResponse();
         NHttp::THttpOutgoingResponsePtr responseObj = Event->Get()->Request->CreateResponseString(responseTxt);
         if (responseObj->Status == "301" || responseObj->Status == "302") {
-            NHttp::THttpParser<NHttp::THttpResponse, NHttp::TSocketBuffer> parser(responseTxt);
+            NHttp::THttpResponseParser parser(responseTxt);
             NHttp::THeadersBuilder headers(parser.Headers);
             if (headers["Location"].starts_with('/')) {
                 NHttp::THttpOutgoingResponsePtr response = new NHttp::THttpOutgoingResponse(Event->Get()->Request);

ydb/library/actors/http/http.cpp

@@ -81,15 +81,15 @@ TUrlParameters THttpRequest::GetParameters() const {
 }
 
 template <>
-bool THttpParser<THttpRequest, TSocketBuffer>::HasBody() const {
+bool THttpParser<THttpRequest>::HasBody() const {
     if (!Body.empty()) {
         return true;
     }
     return !ContentLength.empty() || !TransferEncoding.empty();
 }
 
 template <>
-void THttpParser<THttpRequest, TSocketBuffer>::Advance(size_t len) {
+void THttpParser<THttpRequest>::Advance(size_t len) {
     TStringBuf data(Pos(), len);
     while (!data.empty()) {
         if (Stage != EParseStage::Error) {
@@ -224,25 +224,25 @@ void THttpParser<THttpRequest, TSocketBuffer>::Advance(size_t len) {
 }
 
 template <>
-THttpParser<THttpRequest, TSocketBuffer>::EParseStage THttpParser<THttpRequest, TSocketBuffer>::GetInitialStage() {
+THttpParser<THttpRequest>::EParseStage THttpParser<THttpRequest>::GetInitialStage() {
     return EParseStage::Method;
 }
 
 template <>
-bool THttpParser<THttpResponse, TSocketBuffer>::ExpectedBody() const {
+bool THttpParser<THttpResponse>::ExpectedBody() const {
     return !Status.starts_with("1") && Status != "204" && Status != "304";
 }
 
 template <>
-bool THttpParser<THttpResponse, TSocketBuffer>::HasBody() const {
+bool THttpParser<THttpResponse>::HasBody() const {
     if (!Body.empty()) {
         return true;
     }
     return ExpectedBody() && (!ContentType.empty() || !ContentLength.empty() || !TransferEncoding.empty());
 }
 
 template <>
-THttpParser<THttpResponse, TSocketBuffer>::EParseStage THttpParser<THttpResponse, TSocketBuffer>::GetInitialStage() {
+THttpParser<THttpResponse>::EParseStage THttpParser<THttpResponse>::GetInitialStage() {
     return EParseStage::Protocol;
 }
 
@@ -253,7 +253,7 @@ void THttpResponse::Clear() {
 }
 
 template <>
-void THttpParser<THttpResponse, TSocketBuffer>::Advance(size_t len) {
+void THttpParser<THttpResponse>::Advance(size_t len) {
     TStringBuf data(Pos(), len);
     while (!data.empty()) {
         if (Stage != EParseStage::Error) {
@@ -398,7 +398,7 @@ void THttpParser<THttpResponse, TSocketBuffer>::Advance(size_t len) {
 }
 
 template <>
-void THttpParser<THttpResponse, TSocketBuffer>::ConnectionClosed() {
+void THttpParser<THttpResponse>::ConnectionClosed() {
     if (Stage == EParseStage::Done) {
         return;
     }
@@ -412,7 +412,7 @@ void THttpParser<THttpResponse, TSocketBuffer>::ConnectionClosed() {
 }
 
 THttpOutgoingResponsePtr THttpIncomingRequest::CreateResponseString(TStringBuf data) {
-    THttpParser<THttpResponse, TSocketBuffer> parser(data);
+    THttpParser<THttpResponse> parser(data);
     THeadersBuilder headers(parser.Headers);
     if (!Endpoint->WorkerName.empty()) {
         headers.Set("X-Worker-Name", Endpoint->WorkerName);
@@ -654,7 +654,7 @@ void THttpOutgoingResponse::AddDataChunk(THttpOutgoingDataChunkPtr dataChunk) {
 }
 
 THttpOutgoingDataChunk::THttpOutgoingDataChunk(THttpOutgoingResponsePtr response, TStringBuf data)
-    : THttpDataChunk<TSocketBuffer>(data)
+    : THttpDataChunk(data)
     , Response(std::move(response))
 {}