Issue 4128, 5138 - Add Parser and Serializer implemented in C++

compiled/subscription/Subscription.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
 
-#include <type_traits>
 #include <vector>
 
+#include "../base.h"
 #include "../filter/Filter.h"
 #include "../String.h"
 #include "../FilterNotifier.h"
 #include "../intrusive_ptr.h"
 #include "../debug.h"
 #include "../bindings/runtime.h"
 
 #define SUBSCRIPTION_PROPERTY_INTERNAL(field_type, param_type, name, topic, getter, setter) \
     private:\
       field_type name;\
     public:\
       param_type BINDINGS_EXPORTED getter() const\
       {\
         return name;\
       }\
       void BINDINGS_EXPORTED setter(param_type value)\
       {\
         if (name != value)\
         {\
           name = value;\
-          if (FilterNotifier::Topic::topic != FilterNotifier::Topic::NONE)\
+          if (ABP_NS::FilterNotifier::Topic::topic != ABP_NS::FilterNotifier::Topic::NONE)\
           {\
-            FilterNotifier::SubscriptionChange(FilterNotifier::Topic::topic,\
+            ABP_NS::FilterNotifier::SubscriptionChange(ABP_NS::FilterNotifier::Topic::topic,\
                 *this);\
           }\
         }\
       }
 
 #define SUBSCRIPTION_PROPERTY(type, name, topic, getter, setter) \
     static_assert(std::is_arithmetic<type>::value, "SUBSCRIPTION_PROPERTY macro can only be used with arithmetic types");\
     SUBSCRIPTION_PROPERTY_INTERNAL(type, type, name, topic, getter, setter)
 
 #define SUBSCRIPTION_STRING_PROPERTY(name, topic, getter, setter) \
     SUBSCRIPTION_PROPERTY_INTERNAL(OwnedString, const String&, name, topic, getter, setter)
+
+ABP_NS_BEGIN
 
 class Subscription;
 typedef intrusive_ptr<Subscription> SubscriptionPtr;
 
 class Subscription : public ref_counted
 {
 public:
   typedef std::vector<FilterPtr> Filters;
 
 protected:
@@ skipping 40 matching lines @@
   int BINDINGS_EXPORTED IndexOfFilter(const Filter& filter);
   void AddFilter(Filter& filter);
   const Filters& GetFilters() const
   {
     return mFilters;
   }
   // behaves similar to virtual function
   OwnedString SerializeProperties() const;
 
   template<typename T>
-  T* As();
+  T* As()
+  {
+    if (mType != T::classType)
+      return nullptr;
+
+    return static_cast<T*>(this);
+  }
 
   template<typename T>
   const T* As() const
   {
-    return const_cast<Subscription*>(this)->As<T>();
+    if (mType != T::classType)
+      return nullptr;
+
+    return static_cast<const T*>(this);
   }
+
 protected:
   OwnedString DoSerializeProperties() const;

[Wladimir Palant, 2017/12/21 10:30:38]

Why is this method called DoSerializeProperties() here but SerializeProperties()
in DownloadableSubscription?

   explicit Subscription(Type type, const String& id, const KeyValues& properties);
   static const String* findPropertyValue(const Subscription::KeyValues& properties, const String& propertyName);
   template<typename Member>
   static void parseProperty(const KeyValues& properties, Member& member, const String& key)
   {
     if (auto strPropValue = findPropertyValue(properties, key))
-      member = AdaptValue<Member>(*strPropValue);
+      member = lexical_cast<Member>(*strPropValue);
   }
 private:
   static SubscriptionPtr FromProperties(const String& id, const KeyValues& properties);
-};
+};
+
+ABP_NS_END