Removed uid alias for validators executor: KasperskyLab#174

Author: DavidIkov

knp/base-framework/impl/network_validation/executor.cpp

@@ -28,15 +28,15 @@
 namespace knp::framework::network_validation
 {
 
-Executor::ValidatorUID Executor::add_validator(std::string name, PopulationValidator validator)
+knp::core::UID Executor::add_validator(std::string name, PopulationValidator validator)
 {
     knp::core::UID uid;
     population_validators_[uid] = {std::move(name), std::move(validator)};
     return uid;
 }
 
 
-Executor::ValidatorUID Executor::add_validator(PopulationValidator validator)
+knp::core::UID Executor::add_validator(PopulationValidator validator)
 {
     knp::core::UID uid;
     population_validators_[uid] = {
@@ -45,15 +45,15 @@ Executor::ValidatorUID Executor::add_validator(PopulationValidator validator)
 }
 
 
-Executor::ValidatorUID Executor::add_validator(std::string name, ProjectionValidator validator)
+knp::core::UID Executor::add_validator(std::string name, ProjectionValidator validator)
 {
     knp::core::UID uid;
     projection_validators_[uid] = {std::move(name), std::move(validator)};
     return uid;
 }
 
 
-Executor::ValidatorUID Executor::add_validator(ProjectionValidator validator)
+knp::core::UID Executor::add_validator(ProjectionValidator validator)
 {
     knp::core::UID uid;
     projection_validators_[uid] = {
@@ -62,15 +62,15 @@ Executor::ValidatorUID Executor::add_validator(ProjectionValidator validator)
 }
 
 
-Executor::ValidatorUID Executor::add_validator(std::string name, NetworkValidator validator)
+knp::core::UID Executor::add_validator(std::string name, NetworkValidator validator)
 {
     knp::core::UID uid;
     network_validators_[uid] = {std::move(name), std::move(validator)};
     return uid;
 }
 
 
-Executor::ValidatorUID Executor::add_validator(NetworkValidator validator)
+knp::core::UID Executor::add_validator(NetworkValidator validator)
 {
     knp::core::UID uid;
     network_validators_[uid] = {

knp/base-framework/include/knp/framework/network_validation/executor.h

@@ -41,58 +41,53 @@ namespace knp::framework::network_validation
 class KNP_DECLSPEC Executor
 {
 public:
-    /**
-     * @brief Type of validator's UID.
-     */
-    using ValidatorUID = knp::core::UID;
-
     /**
      * @brief Add validator to run later.
      * @param validator Population validator.
      * @param name Validator's display name.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(std::string name, PopulationValidator validator);
+    knp::core::UID add_validator(std::string name, PopulationValidator validator);
 
     /**
      * @brief Add validator to run later.
      * @note Automatically generates name.
      * @param validator Population validator.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(PopulationValidator validator);
+    knp::core::UID add_validator(PopulationValidator validator);
 
     /**
      * @brief Add validator to run later.
      * @param validator Projection validator.
      * @param name Validator's display name.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(std::string name, ProjectionValidator validator);
+    knp::core::UID add_validator(std::string name, ProjectionValidator validator);
 
     /**
      * @brief Add validator to run later.
      * @note Automatically generates name.
      * @param validator Projection validator.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(ProjectionValidator validator);
+    knp::core::UID add_validator(ProjectionValidator validator);
 
     /**
      * @brief Add validator to run later.
      * @param validator Network validator.
      * @param name Validator's display name.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(std::string name, NetworkValidator validator);
+    knp::core::UID add_validator(std::string name, NetworkValidator validator);
 
     /**
      * @brief Add validator to run later.
      * @note Automatically generates name.
      * @param validator Network validator.
      * @return Validator UID.
      */
-    ValidatorUID add_validator(NetworkValidator validator);
+    knp::core::UID add_validator(NetworkValidator validator);
 
     /**
      * @brief Validator's report info. Contains name and report.
@@ -103,7 +98,7 @@ class KNP_DECLSPEC Executor
          * @brief UID.
          */
         // cppcheck-suppress unusedStructMember
-        ValidatorUID uid_;
+        knp::core::UID uid_;
 
         /**
          * @brief Display name.
@@ -129,11 +124,11 @@ class KNP_DECLSPEC Executor
     static void log_report(const Report& report);
 
     // cppcheck-suppress unusedStructMember
-    std::map<ValidatorUID, std::pair<std::string, PopulationValidator>> population_validators_;
+    std::map<knp::core::UID, std::pair<std::string, PopulationValidator>> population_validators_;
     // cppcheck-suppress unusedStructMember
-    std::map<ValidatorUID, std::pair<std::string, ProjectionValidator>> projection_validators_;
+    std::map<knp::core::UID, std::pair<std::string, ProjectionValidator>> projection_validators_;
     // cppcheck-suppress unusedStructMember
-    std::map<ValidatorUID, std::pair<std::string, NetworkValidator>> network_validators_;
+    std::map<knp::core::UID, std::pair<std::string, NetworkValidator>> network_validators_;
 };
 
 }  // namespace knp::framework::network_validation