Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix missing capitalization of error codes

Browse Source
This commit is contained in:
Patrick Niklaus
2016-03-08 19:10:59 +01:00
parent eb3f550e26
commit d2590f1078
11 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/request_handler.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
current_reply.status = http::reply::bad_request;
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-url";
json_result.values["code"] = "InvalidUrl";
json_result.values["message"] = "URL string malformed close to position " +
std::to_string(position) + ": \"" + context + "\"";
}
src/server/service/match_service.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ engine::Status MatchService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end())
{
const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -60,7 +60,7 @@ engine::Status MatchService::RunQuery(std::string &query, ResultT &result)
BOOST_ASSERT(parameters);
if (!parameters->IsValid())
{
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error;
}
src/server/service/nearest_service.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ engine::Status NearestService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end())
{
const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -59,7 +59,7 @@ engine::Status NearestService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid())
{
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error;
}
src/server/service/route_service.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ engine::Status RouteService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end())
{
const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -58,7 +58,7 @@ engine::Status RouteService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid())
{
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error;
}
src/server/service/table_service.cpp
+2 -2
View File
@@ -68,7 +68,7 @@ engine::Status TableService::RunQuery(std::string &query, ResultT &result)
if (!parameters || query_iterator != query.end())
{
const auto position = std::distance(query.begin(), query_iterator);
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -77,7 +77,7 @@ engine::Status TableService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid())
{
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error;
}
src/server/service/tile_service.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ engine::Status TileService::RunQuery(std::string &query, ResultT &result)
const auto position = std::distance(query.begin(), query_iterator);
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -36,7 +36,7 @@ engine::Status TileService::RunQuery(std::string &query, ResultT &result)
{
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = "Invalid coodinates. Only zoomlevel 12+ is supported";
return engine::Status::Error;
}
src/server/service/trip_service.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ engine::Status TripService::RunQuery(std::string &query, ResultT &result)
const auto position = std::distance(query.begin(), query_iterator);
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-query";
json_result.values["code"] = "InvalidQuery";
json_result.values["message"] =
"Query string malformed close to position " + std::to_string(position);
return engine::Status::Error;
@@ -60,7 +60,7 @@ engine::Status TripService::RunQuery(std::string &query, ResultT &result)
if (!parameters->IsValid())
{
json_result.values["code"] = "invalid-options";
json_result.values["code"] = "InvalidOptions";
json_result.values["message"] = getWrongOptionHelp(*parameters);
return engine::Status::Error;
}
src/server/service_handler.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
{
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-service";
json_result.values["code"] = "InvalidService";
json_result.values["message"] = "Service " + parsed_url.service + " not found!";
return engine::Status::Error;
}
@@ -43,7 +43,7 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url,
{
result = util::json::Object();
auto &json_result = result.get<util::json::Object>();
json_result.values["code"] = "invalid-version";
json_result.values["code"] = "InvalidVersion";
json_result.values["message"] = "Service " + parsed_url.service + " not found!";
return engine::Status::Error;
}