fixup! Fix versioning appliance for vehicle data

3 files changed, 13 insertions, 10 deletions

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc
index 8a9727131e..d8a0b3abbb 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc
@@ -290,8 +290,9 @@ void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() {
             bool(*item.deprecated),
             bool(*item.removed),
             history,
-            SMember::Type::CUSTOM);  // Mark member as custom as soon as custom
-                                     // data is treated in different way
+            SMember::Type::OEM_SPECIFIC);  // Mark member as custom as soon as
+                                           // custom data is treated in
+                                           // different way
       }
       case SMemberType::SMEMBER_VDR_MOBILE: {
         // valid since struct_schema_items is not used in
@@ -308,8 +309,9 @@ void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() {
             bool(*item.deprecated),
             bool(*item.removed),
             history,
-            SMember::Type::CUSTOM);  // Mark member as custom as soon as custom
-                                     // data is treated in different way
+            SMember::Type::OEM_SPECIFIC);  // Mark member as custom as soon as
+                                           // custom data is treated in
+                                           // different way
       }
       case SMemberType::SMEMBER_MOBILE: {
         TSchemaItemParameter<VehicleDataItem> tschema_item(item);
@@ -323,8 +325,9 @@ void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() {
             bool(*item.deprecated),
             bool(*item.removed),
             history,
-            SMember::Type::CUSTOM);  // Mark member as custom as soon as custom
-                                     // data is treated in different way
+            SMember::Type::OEM_SPECIFIC);  // Mark member as custom as soon as
+                                           // custom data is treated in
+                                           // different way
       }
       case SMemberType::SMEMBER_BOOL_HMI: {
         auto member_schema =
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index 59e62d5658..0412f550a9 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -53,7 +53,7 @@ struct SMember {
   /*
    *  @brief Defines if SMember belongs to Custom Vehicle data or API data
    */
-  enum class Type { CUSTOM = 0, API = 1 };
+  enum class Type { OEM_SPECIFIC = 0, RPC_SPECIFIC = 1 };
 
   /**
    * @brief Default constructor.
@@ -73,7 +73,7 @@ struct SMember {
           const bool IsDeprecated = false,
           const bool IsRemoved = false,
           const std::vector<SMember>& history_vector = {},
-          const Type type = Type::API);
+          const Type type = Type::RPC_SPECIFIC);
 
   /**
    * @brief Checks the version a parameter was removed (until)
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index 5b003943f6..491a455959 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -54,7 +54,7 @@ SMember::SMember()
     , mIsDeprecated(false)
     , mIsRemoved(false)
     , mIsValid(true)
-    , mType(SMember::Type::API) {}
+    , mType(SMember::Type::RPC_SPECIFIC) {}
 
 SMember::SMember(const ISchemaItemPtr SchemaItem,
                  const bool IsMandatory,
@@ -88,7 +88,7 @@ SMember::SMember(const ISchemaItemPtr SchemaItem,
 bool SMember::CheckHistoryFieldVersion(
     const utils::SemanticVersion& MessageVersion) const {
   if (MessageVersion.isValid()) {
-    if (mType == Type::CUSTOM) {
+    if (mType == Type::OEM_SPECIFIC) {
       return CheckCustomVehicleData(MessageVersion);
     } else {
       return CheckAPIVehicleData(MessageVersion);