Duplicated code in plugin loader

[Issue#] N/A
[Bug] Duplicated code for retrieving allowed features.
[Cause] N/A
[Solution] Moved duplicated code to PluginContainerSupport class.
[Verification] Run a widget which requires plugins.

Change-Id: I3b76ed18c0376a70975e3f6e98740e4b7671a556

diff --git a/src/plugin-loading/js_page_session.cpp b/src/plugin-loading/js_page_session.cpp
index 311ee7f..32453a2 100644 (file)
--- a/src/plugin-loading/js_page_session.cpp
+++ b/src/plugin-loading/js_page_session.cpp
@@ -219,26 +219,8 @@ void JSPageSession::Impl::installRequestedFeatures()
 {
     LogInfo("Installing requested widget features...");
 
-    //TODO it have to return LIST NOT SET!!!
-    WidgetDAOReadOnly widgetDao(m_widgetHandle);
-    DbWidgetFeatureSet features = widgetDao.getFeaturesList();
-
-    std::list<std::string> allowedFeatures;
-
-    FOREACH(it, features)
-    {
-        LogInfo("Loading api-feature: " << it->name);
-        if (it->rejected) {
-            LogWarning("Api-feature was rejected by ace. (Api-feature name: "
-                       << it->name << ")" );
-            continue;
-        }
-
-        allowedFeatures.push_back(DPL::ToUTF8String(it->name));
-    }
-
-    auto widgetType =  widgetDao.getWidgetType();
-
+    std::list<std::string> allowedFeatures =
+            m_pluginsSupport->getAllowedFeatures(m_widgetHandle);
     PluginContainerSupport::PluginsList allowedPlugins;
 
     FOREACH(feature, allowedFeatures)

diff --git a/src/plugin-loading/plugin_container_support.cpp b/src/plugin-loading/plugin_container_support.cpp
index b91e4dc..282ec48 100644 (file)
--- a/src/plugin-loading/plugin_container_support.cpp
+++ b/src/plugin-loading/plugin_container_support.cpp
@@ -52,7 +52,7 @@ PluginContainerSupport::~PluginContainerSupport()
     m_standardFeatureList.clear();
 }
 
-void PluginContainerSupport::readAllowedPlugins(int widgetHandle)
+std::list<std::string> PluginContainerSupport::getAllowedFeatures(int widgetHandle) const
 {
     //TODO it has to return LIST NOT SET!!!
     WidgetDAOReadOnly widgetDao(widgetHandle);
@@ -69,9 +69,12 @@ void PluginContainerSupport::readAllowedPlugins(int widgetHandle)
 
         allowedFeatures.push_back(DPL::ToUTF8String(it->name));
     }
+    return allowedFeatures;
+}
 
-    auto widgetType =  widgetDao.getWidgetType();
-
+void PluginContainerSupport::readAllowedPlugins(int widgetHandle)
+{
+    std::list<std::string> allowedFeatures = getAllowedFeatures(widgetHandle);
     FeatureData* dt = NULL;
     std::map<FeatureHandle, FeatureData> featureDataList = FeatureDAOReadOnly::GetFeatures(allowedFeatures);
     DeviceCapList deviceCapabilities = FeatureDAOReadOnly::GetDevCapWithFeatureHandle();

diff --git a/src/plugin-loading/plugin_container_support.h b/src/plugin-loading/plugin_container_support.h
index 5192bcd..1211318 100644 (file)
--- a/src/plugin-loading/plugin_container_support.h
+++ b/src/plugin-loading/plugin_container_support.h
@@ -72,6 +72,7 @@ public:
     PluginContainerSupport();
 
     bool isInitialized() { return m_initialized; }
+    std::list<std::string> getAllowedFeatures(int widgetHandle) const;
     void readAllowedPlugins(int widgetHandle);
 
     FeaturesList getStandardFeatures() const;