Removed validate() method

- The validation will be made by a overloaded function as said in Boost.org

diff --git a/src/config/configurationoptions.cpp b/src/config/configurationoptions.cpp
index 449b7c5..8e5f8b9 100644 (file)
--- a/src/config/configurationoptions.cpp
+++ b/src/config/configurationoptions.cpp
@@ -197,11 +197,7 @@ bool ConfigurationOptions::parse_generic_options(
 
     BOOST_FOREACH( ConfigurationOptionItem generic_option, GenericOptions )
     {
-        bool validated = generic_option->validate( vm );
-        if ( validated )
-        {
-            generic_option->parse( vm, configuration );
-        }
+        generic_option->parse( vm, configuration );
     }
 
 
@@ -227,11 +223,7 @@ bool ConfigurationOptions::parse_configuration_options(
 
     BOOST_FOREACH( ConfigurationOptionItem configuration_option, ConfigOptions )
     {
-        bool validated = configuration_option->validate( vm );
-        if ( validated )
-        {
-            configuration_option->parse( vm, configuration );
-        }
+        configuration_option->parse( vm, configuration );
     }
 
     bool hosts_parsed = parse_hosts_options(vm, configuration);
@@ -259,9 +251,8 @@ bool ConfigurationOptions::parse_hosts_options(
 
     BOOST_FOREACH( HostConfigurationOptionItem host_option, HostOptions )
     {
-        bool validated = host_option->validate( vm );
         bool parsed = host_option->parse( vm, configuration );
-        if ( validated && parsed )
+        if ( parsed )
         {
             // The set_hosts_count() method is called in parse() method, that is
             // why we must parse before check the number of host options

diff --git a/src/config/option/configfileoption.cpp b/src/config/option/configfileoption.cpp
index 2a0eea1..1f08efc 100644 (file)
--- a/src/config/option/configfileoption.cpp
+++ b/src/config/option/configfileoption.cpp
@@ -52,11 +52,6 @@ ConfigFileOption::~ConfigFileOption()
 {
 }
 
-bool ConfigFileOption::validate( const variables_map & ) const
-{
-    return true;
-}
-
 bool ConfigFileOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/configfileoption.h b/src/config/option/configfileoption.h
index 6900b43..3407e3d 100644 (file)
--- a/src/config/option/configfileoption.h
+++ b/src/config/option/configfileoption.h
@@ -38,10 +38,6 @@ public:
     ConfigFileOption();
     virtual ~ConfigFileOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/configurationoption.h b/src/config/option/configurationoption.h
index 3ee9b00..6cc9eef 100644 (file)
--- a/src/config/option/configurationoption.h
+++ b/src/config/option/configurationoption.h
@@ -54,10 +54,6 @@ public:
     std::string get_command_string() const;
     std::string get_command_description() const;
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const = 0;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/daemonoption.cpp b/src/config/option/daemonoption.cpp
index 655e7d2..845b3d9 100644 (file)
--- a/src/config/option/daemonoption.cpp
+++ b/src/config/option/daemonoption.cpp
@@ -47,11 +47,6 @@ DaemonOption::~DaemonOption()
 {
 }
 
-bool DaemonOption::validate( const variables_map & ) const
-{
-    return true;
-}
-
 bool DaemonOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/daemonoption.h b/src/config/option/daemonoption.h
index 9254207..fd353d3 100644 (file)
--- a/src/config/option/daemonoption.h
+++ b/src/config/option/daemonoption.h
@@ -38,10 +38,6 @@ public:
     DaemonOption();
     virtual ~DaemonOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/hostdownlimitoption.cpp b/src/config/option/hostdownlimitoption.cpp
index 4c35885..33c9bc2 100644 (file)
--- a/src/config/option/hostdownlimitoption.cpp
+++ b/src/config/option/hostdownlimitoption.cpp
@@ -44,13 +44,6 @@ HostDownLimitOption::~HostDownLimitOption()
 {
 }
 
-bool HostDownLimitOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool HostDownLimitOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/hostdownlimitoption.h b/src/config/option/hostdownlimitoption.h
index 8c11439..358962c 100644 (file)
--- a/src/config/option/hostdownlimitoption.h
+++ b/src/config/option/hostdownlimitoption.h
@@ -38,10 +38,6 @@ public:
     HostDownLimitOption();
     virtual ~HostDownLimitOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/hostnameoption.cpp b/src/config/option/hostnameoption.cpp
index 51b506b..d62d968 100644 (file)
--- a/src/config/option/hostnameoption.cpp
+++ b/src/config/option/hostnameoption.cpp
@@ -50,14 +50,6 @@ HostNameOption::~HostNameOption()
 {
 }
 
-bool HostNameOption::validate( const variables_map& vm ) const
-{
-    string command_name = get_command_string();
-    bool is_valid = ( vm.count( command_name ) > 0 );
-
-    return is_valid;
-}
-
 bool HostNameOption::parse(
         const variables_map& vm,
         Configuration *configuration
@@ -91,11 +83,7 @@ bool HostNameOption::parse(
 
     set_hosts_count( hosts_names_count );
 
-    // TODO receive the host_down_limit by parameter, use a std::map to find this configuration inside the Options container
-    // TODO BOOST_ASSERT( hosts_names_count >= static_cast<size_t>( host_down_limit ) );
-//    BOOST_ASSERT( hosts_names_count == host_port_count );
-//    BOOST_ASSERT( hosts_names_count == host_ping_protocol_count );
-//    BOOST_ASSERT( hosts_names_count == hosts_interval_count );
+    BOOST_ASSERT( hosts_names_count >= static_cast<size_t>( configuration->get_hosts_down_limit() ) );
 
     return parsed_success;
 }

diff --git a/src/config/option/hostnameoption.h b/src/config/option/hostnameoption.h
index ba76169..9f07010 100644 (file)
--- a/src/config/option/hostnameoption.h
+++ b/src/config/option/hostnameoption.h
@@ -38,10 +38,6 @@ public:
     HostNameOption();
     virtual ~HostNameOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/hostpingintervaloption.cpp b/src/config/option/hostpingintervaloption.cpp
index 3972f72..386726c 100644 (file)
--- a/src/config/option/hostpingintervaloption.cpp
+++ b/src/config/option/hostpingintervaloption.cpp
@@ -49,13 +49,6 @@ HostPingIntervalOption::~HostPingIntervalOption()
 {
 }
 
-bool HostPingIntervalOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool HostPingIntervalOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/hostpingintervaloption.h b/src/config/option/hostpingintervaloption.h
index 39a4329..614a444 100644 (file)
--- a/src/config/option/hostpingintervaloption.h
+++ b/src/config/option/hostpingintervaloption.h
@@ -38,10 +38,6 @@ public:
     HostPingIntervalOption();
     virtual ~HostPingIntervalOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/hostpingprotocoloption.cpp b/src/config/option/hostpingprotocoloption.cpp
index fd5987a..ff690c1 100644 (file)
--- a/src/config/option/hostpingprotocoloption.cpp
+++ b/src/config/option/hostpingprotocoloption.cpp
@@ -49,13 +49,6 @@ HostPingProtocolOption::~HostPingProtocolOption()
 {
 }
 
-bool HostPingProtocolOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool HostPingProtocolOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/hostpingprotocoloption.h b/src/config/option/hostpingprotocoloption.h
index 0a500f4..5f5a2f6 100644 (file)
--- a/src/config/option/hostpingprotocoloption.h
+++ b/src/config/option/hostpingprotocoloption.h
@@ -38,10 +38,6 @@ public:
     HostPingProtocolOption();
     virtual ~HostPingProtocolOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/hostportoption.cpp b/src/config/option/hostportoption.cpp
index 29b58bd..867e65f 100644 (file)
--- a/src/config/option/hostportoption.cpp
+++ b/src/config/option/hostportoption.cpp
@@ -50,13 +50,6 @@ HostPortOption::~HostPortOption()
 {
 }
 
-bool HostPortOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool HostPortOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/hostportoption.h b/src/config/option/hostportoption.h
index 9665949..8e77526 100644 (file)
--- a/src/config/option/hostportoption.h
+++ b/src/config/option/hostportoption.h
@@ -38,10 +38,6 @@ public:
     HostPortOption();
     virtual ~HostPortOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/linkdownintervaloption.cpp b/src/config/option/linkdownintervaloption.cpp
index 4067074..2cc1797 100644 (file)
--- a/src/config/option/linkdownintervaloption.cpp
+++ b/src/config/option/linkdownintervaloption.cpp
@@ -44,13 +44,6 @@ LinkDownIntervalOption::~LinkDownIntervalOption()
 {
 }
 
-bool LinkDownIntervalOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool LinkDownIntervalOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/linkdownintervaloption.h b/src/config/option/linkdownintervaloption.h
index 467fb41..1127b7c 100644 (file)
--- a/src/config/option/linkdownintervaloption.h
+++ b/src/config/option/linkdownintervaloption.h
@@ -38,10 +38,6 @@ public:
     LinkDownIntervalOption();
     virtual ~LinkDownIntervalOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/linkupintervaloption.cpp b/src/config/option/linkupintervaloption.cpp
index a78bd36..5598a59 100644 (file)
--- a/src/config/option/linkupintervaloption.cpp
+++ b/src/config/option/linkupintervaloption.cpp
@@ -44,13 +44,6 @@ LinkUpIntervalOption::~LinkUpIntervalOption()
 {
 }
 
-bool LinkUpIntervalOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool LinkUpIntervalOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/linkupintervaloption.h b/src/config/option/linkupintervaloption.h
index 8072a27..7cf49cf 100644 (file)
--- a/src/config/option/linkupintervaloption.h
+++ b/src/config/option/linkupintervaloption.h
@@ -38,10 +38,6 @@ public:
     LinkUpIntervalOption();
     virtual ~LinkUpIntervalOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/nameserveroption.cpp b/src/config/option/nameserveroption.cpp
index 5f3bb7e..eaffed4 100644 (file)
--- a/src/config/option/nameserveroption.cpp
+++ b/src/config/option/nameserveroption.cpp
@@ -44,13 +44,6 @@ NameserverOption::~NameserverOption()
 {
 }
 
-bool NameserverOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool NameserverOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/nameserveroption.h b/src/config/option/nameserveroption.h
index 7c01562..8a96798 100644 (file)
--- a/src/config/option/nameserveroption.h
+++ b/src/config/option/nameserveroption.h
@@ -38,10 +38,6 @@ public:
     NameserverOption();
     virtual ~NameserverOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/pingfaillimitoption.cpp b/src/config/option/pingfaillimitoption.cpp
index d168db2..335b354 100644 (file)
--- a/src/config/option/pingfaillimitoption.cpp
+++ b/src/config/option/pingfaillimitoption.cpp
@@ -44,13 +44,6 @@ PingFailLimitOption::~PingFailLimitOption()
 {
 }
 
-bool PingFailLimitOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool PingFailLimitOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/pingfaillimitoption.h b/src/config/option/pingfaillimitoption.h
index 540feb0..b4a4b97 100644 (file)
--- a/src/config/option/pingfaillimitoption.h
+++ b/src/config/option/pingfaillimitoption.h
@@ -38,10 +38,6 @@ public:
     PingFailLimitOption();
     virtual ~PingFailLimitOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/sourcenetworkinterfaceoption.cpp b/src/config/option/sourcenetworkinterfaceoption.cpp
index 687ac62..edfa292 100644 (file)
--- a/src/config/option/sourcenetworkinterfaceoption.cpp
+++ b/src/config/option/sourcenetworkinterfaceoption.cpp
@@ -44,14 +44,6 @@ SourceNetworkInterfaceOption::~SourceNetworkInterfaceOption()
 {
 }
 
-bool SourceNetworkInterfaceOption::validate( const variables_map& vm ) const
-{
-    // TODO validate if it is a valid interface
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool SourceNetworkInterfaceOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/sourcenetworkinterfaceoption.h b/src/config/option/sourcenetworkinterfaceoption.h
index 0a257ac..8a6e2af 100644 (file)
--- a/src/config/option/sourcenetworkinterfaceoption.h
+++ b/src/config/option/sourcenetworkinterfaceoption.h
@@ -39,10 +39,6 @@ public:
     SourceNetworkInterfaceOption();
     virtual ~SourceNetworkInterfaceOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/statusnotifiercmdoption.cpp b/src/config/option/statusnotifiercmdoption.cpp
index bc1f080..e8b95b0 100644 (file)
--- a/src/config/option/statusnotifiercmdoption.cpp
+++ b/src/config/option/statusnotifiercmdoption.cpp
@@ -44,13 +44,6 @@ StatusNotifierCmdOption::~StatusNotifierCmdOption()
 {
 }
 
-bool StatusNotifierCmdOption::validate( const variables_map& vm ) const
-{
-    bool is_valid = ( 1 <= vm.count( get_command_string() ) );
-
-    return is_valid;
-}
-
 bool StatusNotifierCmdOption::parse(
         const variables_map& vm,
         Configuration *configuration

diff --git a/src/config/option/statusnotifiercmdoption.h b/src/config/option/statusnotifiercmdoption.h
index c690ea3..728b7f2 100644 (file)
--- a/src/config/option/statusnotifiercmdoption.h
+++ b/src/config/option/statusnotifiercmdoption.h
@@ -38,10 +38,6 @@ public:
     StatusNotifierCmdOption();
     virtual ~StatusNotifierCmdOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration

diff --git a/src/config/option/versionoption.cpp b/src/config/option/versionoption.cpp
index 7523baa..4828e89 100644 (file)
--- a/src/config/option/versionoption.cpp
+++ b/src/config/option/versionoption.cpp
@@ -47,11 +47,6 @@ VersionOption::~VersionOption()
 {
 }
 
-bool VersionOption::validate( const variables_map & ) const
-{
-    return true;
-}
-
 bool VersionOption::parse(
         const variables_map& vm,
         Configuration *

diff --git a/src/config/option/versionoption.h b/src/config/option/versionoption.h
index 2868d3b..8d37f6f 100644 (file)
--- a/src/config/option/versionoption.h
+++ b/src/config/option/versionoption.h
@@ -38,10 +38,6 @@ public:
     VersionOption();
     virtual ~VersionOption();
 
-    virtual bool validate(
-            const boost::program_options::variables_map &vm
-    ) const;
-
     virtual bool parse(
             const boost::program_options::variables_map &vm,
             Configuration *configuration