1 files changed, 12 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 f82ce9378c..1e4c8372f0 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -46,19 +46,18 @@ utils::SharedPtr<CStringSchemaItem> CStringSchemaItem::create(
 }
 
 Errors::eType CStringSchemaItem::validate(const SmartObject& Object) {
-  std::string errorMessage;
-  return validate(Object, errorMessage);
+  rpc::ValidationReport report("RPC");
+  return validate(Object, &report);
 }
 
 Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
-                                          std::string& errorMessage) {
+                                          rpc::ValidationReport* report__) {
   if (SmartType_String != Object.getType()) {
-    if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
-    }
-    errorMessage += "Incorrect type, expected: " +
-                    SmartObject::typeToString(SmartType_String) + ", got: " +
-                    SmartObject::typeToString(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;
   }
 
@@ -66,23 +65,19 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
   size_t length;
 
   if (mMinLength.getValue(length) && (value.size() < length)) {
-    if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
-    }
     std::stringstream stream;
     stream << "Got string of size: " << value.size()
            << ", minimum allowed: " << length;
-    errorMessage += stream.str();
+    std::string validation_info = stream.str();
+    report__->set_validation_info(validation_info);
     return Errors::OUT_OF_RANGE;
   }
   if (mMaxLength.getValue(length) && (value.size() > length)) {
-    if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
-    }
     std::stringstream stream;
     stream << "Got string of size: " << value.size()
            << ", maximum allowed: " << length;
-    errorMessage += stream.str();
+    std::string validation_info = stream.str();
+    report__->set_validation_info(validation_info);
     return Errors::OUT_OF_RANGE;
   }
   return Errors::OK;