Remove redundant function validate

8 files changed, 4 insertions, 114 deletions

diff --git a/src/components/smart_objects/src/always_false_schema_item.cc b/src/components/smart_objects/src/always_false_schema_item.cc
index acbe15485b..db16640265 100644
--- a/src/components/smart_objects/src/always_false_schema_item.cc
+++ b/src/components/smart_objects/src/always_false_schema_item.cc
@@ -47,12 +47,6 @@ Errors::eType CAlwaysFalseSchemaItem::validate(const SmartObject& object) {
 }
 
 Errors::eType CAlwaysFalseSchemaItem::validate(
-    const SmartObject& object, rpc::ValidationReport* report__) {
-  report__->set_validation_info("Generic error");
-  return Errors::ERROR;
-}
-
-Errors::eType CAlwaysFalseSchemaItem::validate(
     const SmartObject& Object,
     rpc::ValidationReport* report__,
     const utils::SemanticVersion& MessageVersion) {
diff --git a/src/components/smart_objects/src/always_true_schema_item.cc b/src/components/smart_objects/src/always_true_schema_item.cc
index 8a72d606a0..0a3b8be134 100644
--- a/src/components/smart_objects/src/always_true_schema_item.cc
+++ b/src/components/smart_objects/src/always_true_schema_item.cc
@@ -43,11 +43,6 @@ Errors::eType CAlwaysTrueSchemaItem::validate(const SmartObject& object) {
   return Errors::OK;
 }
 
-Errors::eType CAlwaysTrueSchemaItem::validate(const SmartObject& object,
-                                              rpc::ValidationReport* report__) {
-  return Errors::OK;
-}
-
 Errors::eType CAlwaysTrueSchemaItem::validate(
     const SmartObject& Object,
     rpc::ValidationReport* report__,
diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc
index 108bccce11..60081c5222 100644
--- a/src/components/smart_objects/src/array_schema_item.cc
+++ b/src/components/smart_objects/src/array_schema_item.cc
@@ -47,48 +47,6 @@ Errors::eType CArraySchemaItem::validate(const SmartObject& Object) {
   return validate(Object, &report);
 }
 
-Errors::eType CArraySchemaItem::validate(const SmartObject& Object,
-                                         rpc::ValidationReport* report__) {
-  if (SmartType_Array != Object.getType()) {
-    std::string validation_info = "Incorrect type, expected: " +
-                                  SmartObject::typeToString(SmartType_Array) +
-                                  ", got: " +
-                                  SmartObject::typeToString(Object.getType());
-    report__->set_validation_info(validation_info);
-    return Errors::INVALID_VALUE;
-  }
-  size_t sizeLimit;
-  const size_t array_len = Object.length();
-
-  if (mMinSize.getValue(sizeLimit) && (array_len < sizeLimit)) {
-    std::stringstream stream;
-    stream << "Got array of size: " << array_len
-           << ", minimum allowed: " << sizeLimit;
-    std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
-    return Errors::OUT_OF_RANGE;
-  }
-  if (mMaxSize.getValue(sizeLimit) && (array_len > sizeLimit)) {
-    std::stringstream stream;
-    stream << "Got array of size: " << array_len
-           << ", maximum allowed: " << sizeLimit;
-    std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
-    return Errors::OUT_OF_RANGE;
-  }
-
-  for (size_t i = 0u; i < array_len; ++i) {
-    std::stringstream strVal;
-    strVal << i;
-    const Errors::eType result = mElementSchemaItem->validate(
-        Object.getElement(i), &report__->ReportSubobject(strVal.str()));
-    if (Errors::OK != result) {
-      return result;
-    }
-  }
-  return Errors::OK;
-}
-
 Errors::eType CArraySchemaItem::validate(
     const SmartObject& Object,
     rpc::ValidationReport* report__,
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index 533f3b5e2c..879c280a67 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -109,44 +109,6 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& object) {
   return validate(object, &report);
 }
 
-Errors::eType CObjectSchemaItem::validate(const SmartObject& object,
-                                          rpc::ValidationReport* report__) {
-  if (SmartType_Map != object.getType()) {
-    std::string validation_info = "Incorrect type, expected: " +
-                                  SmartObject::typeToString(SmartType_Map) +
-                                  ", got: " +
-                                  SmartObject::typeToString(object.getType());
-    report__->set_validation_info(validation_info);
-    return Errors::INVALID_VALUE;
-  }
-
-  std::set<std::string> object_keys = object.enumerate();
-
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
-       ++it) {
-    const std::string& key = it->first;
-    const SMember& member = it->second;
-
-    std::set<std::string>::const_iterator key_it = object_keys.find(key);
-    if (object_keys.end() == key_it) {
-      if (member.mIsMandatory) {
-        std::string validation_info = "Missing mandatory parameter: " + key;
-        report__->set_validation_info(validation_info);
-        return Errors::MISSING_MANDATORY_PARAMETER;
-      }
-      continue;
-    }
-    const SmartObject& field = object.getElement(key);
-    const Errors::eType result =
-        member.mSchemaItem->validate(field, &report__->ReportSubobject(key));
-    if (Errors::OK != result) {
-      return result;
-    }
-    object_keys.erase(key_it);
-  }
-  return Errors::OK;
-}
-
 Errors::eType CObjectSchemaItem::validate(
     const SmartObject& object,
     rpc::ValidationReport* report__,
diff --git a/src/components/smart_objects/src/schema_item.cc b/src/components/smart_objects/src/schema_item.cc
index 001aa5fc5d..ae7f3665bb 100644
--- a/src/components/smart_objects/src/schema_item.cc
+++ b/src/components/smart_objects/src/schema_item.cc
@@ -39,11 +39,6 @@ Errors::eType ISchemaItem::validate(const SmartObject& Object) {
   return Errors::ERROR;
 }
 
-Errors::eType ISchemaItem::validate(const SmartObject& object,
-                                    rpc::ValidationReport* report__) {
-  return Errors::ERROR;
-}
-
 Errors::eType ISchemaItem::validate(
     const SmartObject& object,
     rpc::ValidationReport* report__,
diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc
index 527a4308f8..691f45f63b 100644
--- a/src/components/smart_objects/src/smart_object.cc
+++ b/src/components/smart_objects/src/smart_object.cc
@@ -878,10 +878,6 @@ Errors::eType SmartObject::validate() {
   return validate(&report);
 }
 
-Errors::eType SmartObject::validate(rpc::ValidationReport* report__) {
-  return m_schema.validate(*this, report__);
-}
-
 Errors::eType SmartObject::validate(
     rpc::ValidationReport* report__,
     const utils::SemanticVersion& MessageVersion) {
diff --git a/src/components/smart_objects/src/smart_schema.cc b/src/components/smart_objects/src/smart_schema.cc
index 154f9e116f..3ab94caf85 100644
--- a/src/components/smart_objects/src/smart_schema.cc
+++ b/src/components/smart_objects/src/smart_schema.cc
@@ -45,11 +45,6 @@ Errors::eType CSmartSchema::validate(const SmartObject& Object) const {
   return validate(Object, &report);
 }
 
-Errors::eType CSmartSchema::validate(const SmartObject& object,
-                                     rpc::ValidationReport* report__) const {
-  return mSchemaItem->validate(object, report__);
-}
-
 Errors::eType CSmartSchema::validate(
     const SmartObject& object,
     rpc::ValidationReport* report__,
diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc
index cc6bf79f60..f3c39eff8f 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -51,8 +51,10 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object) {
   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) +
@@ -84,13 +86,6 @@ Errors::eType CStringSchemaItem::validate(const SmartObject& Object,
   return Errors::OK;
 }
 
-Errors::eType CStringSchemaItem::validate(
-    const SmartObject& Object,
-    rpc::ValidationReport* report__,
-    const utils::SemanticVersion& MessageVersion) {
-  return validate(Object, report__);
-}
-
 SmartType CStringSchemaItem::getSmartType() const {
   return SmartType_String;
 }