dca4b25e8b
Function handler in general and json function in particular are the
easiest way to add logic to to handler.
While in some cases the method can return immediately, there are cases
when it is required to perform an async operation, to support those
cases, the function handler was modified to use future.
If it receives an old style function, it would wrap the results in a
make_ready_future. This you could still assign a function like:
new function_handler([](const_req req) {
return "hello";
});
It would no also support a function that return a future json so it is
no possible to assign logic like:
new function_handler([](std::unique_ptr<request> req) {
return make_ready_future<json::json_return_type>("json-future");
});
For the future case note that auto-boxing still works, although you now
need to use make_ready_future.
The json_path was also modified to accept the new kind of function, to
support the common case of route definition based on the code
generation.
Signed-off-by: Amnon Heiman <amnon@cloudius-systems.com>
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
/*
|
|
* This file is open source software, licensed to you under the terms
|
|
* of the Apache License, Version 2.0 (the "License"). See the NOTICE file
|
|
* distributed with this work for additional information regarding copyright
|
|
* ownership. You may not use this file except in compliance with the License.
|
|
*
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
/*
|
|
* Copyright 2015 Cloudius Systems
|
|
*/
|
|
|
|
#include "json_path.hh"
|
|
|
|
namespace httpd {
|
|
|
|
using namespace std;
|
|
|
|
void path_description::set(routes& _routes, handler_base* handler) const {
|
|
for (auto& i : mandatory_queryparams) {
|
|
handler->mandatory(i);
|
|
}
|
|
|
|
if (params.size() == 0)
|
|
_routes.put(operations.method, path, handler);
|
|
else {
|
|
match_rule* rule = new match_rule(handler);
|
|
rule->add_str(path);
|
|
for (auto i = params.begin(); i != params.end(); ++i) {
|
|
rule->add_param(std::get<0>(*i), std::get<1>(*i));
|
|
}
|
|
_routes.add(rule, operations.method);
|
|
}
|
|
}
|
|
|
|
void path_description::set(routes& _routes,
|
|
const json_request_function& f) const {
|
|
set(_routes, new function_handler(f));
|
|
}
|
|
|
|
void path_description::set(routes& _routes, const future_json_function& f) const {
|
|
set(_routes, new function_handler(f));
|
|
}
|
|
path_description::path_description(const sstring& path, operation_type method,
|
|
const sstring& nickname,
|
|
const std::vector<std::pair<sstring, bool>>& path_parameters,
|
|
const std::vector<sstring>& mandatory_params)
|
|
: path(path), operations(method, nickname) {
|
|
|
|
for (auto man : mandatory_params) {
|
|
pushmandatory_param(man);
|
|
}
|
|
for (auto param : path_parameters) {
|
|
params.push_back(param);
|
|
}
|
|
|
|
}
|
|
|
|
}
|