fixed provider ID used by bedrock

Author: mdorier

CMakeLists.txt

@@ -17,7 +17,7 @@ option (ENABLE_PYTHON   "Enable Python support" OFF)
 # library version set here (e.g. for shared libs).
 set (BEDROCK_VERSION_MAJOR 0)
 set (BEDROCK_VERSION_MINOR 15)
-set (BEDROCK_VERSION_PATCH 0)
+set (BEDROCK_VERSION_PATCH 1)
 set (BEDROCK_VERSION
      "${BEDROCK_VERSION_MAJOR}.${BEDROCK_VERSION_MINOR}.${BEDROCK_VERSION_PATCH}")
 add_definitions ("-DBEDROCK_VERSION=${BEDROCK_VERSION}")

src/ProviderManager.cpp

@@ -148,6 +148,11 @@ ProviderManager::addProviderFromJSON(const json& description) {
     for(auto& tag : description.value("tags", json::array()))
         args.tags.push_back(tag.get<std::string>());
 
+    if(args.provider_id == self->get_provider_id()) {
+        throw BEDROCK_DETAILED_EXCEPTION(
+                "Bedrock already uses provider ID {}", args.provider_id);
+    }
+
     auto deps_from_config = description.value("dependencies", json::object());
     auto requested_dependencies = ModuleManager::getDependencies(type, args);
     auto& resolved_dependency_map = args.dependencies;

src/ProviderManagerImpl.hpp

@@ -121,6 +121,7 @@ class ProviderManagerImpl
 
     uint16_t getAvailableProviderID() const {
         std::unordered_set<uint16_t> used_provider_ids;
+        used_provider_ids.insert(get_provider_id());
         for(auto& p : m_providers) {
             used_provider_ids.insert(p->getProviderID());
         }

tests/Client.cpp

@@ -158,7 +158,7 @@ TEST_CASE("Tests various object creation and removal via a ServiceHandle", "[ser
             auto it = std::find_if(providers.begin(), providers.end(),
                       [](auto& p) { return p["name"] == "my_provider_a3"; });
             REQUIRE(it != providers.end());
-            REQUIRE((*it)["provider_id"] == 0);
+            REQUIRE((*it)["provider_id"] == 1);
             // create a provider of type module_a but let Bedrock choose the provider ID again
             REQUIRE_NOTHROW(serviceHandle.addProvider(
                     R"({"name":"my_provider_a4", "type":"module_a", "provider_id":65535})"));
@@ -167,7 +167,7 @@ TEST_CASE("Tests various object creation and removal via a ServiceHandle", "[ser
             it = std::find_if(providers.begin(), providers.end(),
                       [](auto& p) { return p["name"] == "my_provider_a4"; });
             REQUIRE(it != providers.end());
-            REQUIRE((*it)["provider_id"] == 1);
+            REQUIRE((*it)["provider_id"] == 2);
 
 
             // create a provider of an invalid type