From 3c56385ba8762a3088619e957d0540b40bf16d9e Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 8 Mar 2016 19:10:59 +0100 Subject: [PATCH] Fix missing capitalization of error codes --- src/engine/plugins/table.cpp | 8 ++++---- src/engine/plugins/trip.cpp | 2 +- src/engine/plugins/viaroute.cpp | 10 +++++----- src/server/request_handler.cpp | 2 +- src/server/service/match_service.cpp | 4 ++-- src/server/service/nearest_service.cpp | 4 ++-- src/server/service/route_service.cpp | 4 ++-- src/server/service/table_service.cpp | 4 ++-- src/server/service/tile_service.cpp | 4 ++-- src/server/service/trip_service.cpp | 4 ++-- src/server/service_handler.cpp | 4 ++-- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/engine/plugins/table.cpp b/src/engine/plugins/table.cpp index f6fd6a034..cb64a423c 100644 --- a/src/engine/plugins/table.cpp +++ b/src/engine/plugins/table.cpp @@ -36,12 +36,12 @@ Status TablePlugin::HandleRequest(const api::TableParameters ¶ms, util::json if (!CheckAllCoordinates(params.coordinates)) { - return Error("invalid-options", "Coordinates are invalid", result); + return Error("InvalidOptions", "Coordinates are invalid", result); } if (params.bearings.size() > 0 && params.coordinates.size() != params.bearings.size()) { - return Error("invalid-options", "Number of bearings does not match number of coordinates", + return Error("InvalidOptions", "Number of bearings does not match number of coordinates", result); } @@ -50,7 +50,7 @@ Status TablePlugin::HandleRequest(const api::TableParameters ¶ms, util::json static_cast(max_locations_distance_table * max_locations_distance_table))) { return Error( - "invalid-options", + "InvalidOptions", "Number of entries " + std::to_string(params.sources.size() * params.destinations.size()) + " is higher than current maximum (" + @@ -63,7 +63,7 @@ Status TablePlugin::HandleRequest(const api::TableParameters ¶ms, util::json if (result_table.empty()) { - return Error("no-table", "No table found", result); + return Error("NoTable", "No table found", result); } api::TableAPI table_api{facade, params}; diff --git a/src/engine/plugins/trip.cpp b/src/engine/plugins/trip.cpp index 6df5ea6ca..965435555 100644 --- a/src/engine/plugins/trip.cpp +++ b/src/engine/plugins/trip.cpp @@ -173,7 +173,7 @@ Status TripPlugin::HandleRequest(const api::TripParameters ¶meters, auto phantom_node_pairs = GetPhantomNodes(parameters); if (phantom_node_pairs.size() != parameters.coordinates.size()) { - return Error("no-segment", + return Error("NoSegment", std::string("Could not find a matching segment for coordinate ") + std::to_string(phantom_node_pairs.size()), json_result); diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp index f558a26c7..64b80b1f6 100644 --- a/src/engine/plugins/viaroute.cpp +++ b/src/engine/plugins/viaroute.cpp @@ -34,7 +34,7 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter if (max_locations_viaroute > 0 && (static_cast(route_parameters.coordinates.size()) > max_locations_viaroute)) { - return Error("too-big", + return Error("TooBig", "Number of entries " + std::to_string(route_parameters.coordinates.size()) + " is higher than current maximum (" + std::to_string(max_locations_viaroute) + ")", @@ -43,13 +43,13 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter if (!CheckAllCoordinates(route_parameters.coordinates)) { - return Error("invalid-value", "Invalid coordinate value.", json_result); + return Error("InvalidValue", "Invalid coordinate value.", json_result); } auto phantom_node_pairs = GetPhantomNodes(route_parameters); if (phantom_node_pairs.size() != route_parameters.coordinates.size()) { - return Error("no-segment", + return Error("NoSegment", std::string("Could not find a matching segment for coordinate ") + std::to_string(phantom_node_pairs.size()), json_result); @@ -100,11 +100,11 @@ Status ViaRoutePlugin::HandleRequest(const api::RouteParameters &route_parameter if (not_in_same_component) { - return Error("no-route", "Impossible route between points", json_result); + return Error("NoRoute", "Impossible route between points", json_result); } else { - return Error("no-route", "No route found between points", json_result); + return Error("NoRoute", "No route found between points", json_result); } } diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp index bfe793abd..9aee5df7c 100644 --- a/src/server/request_handler.cpp +++ b/src/server/request_handler.cpp @@ -107,7 +107,7 @@ void RequestHandler::HandleRequest(const http::request ¤t_request, http::r current_reply.status = http::reply::bad_request; result = util::json::Object(); auto &json_result = result.get(); - 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 + "\""; } diff --git a/src/server/service/match_service.cpp b/src/server/service/match_service.cpp index 3db0cc684..dec8006e1 100644 --- a/src/server/service/match_service.cpp +++ b/src/server/service/match_service.cpp @@ -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; } diff --git a/src/server/service/nearest_service.cpp b/src/server/service/nearest_service.cpp index 0b5eaadf7..1ea1fa89b 100644 --- a/src/server/service/nearest_service.cpp +++ b/src/server/service/nearest_service.cpp @@ -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; } diff --git a/src/server/service/route_service.cpp b/src/server/service/route_service.cpp index 589151c95..9f59fc8a9 100644 --- a/src/server/service/route_service.cpp +++ b/src/server/service/route_service.cpp @@ -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; } diff --git a/src/server/service/table_service.cpp b/src/server/service/table_service.cpp index 39c71711b..9b0f817b8 100644 --- a/src/server/service/table_service.cpp +++ b/src/server/service/table_service.cpp @@ -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; } diff --git a/src/server/service/tile_service.cpp b/src/server/service/tile_service.cpp index 8941b3536..d8f1ba8a5 100644 --- a/src/server/service/tile_service.cpp +++ b/src/server/service/tile_service.cpp @@ -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(); - 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(); - 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; } diff --git a/src/server/service/trip_service.cpp b/src/server/service/trip_service.cpp index 71220f18e..82a1bfdd2 100644 --- a/src/server/service/trip_service.cpp +++ b/src/server/service/trip_service.cpp @@ -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(); - 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; } diff --git a/src/server/service_handler.cpp b/src/server/service_handler.cpp index e4f48be32..98ba6a617 100644 --- a/src/server/service_handler.cpp +++ b/src/server/service_handler.cpp @@ -33,7 +33,7 @@ engine::Status ServiceHandler::RunQuery(api::ParsedURL parsed_url, { result = util::json::Object(); auto &json_result = result.get(); - 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(); - 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; }