1 files changed, 15 insertions, 17 deletions

diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc
index 1e4c8372f0..0288ad85e8 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -33,32 +33,30 @@
 #include "smart_objects/string_schema_item.h"
 #include "utils/custom_string.h"
 
-namespace NsSmartDeviceLink {
-namespace NsSmartObjects {
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
 
 namespace custom_str = utils::custom_string;
 
-utils::SharedPtr<CStringSchemaItem> CStringSchemaItem::create(
+std::shared_ptr<CStringSchemaItem> CStringSchemaItem::create(
     const TSchemaItemParameter<size_t>& MinLength,
     const TSchemaItemParameter<size_t>& MaxLength,
     const TSchemaItemParameter<std::string>& DefaultValue) {
-  return new CStringSchemaItem(MinLength, MaxLength, DefaultValue);
+  return std::shared_ptr<CStringSchemaItem>(
+      new CStringSchemaItem(MinLength, MaxLength, DefaultValue));
 }
 
-Errors::eType CStringSchemaItem::validate(const SmartObject& Object) {
-  rpc::ValidationReport report("RPC");
-  return validate(Object, &report);
-}
-
-Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
-                                          rpc::ValidationReport* report__) {
+errors::eType CStringSchemaItem::validate(
+    const SmartObject& Object,
+    rpc::ValidationReport* report__,
+    const utils::SemanticVersion& MessageVersion) {
   if (SmartType_String != Object.getType()) {
     std::string validation_info = "Incorrect type, expected: " +
                                   SmartObject::typeToString(SmartType_String) +
                                   ", got: " +
                                   SmartObject::typeToString(Object.getType());
     report__->set_validation_info(validation_info);
-    return Errors::INVALID_VALUE;
+    return errors::INVALID_VALUE;
   }
 
   const custom_str::CustomString value = Object.asCustomString();
@@ -70,7 +68,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
            << ", minimum allowed: " << length;
     std::string validation_info = stream.str();
     report__->set_validation_info(validation_info);
-    return Errors::OUT_OF_RANGE;
+    return errors::OUT_OF_RANGE;
   }
   if (mMaxLength.getValue(length) && (value.size() > length)) {
     std::stringstream stream;
@@ -78,9 +76,9 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
            << ", maximum allowed: " << length;
     std::string validation_info = stream.str();
     report__->set_validation_info(validation_info);
-    return Errors::OUT_OF_RANGE;
+    return errors::OUT_OF_RANGE;
   }
-  return Errors::OK;
+  return errors::OK;
 }
 
 SmartType CStringSchemaItem::getSmartType() const {
@@ -99,5 +97,5 @@ CStringSchemaItem::CStringSchemaItem(
     , mMinLength(MinLength)
     , mMaxLength(MaxLength) {}
 
-}  // namespace NsSmartObjects
-}  // namespace NsSmartDeviceLink
+}  // namespace ns_smart_objects
+}  // namespace ns_smart_device_link