Smart Object Update

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

diff --git a/src/components/smart_objects/CMakeLists.txt b/src/components/smart_objects/CMakeLists.txt
index 02d4797..a64fa61 100644 (file)
--- a/src/components/smart_objects/CMakeLists.txt
+++ b/src/components/smart_objects/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories (
   ./include
   ../utils/include/
+  ../application_manager/include
 )
 
 set (SOURCES
@@ -19,4 +20,8 @@ set (SOURCES
 )
 
 add_library("SmartObjects" ${SOURCES})
-target_link_libraries ("SmartObjects" log4cxx)
+
+if(ENABLE_LOG)
+  target_link_libraries("SmartObjects" log4cxx)
+endif()
+

diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index d541608..df9728e 100644 (file)
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -31,6 +31,7 @@
 #include "smart_objects/always_false_schema_item.h"
 #include "smart_objects/object_schema_item.h"
 #include "smart_objects/smart_object.h"
+#include "application_manager/smart_object_keys.h"
 
 namespace smart_objects_ns = NsSmartDeviceLink::NsSmartObjects;
 
@@ -55,6 +56,7 @@ utils::SharedPtr<CObjectSchemaItem> CObjectSchemaItem::create(
 }
 
 Errors::eType CObjectSchemaItem::validate(const SmartObject& Object) {
+  static bool is_valid = false;
   Errors::eType result = Errors::ERROR;
 
   if (SmartType_Map == Object.getType()) {
@@ -64,7 +66,18 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& Object) {
     for (std::map<std::string, CObjectSchemaItem::SMember>::const_iterator i =
         mMembers.begin(); i != mMembers.end(); ++i) {
       if (objectKeys.end() != objectKeys.find(i->first)) {
+        if (i->first == application_manager::strings::msg_params) {
+          is_valid = false;
+        }
+
         result = i->second.mSchemaItem->validate(Object.getElement(i->first));
+
+        if (i->first == application_manager::strings::msg_params) {
+          if (!is_valid) {
+            result = Errors::ERROR;
+          }
+        }
+
       } else {
         if (i->second.mIsMandatory) {
           result = Errors::MISSING_MANDATORY_PARAMETER;
@@ -85,6 +98,11 @@ Errors::eType CObjectSchemaItem::validate(const SmartObject& Object) {
         }
       }
     }
+
+    if (Errors::OK == result) {
+      is_valid = true;
+    }
+
   } else {
     result = Errors::INVALID_VALUE;
   }