1 files changed, 22 insertions, 21 deletions

diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index f2cc3eac41..f0c17faaea 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -45,17 +45,14 @@ namespace NsSmartDeviceLink {
 namespace NsSmartObjects {
 
 CObjectSchemaItem::SMember::SMember()
-  : mSchemaItem(CAlwaysFalseSchemaItem::create()),
-    mIsMandatory(true) {
-}
+    : mSchemaItem(CAlwaysFalseSchemaItem::create()), mIsMandatory(true) {}
 
 CObjectSchemaItem::SMember::SMember(const ISchemaItemPtr SchemaItem,
                                     const bool IsMandatory)
-  : mSchemaItem(SchemaItem),
-    mIsMandatory(IsMandatory) {
-}
+    : mSchemaItem(SchemaItem), mIsMandatory(IsMandatory) {}
 
-utils::SharedPtr<CObjectSchemaItem> CObjectSchemaItem::create(const Members& members) {
+utils::SharedPtr<CObjectSchemaItem> CObjectSchemaItem::create(
+    const Members& members) {
   return new CObjectSchemaItem(members);
 }
 
@@ -66,7 +63,8 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object) {
 
   std::set<std::string> object_keys = object.enumerate();
 
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end(); ++it) {
+  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
+       ++it) {
     const std::string& key = it->first;
     const SMember& member = it->second;
 
@@ -98,7 +96,8 @@ void CObjectSchemaItem::applySchema(SmartObject& Object,
   }
 
   SmartObject default_value;
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end(); ++it) {
+  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
+       ++it) {
     const std::string& key = it->first;
     const SMember& member = it->second;
     if (!Object.keyExists(key)) {
@@ -127,7 +126,8 @@ void CObjectSchemaItem::unapplySchema(SmartObject& Object) {
     }
   }
 
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end(); ++it) {
+  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
+       ++it) {
     const std::string& key = it->first;
     const SMember& member = it->second;
     if (Object.keyExists(key)) {
@@ -136,18 +136,19 @@ void CObjectSchemaItem::unapplySchema(SmartObject& Object) {
   }
 }
 
-void CObjectSchemaItem::BuildObjectBySchema(
-  const SmartObject& pattern_object, SmartObject& result_object) {
+void CObjectSchemaItem::BuildObjectBySchema(const SmartObject& pattern_object,
+                                            SmartObject& result_object) {
   result_object = SmartObject(SmartType_Map);
   const bool pattern_is_map = SmartType_Map == pattern_object.getType();
 
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end(); ++it) {
+  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
+       ++it) {
     const std::string& key = it->first;
     const SMember& member = it->second;
     const bool pattern_exists = pattern_is_map && pattern_object.keyExists(key);
     member.mSchemaItem->BuildObjectBySchema(
-          pattern_exists ? pattern_object.getElement(key) : SmartObject(),
-          result_object[key]);
+        pattern_exists ? pattern_object.getElement(key) : SmartObject(),
+        result_object[key]);
   }
 }
 
@@ -156,17 +157,17 @@ size_t CObjectSchemaItem::GetMemberSize() {
 }
 
 CObjectSchemaItem::CObjectSchemaItem(const Members& members)
-  : mMembers(members) {}
+    : mMembers(members) {}
 
 void CObjectSchemaItem::RemoveFakeParams(SmartObject& Object) {
-  for (SmartMap::const_iterator it = Object.map_begin(); it != Object.map_end(); ) {
+  for (SmartMap::const_iterator it = Object.map_begin();
+       it != Object.map_end();) {
     const std::string& key = it->first;
     if (mMembers.end() == mMembers.find(key)
         // FIXME(EZamakhov): Remove illegal usage of filed in AM
-        && key.compare(connection_key) != 0
-        && key.compare(binary_data) != 0
-        && key.compare(app_id) != 0
-    ) {
+        &&
+        key.compare(connection_key) != 0 && key.compare(binary_data) != 0 &&
+        key.compare(app_id) != 0) {
       ++it;
       Object.erase(key);
     } else {