From 412387c84eefba2ec4c267ee2748bf78f03ce327 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Fri, 14 Sep 2018 21:08:09 +0300 Subject: [base] Replaced the namespace my with base. --- partners_api/booking_api.cpp | 24 ++++++++++++------------ partners_api/locals_api.cpp | 12 ++++++------ partners_api/maxim_api.cpp | 4 ++-- partners_api/partners_api_tests/rutaxi_tests.cpp | 4 ++-- partners_api/partners_api_tests/uber_tests.cpp | 8 ++++---- partners_api/rutaxi_api.cpp | 12 ++++++------ partners_api/taxi_places_loader.cpp | 2 +- partners_api/uber_api.cpp | 6 +++--- partners_api/viator_api.cpp | 6 +++--- partners_api/yandex_api.cpp | 4 ++-- 10 files changed, 41 insertions(+), 41 deletions(-) (limited to 'partners_api') diff --git a/partners_api/booking_api.cpp b/partners_api/booking_api.cpp index ad94437cf3..56583812f5 100644 --- a/partners_api/booking_api.cpp +++ b/partners_api/booking_api.cpp @@ -210,7 +210,7 @@ vector ParseReviews(json_t const * reviewsArray) void FillHotelInfo(string const & src, HotelInfo & info) { - my::Json root(src.c_str()); + base::Json root(src.c_str()); FromJSONObjectOptionalField(root.get(), "description", info.m_description); double score; @@ -267,7 +267,7 @@ BlockInfo MakeBlock(json_t * src, string const & currency) auto minPriceRoot = json_object_get(src, "min_price"); if (!json_is_object(minPriceRoot)) - MYTHROW(my::Json::Exception, ("The min_price must contain a json object.")); + MYTHROW(base::Json::Exception, ("The min_price must contain a json object.")); FillPriceAndCurrency(minPriceRoot, currency, result); @@ -317,13 +317,13 @@ BlockInfo MakeBlock(json_t * src, string const & currency) void FillBlocks(string const & src, string const & currency, Blocks & blocks) { - my::Json root(src.c_str()); + base::Json root(src.c_str()); if (!json_is_object(root.get())) - MYTHROW(my::Json::Exception, ("The answer must contain a json object.")); + MYTHROW(base::Json::Exception, ("The answer must contain a json object.")); auto rootArray = json_object_get(root.get(), "result"); if (!json_is_array(rootArray)) - MYTHROW(my::Json::Exception, ("The \"result\" field must contain a json array.")); + MYTHROW(base::Json::Exception, ("The \"result\" field must contain a json array.")); size_t const rootSize = json_array_size(rootArray); ASSERT_LESS(rootSize, 2, ("Several hotels is not supported in this method")); @@ -332,11 +332,11 @@ void FillBlocks(string const & src, string const & currency, Blocks & blocks) auto rootItem = json_array_get(rootArray, 0); if (!json_is_object(rootItem)) - MYTHROW(my::Json::Exception, ("The root item must contain a json object.")); + MYTHROW(base::Json::Exception, ("The root item must contain a json object.")); auto blocksArray = json_object_get(rootItem, "block"); if (!json_is_array(blocksArray)) - MYTHROW(my::Json::Exception, ("The \"block\" field must contain a json array.")); + MYTHROW(base::Json::Exception, ("The \"block\" field must contain a json array.")); size_t const blocksSize = json_array_size(blocksArray); for (size_t i = 0; i < blocksSize; ++i) @@ -344,7 +344,7 @@ void FillBlocks(string const & src, string const & currency, Blocks & blocks) auto block = json_array_get(blocksArray, i); if (!json_is_object(block)) - MYTHROW(my::Json::Exception, ("The block item must contain a json object.")); + MYTHROW(base::Json::Exception, ("The block item must contain a json object.")); blocks.Add(MakeBlock(block, currency)); } @@ -352,7 +352,7 @@ void FillBlocks(string const & src, string const & currency, Blocks & blocks) void FillHotelIds(string const & src, vector & ids) { - my::Json root(src.c_str()); + base::Json root(src.c_str()); auto const resultsArray = json_object_get(root.get(), "result"); auto const size = json_array_size(resultsArray); @@ -512,7 +512,7 @@ void Api::GetBlockAvailability(BlockParams && params, { FillBlocks(httpResult, params.m_currency, blocks); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.Msg())); blocks = {}; @@ -540,7 +540,7 @@ void Api::GetHotelInfo(string const & hotelId, string const & lang, { FillHotelInfo(result, info); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LINFO, ("Failed to parse json:", hotelId, result, e.what())); ClearHotelInfo(info); @@ -567,7 +567,7 @@ void Api::GetHotelAvailability(AvailabilityParams const & params, { FillHotelIds(httpResult, result); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.Msg())); result.clear(); diff --git a/partners_api/locals_api.cpp b/partners_api/locals_api.cpp index fd06b22dbd..f8bce6e258 100644 --- a/partners_api/locals_api.cpp +++ b/partners_api/locals_api.cpp @@ -24,7 +24,7 @@ void ParseError(std::string const & src, int & errorCode, std::string & message) { message.clear(); errorCode = 0; - my::Json root(src.c_str()); + base::Json root(src.c_str()); FromJSONObject(root.get(), "code", errorCode); FromJSONObject(root.get(), "message", message); } @@ -33,9 +33,9 @@ void ParseLocals(std::string const & src, std::vector & locals, bool & hasPrevious, bool & hasNext) { locals.clear(); - my::Json root(src.c_str()); - auto previousField = my::GetJSONOptionalField(root.get(), "previous"); - auto nextField = my::GetJSONOptionalField(root.get(), "next"); + base::Json root(src.c_str()); + auto previousField = base::GetJSONOptionalField(root.get(), "previous"); + auto nextField = base::GetJSONOptionalField(root.get(), "next"); hasPrevious = json_is_number(previousField); hasNext = json_is_number(nextField); auto const results = json_object_get(root.get(), "results"); @@ -117,7 +117,7 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang, LOG(LWARNING, ("Locals request failed:", errorCode, errorMessage)); return errorFn(id, errorCode, errorMessage); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LWARNING, ("Unknown error:", e.Msg(), ", response:", result)); return errorFn(id, kUnknownErrorCode, "Unknown error: " + e.Msg()); @@ -131,7 +131,7 @@ uint64_t Api::GetLocals(double lat, double lon, std::string const & lang, { ParseLocals(result, locals, hasPreviousPage, hasNextPage); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LWARNING, ("Locals response parsing failed:", e.Msg(), ", response:", result)); errorFn(id, kUnknownErrorCode, "Response parsing failed: " + e.Msg()); diff --git a/partners_api/maxim_api.cpp b/partners_api/maxim_api.cpp index ec7e05f2c1..68488b0c2a 100644 --- a/partners_api/maxim_api.cpp +++ b/partners_api/maxim_api.cpp @@ -78,7 +78,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to, { MakeFromJson(result, products); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.what(), result)); products.clear(); @@ -116,7 +116,7 @@ void MakeFromJson(std::string const & src, std::vector & products { products.clear(); - my::Json root(src.c_str()); + base::Json root(src.c_str()); if (!json_is_object(root.get())) return; diff --git a/partners_api/partners_api_tests/rutaxi_tests.cpp b/partners_api/partners_api_tests/rutaxi_tests.cpp index aca011d121..1bce6e6f9b 100644 --- a/partners_api/partners_api_tests/rutaxi_tests.cpp +++ b/partners_api/partners_api_tests/rutaxi_tests.cpp @@ -45,7 +45,7 @@ UNIT_TEST(RuTaxi_GetNearObject) TEST(!result.empty(), ()); LOG(LINFO, (result)); - my::Json root(result.c_str()); + base::Json root(result.c_str()); TEST(json_is_object(root.get()), ()); @@ -64,7 +64,7 @@ UNIT_TEST(RuTaxi_GetCost) TEST(!result.empty(), ()); LOG(LINFO, (result)); - my::Json root(result.c_str()); + base::Json root(result.c_str()); TEST(json_is_object(root.get()), ()); diff --git a/partners_api/partners_api_tests/uber_tests.cpp b/partners_api/partners_api_tests/uber_tests.cpp index d7ddf11471..51cdc9919a 100644 --- a/partners_api/partners_api_tests/uber_tests.cpp +++ b/partners_api/partners_api_tests/uber_tests.cpp @@ -41,7 +41,7 @@ UNIT_TEST(Uber_GetTimes) TEST(uber::RawApi::GetEstimatedTime(pos, result), ()); TEST(!result.empty(), ()); - my::Json timeRoot(result.c_str()); + base::Json timeRoot(result.c_str()); auto const timesArray = json_object_get(timeRoot.get(), "times"); TEST(json_is_array(timesArray), ()); @@ -59,7 +59,7 @@ UNIT_TEST(Uber_GetTimes) FromJSONObject(item, "display_name", name); FromJSONObject(item, "estimate", estimatedTime); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { TEST(false, (e.Msg())); } @@ -80,7 +80,7 @@ UNIT_TEST(Uber_GetPrices) TEST(uber::RawApi::GetEstimatedPrice(from, to, result), ()); TEST(!result.empty(), ()); - my::Json priceRoot(result.c_str()); + base::Json priceRoot(result.c_str()); auto const pricesArray = json_object_get(priceRoot.get(), "prices"); TEST(json_is_array(pricesArray), ()); @@ -109,7 +109,7 @@ UNIT_TEST(Uber_GetPrices) currency = "null"; } } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { TEST(false, (e.Msg())); } diff --git a/partners_api/rutaxi_api.cpp b/partners_api/rutaxi_api.cpp index fc617c7349..e9a65c2b04 100644 --- a/partners_api/rutaxi_api.cpp +++ b/partners_api/rutaxi_api.cpp @@ -120,7 +120,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to, { MakeNearObject(httpResult, dst); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { errorFn(ErrorCode::NoProducts); LOG(LERROR, (e.what(), httpResult)); @@ -148,7 +148,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to, { MakeProducts(result, fromObj, toObj, city, products); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.what(), result)); products.clear(); @@ -170,7 +170,7 @@ RideRequestLinks Api::GetRideRequestLinks(std::string const & productId, ms::Lat void MakeNearObject(std::string const & src, Object & dst) { - my::Json root(src.c_str()); + base::Json root(src.c_str()); auto const data = json_object_get(root.get(), "data"); auto const objects = json_object_get(data, "objects"); @@ -186,7 +186,7 @@ void MakeProducts(std::string const & src, Object const & from, Object const & t { products.clear(); - my::Json root(src.c_str()); + base::Json root(src.c_str()); std::ostringstream productStream; productStream << "city=" << city.m_id << "&title1=" << UrlEncode(from.m_title) @@ -231,7 +231,7 @@ CityMapping LoadCityMapping() try { - my::Json root(fileData.c_str()); + base::Json root(fileData.c_str()); auto const count = json_array_size(root.get()); std::string osmName; @@ -248,7 +248,7 @@ CityMapping LoadCityMapping() result.emplace(osmName, city); } } - catch (my::Json::Exception const & ex) + catch (base::Json::Exception const & ex) { LOG(LWARNING, ("Exception while parsing file:", kMappingFilepath, "reason:", ex.what(), "json:", fileData)); diff --git a/partners_api/taxi_places_loader.cpp b/partners_api/taxi_places_loader.cpp index 07f40d5db0..f51d7bedc0 100644 --- a/partners_api/taxi_places_loader.cpp +++ b/partners_api/taxi_places_loader.cpp @@ -36,7 +36,7 @@ SupportedPlaces Loader::LoadFor(Provider::Type const type) coding::DeserializerJson des(fileData); des(places); } - catch (my::Json::Exception const & ex) + catch (base::Json::Exception const & ex) { LOG(LWARNING, ("Exception while parsing file:", filename, "reason:", ex.what(), "json:", fileData)); diff --git a/partners_api/uber_api.cpp b/partners_api/uber_api.cpp index 11dbb3ca16..a90d7e5887 100644 --- a/partners_api/uber_api.cpp +++ b/partners_api/uber_api.cpp @@ -100,8 +100,8 @@ void MakeFromJson(char const * times, char const * prices, vector products.clear(); try { - my::Json timesRoot(times); - my::Json pricesRoot(prices); + base::Json timesRoot(times); + base::Json pricesRoot(prices); auto const timesArray = json_object_get(timesRoot.get(), "times"); auto const pricesArray = json_object_get(pricesRoot.get(), "prices"); if (CheckUberResponse(timesArray) && CheckUberResponse(pricesArray)) @@ -109,7 +109,7 @@ void MakeFromJson(char const * times, char const * prices, vector FillProducts(timesArray, pricesArray, products); } } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.Msg())); products.clear(); diff --git a/partners_api/viator_api.cpp b/partners_api/viator_api.cpp index ee6e208bd0..26a0d66897 100644 --- a/partners_api/viator_api.cpp +++ b/partners_api/viator_api.cpp @@ -123,7 +123,7 @@ std::string MakeUrl(std::string const & apiMethod) return os.str(); } -bool CheckAnswer(my::Json const & root) +bool CheckAnswer(base::Json const & root) { bool success; FromJSONObjectOptionalField(root.get(), "success", success); @@ -146,7 +146,7 @@ void MakeProducts(std::string const & src, std::vector & products) { products.clear(); - my::Json root(src.c_str()); + base::Json root(src.c_str()); auto const data = json_object_get(root.get(), "data"); if (!CheckAnswer(root) || !json_array_size(data)) return; @@ -214,7 +214,7 @@ void Api::GetTop5Products(std::string const & destId, std::string const & curren { MakeProducts(result, products); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.Msg())); products.clear(); diff --git a/partners_api/yandex_api.cpp b/partners_api/yandex_api.cpp index 1fdbdd0c15..0cec103a17 100644 --- a/partners_api/yandex_api.cpp +++ b/partners_api/yandex_api.cpp @@ -97,7 +97,7 @@ void Api::GetAvailableProducts(ms::LatLon const & from, ms::LatLon const & to, { MakeFromJson(result, products); } - catch (my::Json::Exception const & e) + catch (base::Json::Exception const & e) { LOG(LERROR, (e.Msg())); products.clear(); @@ -135,7 +135,7 @@ void MakeFromJson(std::string const & src, std::vector & products { products.clear(); - my::Json root(src.c_str()); + base::Json root(src.c_str()); auto const productsArray = json_object_get(root.get(), "options"); if (!CheckYandexResponse(productsArray)) return; -- cgit v1.2.3