mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-03-31 18:30:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge query params mapping feature by @sauntor

Browse Source
This commit is contained in:
lganzzzo 2019-03-01 18:02:13 +02:00
parent 3eaac8955a
commit 03293ab720
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/oatpp/codegen/codegen_define_ApiController_.hpp
View File

@ -217,10 +217,10 @@ OATPP_MACRO_API_CONTROLLER_QUERY_CHOOSER_EXP(TYPE, NAME, PARAM_LIST, OATPP_MACRO
// __INFO
#define OATPP_MACRO_API_CONTROLLER_QUERY_INFO_0(TYPE, NAME, PARAM_LIST) \
info->queryParams.push_back(Endpoint::Info::Param(#NAME, TYPE::Class::getType()));
info->queryParams.add(#NAME, TYPE::Class::getType());
#define OATPP_MACRO_API_CONTROLLER_QUERY_INFO_1(TYPE, NAME, PARAM_LIST) \
info->queryParams.push_back(Endpoint::Info::Param(OATPP_MACRO_FIRSTARG PARAM_LIST, TYPE::Class::getType()));
info->queryParams.add(OATPP_MACRO_FIRSTARG PARAM_LIST, TYPE::Class::getType());
#define OATPP_MACRO_API_CONTROLLER_QUERY_INFO_CHOOSER(TYPE, NAME, PARAM_LIST, HAS_ARGS) \
OATPP_MACRO_API_CONTROLLER_QUERY_INFO_##HAS_ARGS (TYPE, NAME, PARAM_LIST)

11
src/oatpp/web/server/api/Endpoint.hpp
View File

@ -89,6 +89,17 @@ public:
*/
Param& add(const oatpp::String& name, oatpp::data::mapping::type::Type* type);
/**
* Add parameter name to list order
* @tparam T
* @param name
* @return new or existing parameter
*/
template<class T>
Param& add(const oatpp::String& name) {
return add(name, T::Class::getType());
}
/**
* Get or add param by name
* @param name

38
test/oatpp/web/server/api/ApiControllerTest.cpp
View File

@ -56,8 +56,8 @@ public:
ENDPOINT_INFO(pathParams) {
info->pathParams["param1"].description = "this is param1";
info->queryParams.add("q1", String::Class::getType()).description = "query param";
info->headers.add("X-TEST-HEADER", String::Class::getType()).description = "TEST-HEADER-PARAM";
info->queryParams.add<String>("q1").description = "query param";
info->headers.add<String>("X-TEST-HEADER").description = "TEST-HEADER-PARAM";
}
ENDPOINT("GET", "path/{param1}/{param2}", pathParams,
PATH(String, param1),
@ -65,6 +65,15 @@ public:
return createResponse(Status::CODE_200, "test2");
}
ENDPOINT_INFO(queryParams) {
info->queryParams["param1"].description = "this is param1";
}
ENDPOINT("GET", "query", queryParams,
QUERY(String, param1),
QUERY(String, param2)) {
return createResponse(Status::CODE_200, "test3");
}
#include OATPP_CODEGEN_END(ApiController)
};
@ -99,7 +108,7 @@ void ApiControllerTest::onRun() {
auto stream = oatpp::data::stream::ChunkedBuffer::createShared();
response->send(stream);
OATPP_LOGD(TAG, "response=\n---\n%s\n---\n", stream->toString()->c_str());
OATPP_LOGD(TAG, "response:\n---\n%s\n---\n", stream->toString()->c_str());
}
@ -126,7 +135,28 @@ void ApiControllerTest::onRun() {
auto stream = oatpp::data::stream::ChunkedBuffer::createShared();
response->send(stream);
OATPP_LOGD(TAG, "response=\n---\n%s\n---\n", stream->toString()->c_str());
OATPP_LOGD(TAG, "response:\n---\n%s\n---\n", stream->toString()->c_str());
}
{
auto endpoint = controller.Z__ENDPOINT_queryParams;
OATPP_ASSERT(endpoint);
OATPP_ASSERT(!endpoint->info->summary);
OATPP_ASSERT(endpoint->info->queryParams["param1"].name == "param1");
OATPP_ASSERT(endpoint->info->queryParams["param1"].description == "this is param1");
OATPP_ASSERT(endpoint->info->queryParams["param2"].name == "param2");
OATPP_ASSERT(!endpoint->info->queryParams["param2"].description);
auto response = controller.queryParams("p1", "p2");
OATPP_ASSERT(response->getStatus().code == 200);
auto stream = oatpp::data::stream::ChunkedBuffer::createShared();
response->send(stream);
OATPP_LOGD(TAG, "response:\n---\n%s\n---\n", stream->toString()->c_str());
}