Reverts device certificate support.

This functionality is already present in develop and won't be moved to master hotfix.

5 files changed, 4 insertions, 27 deletions

diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.cc b/src/components/policy/src/policy/policy_table/table_struct/types.cc
index d64b234ddf..08ed6ca7df 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/types.cc
+++ b/src/components/policy/src/policy/policy_table/table_struct/types.cc
@@ -398,8 +398,7 @@ ModuleConfig::ModuleConfig(const Json::Value *value__)
           impl::ValueMember(value__, "notifications_per_minute_by_priority")),
       vehicle_make(impl::ValueMember(value__, "vehicle_make")),
       vehicle_model(impl::ValueMember(value__, "vehicle_model")),
-      vehicle_year(impl::ValueMember(value__, "vehicle_year")),
-      certificate(impl::ValueMember(value__, "certificate")) {}
+      vehicle_year(impl::ValueMember(value__, "vehicle_year")) {}
 
 void ModuleConfig::SafeCopyFrom(const ModuleConfig &from) {
   //  device_certificates = from.device_certificates;  // According to the
@@ -416,12 +415,10 @@ void ModuleConfig::SafeCopyFrom(const ModuleConfig &from) {
   vehicle_make.assign_if_valid(from.vehicle_make);
   vehicle_model.assign_if_valid(from.vehicle_model);
   vehicle_year.assign_if_valid(from.vehicle_year);
-  certificate.assign_if_valid(from.certificate);
 }
 
 Json::Value ModuleConfig::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
-  impl::WriteJsonField("certificate", certificate, &result__);
   impl::WriteJsonField("preloaded_pt", preloaded_pt, &result__);
   impl::WriteJsonField("exchange_after_x_ignition_cycles",
                        exchange_after_x_ignition_cycles, &result__);
@@ -442,9 +439,6 @@ Json::Value ModuleConfig::ToJsonValue() const {
   return result__;
 }
 bool ModuleConfig::is_valid() const {
-  if (!certificate.is_valid()) {
-    return false;
-  }
   if (!preloaded_pt.is_valid()) {
     return false;
   }
@@ -484,9 +478,6 @@ bool ModuleConfig::is_initialized() const {
   return (initialization_state__ != kUninitialized) || (!struct_empty());
 }
 bool ModuleConfig::struct_empty() const {
-  if (certificate.is_initialized()) {
-    return false;
-  }
   if (preloaded_pt.is_initialized()) {
     return false;
   }
@@ -532,9 +523,6 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport *report__) const {
   if (struct_empty()) {
     rpc::CompositeType::ReportErrors(report__);
   }
-  if (!certificate.is_valid()) {
-    certificate.ReportErrors(&report__->ReportSubobject("certificate"));
-  }
   if (!preloaded_pt.is_valid()) {
     preloaded_pt.ReportErrors(&report__->ReportSubobject("preloaded_pt"));
   }
@@ -595,7 +583,6 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport *report__) const {
 
 void ModuleConfig::SetPolicyTableType(PolicyTableType pt_type) {
   CompositeType::SetPolicyTableType(pt_type);
-  certificate.SetPolicyTableType(pt_type);
   preloaded_pt.SetPolicyTableType(pt_type);
   exchange_after_x_ignition_cycles.SetPolicyTableType(pt_type);
   exchange_after_x_kilometers.SetPolicyTableType(pt_type);
diff --git a/src/components/policy/src/policy/policy_table/table_struct/types.h b/src/components/policy/src/policy/policy_table/table_struct/types.h
index 96361d3c49..1ac850ae9a 100644
--- a/src/components/policy/src/policy/policy_table/table_struct/types.h
+++ b/src/components/policy/src/policy/policy_table/table_struct/types.h
@@ -187,7 +187,6 @@ public:
   Optional<String<1, 100>> vehicle_make;
   Optional<String<1, 100>> vehicle_model;
   Optional<String<4, 4>> vehicle_year;
-  Optional<String<0, 65535>> certificate;
 
 public:
   ModuleConfig();
diff --git a/src/components/policy/src/policy/src/policy_manager_impl.cc b/src/components/policy/src/policy/src/policy_manager_impl.cc
index 4f73719d53..0e73a465d8 100644
--- a/src/components/policy/src/policy/src/policy_manager_impl.cc
+++ b/src/components/policy/src/policy/src/policy_manager_impl.cc
@@ -182,11 +182,6 @@ bool PolicyManagerImpl::LoadPT(const std::string &file,
     return false;
   }
 
-  if (pt_update->policy_table.module_config.certificate.is_initialized()) {
-    listener_->OnCertificateUpdated(
-        *(pt_update->policy_table.module_config.certificate));
-  }
-
   std::map<std::string, StringArray> app_hmi_types;
   cache_->GetHMIAppTypeAfterUpdate(app_hmi_types);
   if (!app_hmi_types.empty()) {
diff --git a/src/components/policy/src/policy/src/sql_pt_queries.cc b/src/components/policy/src/policy/src/sql_pt_queries.cc
index 86b70bebd4..150934615f 100644
--- a/src/components/policy/src/policy/src/sql_pt_queries.cc
+++ b/src/components/policy/src/policy/src/sql_pt_queries.cc
@@ -74,8 +74,7 @@ const std::string kCreateSchema =
     "  `timeout_after_x_seconds` INTEGER NOT NULL, "
     "  `vehicle_make` VARCHAR(45), "
     "  `vehicle_model` VARCHAR(45), "
-    "  `vehicle_year` VARCHAR(4), "
-    "  `certificate` VARCHAR (45) "
+    "  `vehicle_year` VARCHAR(4)"
     "); "
     "CREATE TABLE IF NOT EXISTS `functional_group`( "
     "  `id` INTEGER PRIMARY KEY NOT NULL, "
@@ -519,7 +518,7 @@ const std::string kUpdateModuleConfig =
     "  `exchange_after_x_ignition_cycles` = ?,"
     "  `exchange_after_x_kilometers` = ?, `exchange_after_x_days` = ?, "
     "  `timeout_after_x_seconds` = ?, `vehicle_make` = ?, "
-    "  `vehicle_model` = ?, `vehicle_year` = ?, `certificate` = ?";
+    "  `vehicle_model` = ?, `vehicle_year` = ?";
 
 const std::string kInsertEndpoint =
     "INSERT INTO `endpoint` (`service`, `url`, `application_id`) "
@@ -566,7 +565,7 @@ const std::string kSelectModuleConfig =
     "SELECT `preloaded_pt`, `exchange_after_x_ignition_cycles`, "
     " `exchange_after_x_kilometers`, `exchange_after_x_days`, "
     " `timeout_after_x_seconds`, `vehicle_make`,"
-    " `vehicle_model`, `vehicle_year`, `certificate` "
+    " `vehicle_model`, `vehicle_year` "
     " FROM `module_config`";
 
 const std::string kSelectEndpoints =
diff --git a/src/components/policy/src/policy/src/sql_pt_representation.cc b/src/components/policy/src/policy/src/sql_pt_representation.cc
index 9b7205e171..b0afde343e 100644
--- a/src/components/policy/src/policy/src/sql_pt_representation.cc
+++ b/src/components/policy/src/policy/src/sql_pt_representation.cc
@@ -494,7 +494,6 @@ void SQLPTRepresentation::GatherModuleConfig(
     *config->vehicle_make = query.GetString(5);
     *config->vehicle_model = query.GetString(6);
     *config->vehicle_year = query.GetString(7);
-    *config->certificate = query.GetString(8);
   }
 
   dbms::SQLQuery endpoints(db());
@@ -1042,8 +1041,6 @@ bool SQLPTRepresentation::SaveModuleConfig(
                                         : query.Bind(6);
   config.vehicle_year.is_initialized() ? query.Bind(7, *(config.vehicle_year))
                                        : query.Bind(7);
-  config.certificate.is_initialized() ? query.Bind(8, *(config.certificate))
-                                      : query.Bind(8);
 
   if (!query.Exec()) {
     LOG4CXX_WARN(logger_, "Incorrect update module config");