[messaging] AbstractFilter::isMatching(json) interface.

+ Created AbstractFilter::isMatching(picojson::value) method to prepare
for plain json filtering.

[Verification] Code compiles.

Signed-off-by: Michal Michalski <m.michalski2@partner.samsung.com>
Change-Id: I4e9cfc7343a33c3af71250f827ed39c8b7d1c74b

diff --git a/src/messaging/MsgCommon/AbstractFilter.cpp b/src/messaging/MsgCommon/AbstractFilter.cpp
index be6aca8..c308c96 100644 (file)
--- a/src/messaging/MsgCommon/AbstractFilter.cpp
+++ b/src/messaging/MsgCommon/AbstractFilter.cpp
@@ -15,13 +15,9 @@
  */
 
 #include "AbstractFilter.h"
-//#include "JSAttributeFilter.h"
-//#include "JSAttributeRangeFilter.h"
-//#include "JSCompositeFilter.h"
 #include "common/logger.h"
 #include "common/platform_exception.h"
 #include "common/tools.h"
-//#include <JSUtil.h>
 #include <algorithm>
 #include <limits>
 
@@ -47,6 +43,11 @@ bool AbstractFilter::isMatching(const FilterableObject* const tested_object) con
   return false;
 }
 
+bool AbstractFilter::isMatching(const picojson::value& json) const {
+  LoggerE("Calling isMatching on AbstractFilter!");
+  return false;
+}
+
 namespace {
 
 std::string convertToLowerCase(const std::string& input_string) {

diff --git a/src/messaging/MsgCommon/AbstractFilter.h b/src/messaging/MsgCommon/AbstractFilter.h
index 0a22f03..71c2ec4 100644 (file)
--- a/src/messaging/MsgCommon/AbstractFilter.h
+++ b/src/messaging/MsgCommon/AbstractFilter.h
@@ -59,34 +59,13 @@ class AbstractFilter {
 
   FilterType getFilterType() const;
 
-  //    static JSValueRef makeJSValue(JSContextRef context, AbstractFilterPtr priv);
-  //    static AbstractFilterPtr getPrivateObject(JSContextRef context,
-  //            JSValueRef value);
-
   virtual bool isMatching(const FilterableObject* const filtered_object) const;
+  virtual bool isMatching(const picojson::value& json) const;
 
  protected:
   FilterType m_filter_type;
 };
 
-// class JSFilterArray : public Common::JSArray<AbstractFilterPtr> {
-// public:
-//    JSFilterArray(JSContextRef ctx, JSObjectRef array):
-//            JSArray<AbstractFilterPtr>(ctx, array, AbstractFilter::getPrivateObject,
-//                    AbstractFilter::makeJSValue)
-//    {
-//    }
-//    JSFilterArray(JSContextRef ctx):
-//            JSArray<AbstractFilterPtr>(ctx, AbstractFilter::getPrivateObject,
-//                    AbstractFilter::makeJSValue)
-//    {
-//    }
-//    void operator=(const std::vector<AbstractFilterPtr>& list)
-//    {
-//        overwrite(list);
-//    }
-//};
-
 namespace FilterUtils {
 
 bool isAnyStringMatching(const std::string& key, const std::vector<std::string>& values,