From 25834b89dddfd553770e575ed827f143781af0f5 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Wed, 17 Feb 2016 16:01:44 -0800 Subject: [PATCH] Fix classes for service member function definitions --- src/server/service/match_service.cpp | 4 +-- src/server/service/nearest_service.cpp | 6 ++-- src/server/service/route_service.cpp | 43 ++++++++++++++++---------- src/server/service/table_service.cpp | 40 +++++++++++++++--------- src/server/service/trip_service.cpp | 6 ++-- 5 files changed, 60 insertions(+), 39 deletions(-) diff --git a/src/server/service/match_service.cpp b/src/server/service/match_service.cpp index d8233d8aa..ee616f218 100644 --- a/src/server/service/match_service.cpp +++ b/src/server/service/match_service.cpp @@ -14,9 +14,9 @@ namespace server namespace service { -engine::Status RouteService::RunQuery(std::vector coordinates, +engine::Status MatchService::RunQuery(std::vector coordinates, std::string &options, - util::json::Object &json_result) + util::json::Object &result) { // TODO(daniel-j-h) return Status::Error; diff --git a/src/server/service/nearest_service.cpp b/src/server/service/nearest_service.cpp index f5e08d975..0fdd6e1bf 100644 --- a/src/server/service/nearest_service.cpp +++ b/src/server/service/nearest_service.cpp @@ -14,9 +14,9 @@ namespace server namespace service { -engine::Status RouteService::RunQuery(std::vector coordinates, - std::string &options, - util::json::Object &json_result) +engine::Status NearestService::RunQuery(std::vector coordinates, + std::string &options, + util::json::Object &result) { // TODO(daniel-j-h) return Status::Error; diff --git a/src/server/service/route_service.cpp b/src/server/service/route_service.cpp index 21c11d341..4dffcf026 100644 --- a/src/server/service/route_service.cpp +++ b/src/server/service/route_service.cpp @@ -14,12 +14,18 @@ namespace server namespace service { -namespace { +namespace +{ -const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = "Number of elements in %1% size %2% does not match coordinate size %3%"; +const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = + "Number of elements in %1% size %2% does not match coordinate size %3%"; -template -bool constrainParamSize(const char* msg_template, const char* name, const ParamT& param, const std::size_t target_size, std::string& help) +template +bool constrainParamSize(const char *msg_template, + const char *name, + const ParamT ¶m, + const std::size_t target_size, + std::string &help) { if (param.size() > 0 && param.size() != target_size) { @@ -29,16 +35,20 @@ bool constrainParamSize(const char* msg_template, const char* name, const ParamT return false; } -std::string getWrongOptionHelp(const engine::api::RouteParameters& parameters) +std::string getWrongOptionHelp(const engine::api::RouteParameters ¶meters) { std::string help; const auto coord_size = parameters.coordinates.size(); - const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, coord_size, help) - || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, coord_size, help) - || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, coord_size, help) - || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "uturns", parameters.uturns, coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", + parameters.hints, coord_size, help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", + parameters.bearings, coord_size, help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", + parameters.radiuses, coord_size, help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "uturns", + parameters.uturns, coord_size, help); if (!param_size_mismatch && parameters.coordinates.size() < 2) { @@ -51,16 +61,17 @@ std::string getWrongOptionHelp(const engine::api::RouteParameters& parameters) engine::Status RouteService::RunQuery(std::vector coordinates, std::string &options, - util::json::Object &json_result) + util::json::Object &result) { auto options_iterator = options.begin(); - auto parameters = api::parseParameters(options_iterator, options.end()); + auto parameters = + api::parseParameters(options_iterator, options.end()); if (!parameters || options_iterator != options.end()) { const auto position = std::distance(options.begin(), options_iterator); - json_result.values["code"] = "invalid-options"; - json_result.values["message"] = + result.values["code"] = "invalid-options"; + result.values["message"] = "Options string malformed close to position " + std::to_string(position); return engine::Status::Error; } @@ -70,13 +81,13 @@ engine::Status RouteService::RunQuery(std::vector co if (!parameters->IsValid()) { - json_result.values["code"] = "invalid-options"; - json_result.values["message"] = getWrongOptionHelp(*parameters); + result.values["code"] = "invalid-options"; + result.values["message"] = getWrongOptionHelp(*parameters); return engine::Status::Error; } BOOST_ASSERT(parameters->IsValid()); - return BaseService::routing_machine.Route(*parameters, json_result); + return BaseService::routing_machine.Route(*parameters, result); } } } diff --git a/src/server/service/table_service.cpp b/src/server/service/table_service.cpp index 2c6ce8a86..1d9e2bc0c 100644 --- a/src/server/service/table_service.cpp +++ b/src/server/service/table_service.cpp @@ -14,12 +14,18 @@ namespace server namespace service { -namespace { +namespace +{ -const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = "Number of elements in %1% size %2% does not match coordinate size %3%"; +const constexpr char PARAMETER_SIZE_MISMATCH_MSG[] = + "Number of elements in %1% size %2% does not match coordinate size %3%"; -template -bool constrainParamSize(const char* msg_template, const char* name, const ParamT& param, const std::size_t target_size, std::string& help) +template +bool constrainParamSize(const char *msg_template, + const char *name, + const ParamT ¶m, + const std::size_t target_size, + std::string &help) { if (param.size() > 0 && param.size() != target_size) { @@ -29,15 +35,18 @@ bool constrainParamSize(const char* msg_template, const char* name, const ParamT return false; } -std::string getWrongOptionHelp(const engine::api::TableParameters& parameters) +std::string getWrongOptionHelp(const engine::api::TableParameters ¶meters) { std::string help; const auto coord_size = parameters.coordinates.size(); - const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", parameters.hints, coord_size, help) - || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", parameters.bearings, coord_size, help) - || constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", parameters.radiuses, coord_size, help); + const bool param_size_mismatch = constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "hints", + parameters.hints, coord_size, help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "bearings", + parameters.bearings, coord_size, help) || + constrainParamSize(PARAMETER_SIZE_MISMATCH_MSG, "radiuses", + parameters.radiuses, coord_size, help); if (!param_size_mismatch && parameters.coordinates.size() < 2) { @@ -50,16 +59,17 @@ std::string getWrongOptionHelp(const engine::api::TableParameters& parameters) engine::Status TableService::RunQuery(std::vector coordinates, std::string &options, - util::json::Object &json_result) + util::json::Object &result) { auto options_iterator = options.begin(); - auto parameters = api::parseParameters(options_iterator, options.end()); + auto parameters = + api::parseParameters(options_iterator, options.end()); if (!parameters || options_iterator != options.end()) { const auto position = std::distance(options.begin(), options_iterator); - json_result.values["code"] = "invalid-options"; - json_result.values["message"] = + result.values["code"] = "invalid-options"; + result.values["message"] = "Options string malformed close to position " + std::to_string(position); return engine::Status::Error; } @@ -69,13 +79,13 @@ engine::Status TableService::RunQuery(std::vector co if (!parameters->IsValid()) { - json_result.values["code"] = "invalid-options"; - json_result.values["message"] = getWrongOptionHelp(*parameters); + result.values["code"] = "invalid-options"; + result.values["message"] = getWrongOptionHelp(*parameters); return engine::Status::Error; } BOOST_ASSERT(parameters->IsValid()); - return BaseService::routing_machine.Table(*parameters, json_result); + return BaseService::routing_machine.Table(*parameters, result); } } } diff --git a/src/server/service/trip_service.cpp b/src/server/service/trip_service.cpp index 2e01a4e88..b5c34484a 100644 --- a/src/server/service/trip_service.cpp +++ b/src/server/service/trip_service.cpp @@ -14,9 +14,9 @@ namespace server namespace service { -engine::Status RouteService::RunQuery(std::vector coordinates, - std::string &options, - util::json::Object &json_result) +engine::Status TripService::RunQuery(std::vector coordinates, + std::string &options, + util::json::Object &result) { // TODO(daniel-j-h) return Status::Error;