diff options
author | Andrey Oleynik <AOleynik@luxoft.com> | 2014-07-16 10:39:03 +0300 |
---|---|---|
committer | Andrey Oleynik <AOleynik@luxoft.com> | 2014-07-16 10:39:03 +0300 |
commit | 04e0bf1ae4575d9bf7e5a785313e328ecc526608 (patch) | |
tree | 24645c767e88b7ea8e36b0ccd897331c969d5036 | |
parent | 526b94ae2ebb4d36927910523eacdc9f18c84734 (diff) | |
download | sdl_core-04e0bf1ae4575d9bf7e5a785313e328ecc526608.tar.gz |
APPLINK-8176. Remove adding of HTTP header to PTS completely.
3 files changed, 0 insertions, 42 deletions
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h index 2019ad6b22..56480fa28f 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h @@ -227,12 +227,6 @@ class PolicyHandler : bool is_allowed); /** - * Adds http header (temporary method) - * @param pt_string string without htt header - */ - BinaryMessageSptr AddHttpHeader(const BinaryMessageSptr& pt_string); - - /** * Checks whether application is revoked * @param app_id id application * @return true if application is revoked diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index a866e8a614..15e7a325d7 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -506,40 +506,6 @@ void PolicyHandler::OnPendingPermissionChange( } } -BinaryMessageSptr PolicyHandler::AddHttpHeader( - const BinaryMessageSptr& pt_string) { - // Creating new value to avoid backslashes with direct converting from string - Json::Value policy_table(Json::objectValue); - Json::Reader reader; - reader.parse(std::string(pt_string->begin(), pt_string->end()), policy_table); - - Json::Value packet(Json::objectValue); - packet["HTTPRequest"] = Json::Value(Json::objectValue); - packet["HTTPRequest"]["headers"] = Json::Value(Json::objectValue); - packet["HTTPRequest"]["headers"]["ContentType"] = Json::Value("application/json"); - packet["HTTPRequest"]["headers"]["ConnectTimeout"] = - Json::Value(policy_manager_->TimeoutExchange()); - packet["HTTPRequest"]["headers"]["DoOutput"] = Json::Value(true); - packet["HTTPRequest"]["headers"]["DoInput"] = Json::Value(true); - packet["HTTPRequest"]["headers"]["UseCaches"] = Json::Value(false); - packet["HTTPRequest"]["headers"]["RequestMethod"] = Json::Value("POST"); - packet["HTTPRequest"]["headers"]["ReadTimeout"] = - Json::Value(policy_manager_->TimeoutExchange()); - packet["HTTPRequest"]["headers"]["InstanceFollowRedirects"] = - Json::Value(false); - packet["HTTPRequest"]["headers"]["charset"] = Json::Value("utf-8"); - packet["HTTPRequest"]["headers"]["Content_Length"] = - Json::Value(static_cast<int>(pt_string->size())); - packet["HTTPRequest"]["body"] = Json::Value(Json::objectValue); - packet["HTTPRequest"]["body"]["data"] = Json::Value(Json::objectValue); - packet["HTTPRequest"]["body"]["data"] = policy_table; - - Json::StyledWriter writer; - std::string message = writer.write(packet); - LOG4CXX_DEBUG(logger_, "Packet PT: " << message); - return new BinaryMessage(message.begin(), message.end()); -} - bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string) { LOG4CXX_INFO(logger_, "PolicyHandler::SendMessageToSDK"); POLICY_LIB_CHECK(false); diff --git a/src/components/application_manager/src/policies/pt_exchange_handler_ext.cc b/src/components/application_manager/src/policies/pt_exchange_handler_ext.cc index 162964a3cd..a5c69172e9 100644 --- a/src/components/application_manager/src/policies/pt_exchange_handler_ext.cc +++ b/src/components/application_manager/src/policies/pt_exchange_handler_ext.cc @@ -68,8 +68,6 @@ void PTExchangeHandlerExt::Start() { Profile::instance()->policies_snapshot_file_name(); BinaryMessageSptr pt_snapshot = policy_manager->RequestPTUpdate(); if (pt_snapshot.valid()) { - // TODO(AOleynik): Disabled until futher clarification with customer - // pt_snapshot = policy_handler_->AddHttpHeader(pt_snapshot); if (file_system::WriteBinaryFile(policy_snapshot_file_name, *pt_snapshot)) { MessageHelper::SendPolicyUpdate(policy_snapshot_file_name, policy_manager->TimeoutExchange(), |