add alias KeyValueVector

Author: facontidavide

include/behaviortree_cpp/basic_types.h

@@ -2,18 +2,14 @@
 
 #include <iostream>
 #include <vector>
-#include <sstream>
 #include <unordered_map>
-#include <unordered_set>
 #include <typeinfo>
 #include <functional>
 #include <chrono>
-#include <memory>
 #include <string_view>
 #include <utility>
 #include <variant>
 #include <vector>
-#include <optional>
 
 #include "behaviortree_cpp/utils/safe_any.hpp"
 #include "behaviortree_cpp/exceptions.h"
@@ -63,6 +59,9 @@ enum class PortDirection
 
 using StringView = std::string_view;
 
+// vector of key/value pairs
+using KeyValueVector = std::vector<std::pair<std::string, std::string>>;
+
 /**
  * convertFromString is used to convert a string into a custom type.
  *
@@ -447,7 +446,7 @@ struct has_static_method_metadata : std::false_type
 template <typename T>
 struct has_static_method_metadata<
     T, typename std::enable_if<
-           std::is_same<decltype(T::metadata()), std::vector<std::pair<std::string, std::string>>>::value>::type>
+        std::is_same<decltype(T::metadata()), KeyValueVector>::value>::type>
   : std::true_type
 {
 };

include/behaviortree_cpp/bt_factory.h

@@ -20,7 +20,6 @@
 #include <functional>
 #include <memory>
 #include <unordered_map>
-#include <unordered_set>
 #include <set>
 #include <utility>
 #include <vector>
@@ -428,7 +427,7 @@ class BehaviorTreeFactory
   /// Add metadata to a specific manifest. This metadata will be added
   /// to <TreeNodesModel> with the function writeTreeNodesModelXML()
   void addMetadataToManifest(const std::string& node_id,
-                             const std::vector<std::pair<std::string, std::string>>& metadata);
+                             const KeyValueVector& metadata);
 
   /**
    * @brief Add an Enum to the scripting language.

include/behaviortree_cpp/tree_node.h

@@ -13,12 +13,9 @@
 
 #pragma once
 
-#include <condition_variable>
 #include <exception>
-#include <mutex>
 #include <map>
 #include <utility>
-#include <vector>
 
 #include "behaviortree_cpp/utils/signal.h"
 #include "behaviortree_cpp/basic_types.h"
@@ -40,7 +37,7 @@ struct TreeNodeManifest
   NodeType type;
   std::string registration_ID;
   PortsList ports;
-  std::vector<std::pair<std::string, std::string>> metadata;
+  KeyValueVector metadata;
 };
 
 using PortsRemapping = std::unordered_map<std::string, std::string>;

src/bt_factory.cpp

@@ -436,7 +436,7 @@ Tree BehaviorTreeFactory::createTree(const std::string& tree_name,
 }
 
 void BehaviorTreeFactory::addMetadataToManifest(const std::string& node_id,
-                                                const std::vector<std::pair<std::string, std::string>>& metadata)
+                                                const KeyValueVector& metadata)
 {
   auto it = _p->manifests.find(node_id);
   if (it == _p->manifests.end())

tests/gtest_factory.cpp

@@ -391,7 +391,7 @@ TEST(BehaviorTreeReload, ReloadSameTree)
   }
 }
 
-std::vector<std::pair<std::string, std::string>> makeTestMetadata()
+KeyValueVector makeTestMetadata()
 {
   return {
     std::make_pair<std::string, std::string>("foo", "hello"),
@@ -413,7 +413,7 @@ class ActionWithMetadata : public SyncActionNode
     return {};
   }
 
-  static std::vector<std::pair<std::string, std::string>> metadata() {
+  static KeyValueVector metadata() {
     return makeTestMetadata();
   }
 };