1 files changed, 20 insertions, 37 deletions

diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc
index 0e3070e524..a0925eef05 100644
--- a/src/components/smart_objects/src/smart_object.cc
+++ b/src/components/smart_objects/src/smart_object.cc
@@ -50,18 +50,17 @@ namespace NsSmartObjects {
  **/
 static const char* invalid_cstr_value = "";
 
-SmartObject::SmartObject() : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+SmartObject::SmartObject() : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
 }
 
 SmartObject::SmartObject(const SmartObject& Other)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   duplicate(Other);
 }
 
-SmartObject::SmartObject(SmartType Type)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+SmartObject::SmartObject(SmartType Type) : m_type(SmartType_Null), m_schema() {
   switch (Type) {
     case SmartType_Null:
       break;
@@ -105,8 +104,6 @@ SmartObject::SmartObject(SmartType Type)
 
 SmartObject::~SmartObject() {
   cleanup_data();
-  delete m_key;
-  m_key = NULL;
 }
 
 SmartObject& SmartObject::operator=(const SmartObject& Other) {
@@ -116,7 +113,7 @@ SmartObject& SmartObject::operator=(const SmartObject& Other) {
 }
 
 bool SmartObject::operator==(const SmartObject& Other) const {
-  if (m_type != Other.m_type || m_key != Other.m_key)
+  if (m_type != Other.m_type)
     return false;
 
   switch (m_type) {
@@ -171,7 +168,7 @@ bool SmartObject::operator==(const SmartObject& Other) const {
 }
 
 SmartObject::SmartObject(int32_t InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_integer(InitialValue);
 }
@@ -228,7 +225,7 @@ int64_t SmartObject::convert_int() const {
 }
 
 SmartObject::SmartObject(uint32_t InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_integer(InitialValue);
 }
@@ -257,7 +254,7 @@ bool SmartObject::operator==(const uint32_t Value) const {
 }
 
 SmartObject::SmartObject(int64_t InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_integer(InitialValue);
 }
@@ -285,7 +282,7 @@ SmartObject& SmartObject::operator=(const uint64_t NewValue) {
 }
 
 SmartObject::SmartObject(double InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_double(InitialValue);
 }
@@ -331,7 +328,7 @@ double SmartObject::convert_double() const {
 }
 
 SmartObject::SmartObject(bool InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_bool(InitialValue);
 }
@@ -376,7 +373,7 @@ bool SmartObject::convert_bool() const {
 }
 
 SmartObject::SmartObject(char InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_char(InitialValue);
 }
@@ -425,13 +422,13 @@ char SmartObject::convert_char() const {
 // =============================================================
 
 SmartObject::SmartObject(const custom_str::CustomString& InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_string(InitialValue);
 }
 
 SmartObject::SmartObject(const std::string& InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_string(custom_str::CustomString(InitialValue));
 }
@@ -511,7 +508,7 @@ custom_str::CustomString SmartObject::convert_custom_string() const {
 // =============================================================
 
 SmartObject::SmartObject(const char* const InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_cstr(InitialValue);
   return;
@@ -541,7 +538,7 @@ void SmartObject::set_value_cstr(const char* NewValue) {
 // BINARY TYPE SUPPORT
 // =============================================================
 SmartObject::SmartObject(const SmartBinary& InitialValue)
-    : m_type(SmartType_Null), m_schema(), m_key(NULL) {
+    : m_type(SmartType_Null), m_schema() {
   m_data.str_value = NULL;
   set_value_binary(InitialValue);
 }
@@ -726,10 +723,6 @@ void SmartObject::duplicate(const SmartObject& OtherObject) {
   }
   m_schema = OtherObject.m_schema;
 
-  if (OtherObject.m_key) {
-    setKey(*OtherObject.m_key);
-  }
-
   cleanup_data();
 
   m_type = newType;
@@ -845,15 +838,6 @@ SmartType SmartObject::getType() const {
   return m_type;
 }
 
-void SmartObject::setKey(const std::string& NewKey) {
-  delete m_key;
-  m_key = new std::string(NewKey);
-}
-
-std::string SmartObject::getKey() const {
-  return (m_key == NULL) ? "" : *m_key;
-}
-
 std::string SmartObject::OperatorToTransform(const SmartMap::value_type& pair) {
   return pair.first;
 }
@@ -885,18 +869,17 @@ bool SmartObject::erase(const std::string& Key) {
 }
 
 bool SmartObject::isValid() const {
-  std::string errorMessage;
-
-  return (Errors::OK == m_schema.validate(*this, errorMessage));
+  rpc::ValidationReport report("RPC");
+  return (Errors::OK == m_schema.validate(*this, &report));
 }
 
 Errors::eType SmartObject::validate() {
-  std::string errorMessage;
-  return validate(errorMessage);
+  rpc::ValidationReport report("RPC");
+  return validate(&report);
 }
 
-Errors::eType SmartObject::validate(std::string& errorMessage) {
-  return m_schema.validate(*this, errorMessage);
+Errors::eType SmartObject::validate(rpc::ValidationReport* report__) {
+  return m_schema.validate(*this, report__);
 }
 
 void SmartObject::setSchema(const CSmartSchema& schema) {