Fix build errors from merge and remove quotes from error messages

3 files changed, 10 insertions, 17 deletions

diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc
index ad341d9b49..4c6731c159 100644
--- a/src/components/smart_objects/src/array_schema_item.cc
+++ b/src/components/smart_objects/src/array_schema_item.cc
@@ -45,8 +45,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object,
                                          std::string& errorMessage) {
   if (SmartType_Array != Object.getType()) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     errorMessage += "Incorrect type, expected: " +
                     SmartObject::typeToString(SmartType_Array) + ", got: " +
@@ -58,8 +57,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object,
 
   if (mMinSize.getValue(sizeLimit) && (array_len < sizeLimit)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Got array of size: " << array_len
@@ -69,8 +67,7 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object,
   }
   if (mMaxSize.getValue(sizeLimit) && (array_len > sizeLimit)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Got array of size: " << array_len
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index dae4ebbe26..997f72b6ac 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -60,8 +60,7 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object,
                                           std::string& errorMessage) {
   if (SmartType_Map != object.getType()) {
     if (!object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + object.getKey() + ". ");
     }
     errorMessage += "Incorrect type, expected: " +
                     SmartObject::typeToString(SmartType_Map) + ", got: " +
@@ -80,10 +79,10 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object,
     if (object_keys.end() == key_it) {
       if (member.mIsMandatory) {
         if (!object.getKey().empty()) {
-          errorMessage.assign("Validation failed for \"" + object.getKey() +
-                              "\". ");
+          errorMessage.assign("Validation failed for " + object.getKey() +
+                              ". ");
         }
-        errorMessage += "Missing mandatory parameter: \"" + key + "\"";
+        errorMessage += "Missing mandatory parameter: " + key;
         return Errors::MISSING_MANDATORY_PARAMETER;
       }
       continue;
diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc
index 88373cc172..63d01f0c18 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -49,8 +49,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
                                           std::string& errorMessage) {
   if (SmartType_String != Object.getType()) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     errorMessage += "Incorrect type, expected: " +
                     SmartObject::typeToString(SmartType_String) + ", got: " +
@@ -63,8 +62,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
 
   if (mMinLength.getValue(length) && (value.size() < length)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Got string of size: " << value.size()
@@ -74,8 +72,7 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
   }
   if (mMaxLength.getValue(length) && (value.size() > length)) {
     if (!Object.getKey().empty()) {
-      errorMessage.assign("Validation failed for \"" + Object.getKey() +
-                          "\". ");
+      errorMessage.assign("Validation failed for " + Object.getKey() + ". ");
     }
     std::stringstream stream;
     stream << "Got string of size: " << value.size()