refactor core/userver: move json getters/setters from codegen to userver

commit_hash:290f3179b64a3fbbaec535fa26c97f722daea8f0

Author: lexeyo

.mapping.json

@@ -1096,6 +1096,7 @@
   "core/include/userver/server/middlewares/cors.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/cors.hpp",
   "core/include/userver/server/middlewares/headers_propagator.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/headers_propagator.hpp",
   "core/include/userver/server/middlewares/http_middleware_base.hpp":"taxi/uservices/userver/core/include/userver/server/middlewares/http_middleware_base.hpp",
+  "core/include/userver/server/request/json_data.hpp":"taxi/uservices/userver/core/include/userver/server/request/json_data.hpp",
   "core/include/userver/server/request/request_config.hpp":"taxi/uservices/userver/core/include/userver/server/request/request_config.hpp",
   "core/include/userver/server/request/request_context.hpp":"taxi/uservices/userver/core/include/userver/server/request/request_context.hpp",
   "core/include/userver/server/request/response_base.hpp":"taxi/uservices/userver/core/include/userver/server/request/response_base.hpp",
@@ -1951,6 +1952,7 @@
   "core/src/server/pph_config.hpp":"taxi/uservices/userver/core/src/server/pph_config.hpp",
   "core/src/server/request/internal_request_context.cpp":"taxi/uservices/userver/core/src/server/request/internal_request_context.cpp",
   "core/src/server/request/internal_request_context.hpp":"taxi/uservices/userver/core/src/server/request/internal_request_context.hpp",
+  "core/src/server/request/json_data.cpp":"taxi/uservices/userver/core/src/server/request/json_data.cpp",
   "core/src/server/request/request_config.cpp":"taxi/uservices/userver/core/src/server/request/request_config.cpp",
   "core/src/server/request/request_context.cpp":"taxi/uservices/userver/core/src/server/request/request_context.cpp",
   "core/src/server/request/request_context_test.cpp":"taxi/uservices/userver/core/src/server/request/request_context_test.cpp",

core/include/userver/server/handlers/http_handler_json_base.hpp

@@ -42,14 +42,6 @@ class HttpHandlerJsonBase : public HttpHandlerBase {
     static yaml_config::Schema GetStaticConfigSchema();
 
 protected:
-    /// @returns A pointer to json request if it was parsed successfully or
-    /// nullptr otherwise.
-    static const formats::json::Value* GetRequestJson(const request::RequestContext& context);
-
-    /// @returns a pointer to json response if it was returned successfully by
-    /// `HandleRequestJsonThrow()` or nullptr otherwise.
-    static const formats::json::Value* GetResponseJson(const request::RequestContext& context);
-
     void ParseRequestData(const http::HttpRequest& request, request::RequestContext& context) const override;
 
 private:

core/include/userver/server/request/json_data.hpp

@@ -0,0 +1,31 @@
+#pragma once
+
+/// @file userver/server/request/json_data.hpp
+/// @brief Functions that handle JSON requests and responses stored in context.
+
+#include <userver/formats/json/value.hpp>
+#include <userver/server/request/request_context.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace server::request {
+
+/// @returns A pointer to json request if it was parsed successfully and stored in the context or
+/// nullptr otherwise.
+const formats::json::Value* GetRequestJson(const RequestContext& context);
+
+/// @brief Saves a parsed json request to the context.
+/// @returns A reference to the saved json.
+formats::json::Value& SetRequestJson(RequestContext& context, formats::json::Value request_json);
+
+/// @returns A pointer to json response if it was produced successfully and stored in the context
+/// or nullptr otherwise.
+const formats::json::Value* GetResponseJson(const RequestContext& context);
+
+/// @brief Saves a json response to the context.
+/// @returns A reference to the saved json.
+formats::json::Value& SetResponseJson(RequestContext& context, formats::json::Value request_json);
+
+}  // namespace server::request
+
+USERVER_NAMESPACE_END

core/src/server/handlers/http_handler_json_base.cpp

@@ -10,6 +10,7 @@
 #include <userver/server/handlers/legacy_json_error_builder.hpp>
 #include <userver/server/http/http_error.hpp>
 #include <userver/server/http/http_status.hpp>
+#include <userver/server/request/json_data.hpp>
 #include <userver/yaml_config/schema.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -18,8 +19,6 @@ namespace server::handlers {
 
 namespace {
 
-const std::string kRequestDataName = "__request_json";
-const std::string kResponseDataName = "__response_json";
 const std::string kSerializeJson = "serialize_json";
 
 const formats::json::Value kEmptyJson{};
@@ -36,26 +35,19 @@ HttpHandlerJsonBase::HttpHandlerJsonBase(
 
 std::string HttpHandlerJsonBase::HandleRequestThrow(const http::HttpRequest& request, request::RequestContext& context)
     const {
-    const auto& request_json = context.GetData<const formats::json::Value&>(kRequestDataName);
+    const auto request_json = request::GetRequestJson(context);
+    UASSERT(request_json != nullptr);
 
     auto& response = request.GetHttpResponse();
     response.SetContentType(USERVER_NAMESPACE::http::content_type::kApplicationJson);
 
-    const auto& response_json = context.SetData<
-        formats::json::Value>(kResponseDataName, HandleRequestJsonThrow(request, request_json, context));
+    const auto&
+        response_json = request::SetResponseJson(context, HandleRequestJsonThrow(request, *request_json, context));
 
     const auto scope_time = tracing::ScopeTime::CreateOptionalScopeTime(kSerializeJson);
     return formats::json::ToString(response_json);
 }
 
-const formats::json::Value* HttpHandlerJsonBase::GetRequestJson(const request::RequestContext& context) {
-    return context.GetDataOptional<const formats::json::Value>(kRequestDataName);
-}
-
-const formats::json::Value* HttpHandlerJsonBase::GetResponseJson(const request::RequestContext& context) {
-    return context.GetDataOptional<const formats::json::Value>(kResponseDataName);
-}
-
 FormattedErrorData HttpHandlerJsonBase::GetFormattedExternalErrorBody(const CustomHandlerException& exc) const {
     if (exc.GetServiceCode().empty()) {
         // Legacy format has no "service codes", only HTTP codes.
@@ -66,12 +58,12 @@ FormattedErrorData HttpHandlerJsonBase::GetFormattedExternalErrorBody(const Cust
 
 void HttpHandlerJsonBase::ParseRequestData(const http::HttpRequest& request, request::RequestContext& context) const {
     if (request.RequestBody().empty()) {
-        context.SetData<formats::json::Value>(kRequestDataName, kEmptyJson);
+        request::SetRequestJson(context, kEmptyJson);
         return;
     }
 
     try {
-        context.SetData<formats::json::Value>(kRequestDataName, formats::json::FromString(request.RequestBody()));
+        request::SetRequestJson(context, formats::json::FromString(request.RequestBody()));
     } catch (const formats::json::Exception& e) {
         throw RequestParseError(
             InternalMessage{"Invalid JSON body"},

core/src/server/request/json_data.cpp

@@ -0,0 +1,30 @@
+#include <userver/server/request/json_data.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace server::request {
+
+namespace {
+constexpr std::string_view kRequestDataName = "__request_object_json";
+constexpr std::string_view kResponseDataName = "__response_object_json";
+}  // namespace
+
+const formats::json::Value* GetRequestJson(const RequestContext& context) {
+    return context.GetDataOptional<const formats::json::Value>(kRequestDataName);
+}
+
+formats::json::Value& SetRequestJson(RequestContext& context, formats::json::Value request_json) {
+    return context.SetData(std::string{kRequestDataName}, std::move(request_json));
+}
+
+const formats::json::Value* GetResponseJson(const RequestContext& context) {
+    return context.GetDataOptional<const formats::json::Value>(kResponseDataName);
+}
+
+formats::json::Value& SetResponseJson(RequestContext& context, formats::json::Value request_json) {
+    return context.SetData(std::string{kResponseDataName}, std::move(request_json));
+}
+
+}  // namespace server::request
+
+USERVER_NAMESPACE_END