Rework configuration class to avoid complicate behavior

Current configuration design is mapping classes on xml node. It leads to some empty classes which contains a node information. It also leads to inconsistent information retrieval method. Some can be retrieved through simple getters and some others are retrieved through child mechanism inherited from Element. This patch introduces a real configuration object which is a simple struct. Information retrieval is handled through xml bindings. TODO: UPDATE DOC Signed-off-by: Jules Clero <[email protected]>
intel · Jun 18, 2015 · d70c97e · d70c97e
1 parent dd4280d
commit d70c97e
Show file tree

Hide file tree

Showing 16 changed files with 225 additions and 729 deletions.
diff --git a/parameter/CMakeLists.txt b/parameter/CMakeLists.txt
@@ -59,7 +59,6 @@ add_library(parameter SHARED
     ErrorContext.cpp
     FixedPointParameterType.cpp
     FormattedSubsystemObject.cpp
-    FrameworkConfigurationLocation.cpp
     HardwareBackSynchronizer.cpp
     InstanceConfigurableElement.cpp
     InstanceDefinition.cpp
@@ -73,14 +72,12 @@ add_library(parameter SHARED
     ParameterBlackboard.cpp
     ParameterBlockType.cpp
     Parameter.cpp
-    ParameterFrameworkConfiguration.cpp
     ParameterHandle.cpp
     ParameterMgr.cpp
     ParameterMgrFullConnector.cpp
     ParameterMgrPlatformConnector.cpp
     ParameterType.cpp
     PathNavigator.cpp
-    PluginLocation.cpp
     RuleParser.cpp
     SelectionCriterionRule.cpp
     SimulatedBackSynchronizer.cpp
@@ -104,6 +101,7 @@ include_directories(
     command/include
     "${PROJECT_SOURCE_DIR}/parameter"
     "${PROJECT_SOURCE_DIR}/xmlserializer"
+    "${PROJECT_SOURCE_DIR}/xmlserializer/include"
     "${PROJECT_SOURCE_DIR}/utility"
     "${PROJECT_SOURCE_DIR}/remote-processor"
     "${PROJECT_SOURCE_DIR}/parameter/log/include"

diff --git a/parameter/FrameworkConfigurationGroup.h → parameter/Configuration.h b/parameter/FrameworkConfigurationGroup.h → parameter/Configuration.h
@@ -29,22 +29,23 @@
  */
 #pragma once
 
-#include "KindElement.h"
-
 #include <string>
+#include <list>
 
-class CFrameworkConfigurationGroup : public CKindElement
+struct Configuration
 {
-public:
-    CFrameworkConfigurationGroup(const std::string& strName, const std::string& strKind) : CKindElement(strName, strKind)
-    {
-    }
-
-private:
-    virtual bool childrenAreDynamic() const
-    {
-        return true;
-    }
-
+    Configuration(const std::string &file) : configurationFile(file), plugins{} {}
 
+    // System class name
+    std::string systemClassName;
+    // Tuning allowed
+    bool tuningAllowed = false;
+    // Server port
+    uint16_t serverPort = 0;
+    std::string configurationFile;
+    std::string schemasLocation;
+    std::string structureFile;
+    std::string settingsFile;
+    std::string binarySettingsFile;
+    std::list<std::string> plugins;
 };
diff --git a/parameter/FrameworkConfigurationLocation.cpp b/parameter/FrameworkConfigurationLocation.cpp
diff --git a/parameter/FrameworkConfigurationLocation.h b/parameter/FrameworkConfigurationLocation.h
diff --git a/parameter/KindElement.h b/parameter/KindElement.h
diff --git a/parameter/KindElementBuilderTemplate.h b/parameter/KindElementBuilderTemplate.h
diff --git a/parameter/ParameterFrameworkConfiguration.cpp b/parameter/ParameterFrameworkConfiguration.cpp