Skip to content
Snippets Groups Projects
Commit cf8b1e86 authored by Firat Yusuf Duran's avatar Firat Yusuf Duran :moyai:
Browse files

Make getProfile optional and implement it

parent 5f3c66d0
No related branches found
No related tags found
3 merge requests!460Draft: fluxio/dev-skill-timeout,!449Fluxio preliminary release,!446Draft: Fluxio related changes
Pipeline #18688 failed
......@@ -247,7 +247,7 @@ module armarx
dto::FluxioProviderList
getProviderList();
dto::FluxioProvider
optional(5) dto::FluxioProvider
getProvider(string id);
dto::FluxioSkillList
......
......@@ -619,7 +619,7 @@ namespace armarx::plugins
p.id = skillId.providerId->providerName;
p.name = p.id;
fluxioDC.providers[p.id] = p;
fluxioDC.providers[p.id] = p;
s.skillProviderPtr = &p;
}
......@@ -643,7 +643,9 @@ namespace armarx::plugins
return std::nullopt;
}
void SkillManagerComponentPlugin::updateSkill(const skills::FluxioSkill& skill){}
void SkillManagerComponentPlugin::updateSkill(const skills::FluxioSkill& skill){
}
void SkillManagerComponentPlugin::removeSkill(const std::string& id){}
......@@ -685,13 +687,18 @@ namespace armarx::plugins
}
std::vector<skills::FluxioProvider> SkillManagerComponentPlugin::getProviderList(){
std::vector<skills::FluxioProvider> ret;
return ret;
getSkillList(); //TODO: put the refreshProvider functionality in a separate method
return convertMapValuesToVector(fluxioDC.providers);
}
skills::FluxioProvider SkillManagerComponentPlugin::getProvider(const std::string& id){
skills::FluxioProvider ret;
return ret;
std::optional<skills::FluxioProvider> SkillManagerComponentPlugin::getProvider(const std::string& id){
getSkillList(); //TODO: put the refreshProvider functionality in a separate method
const auto& providersEntry = fluxioDC.providers.find(id);
if (providersEntry != fluxioDC.providers.end()) {
return providersEntry->second;
}
return std::nullopt;
}
std::vector<skills::FluxioSkill> SkillManagerComponentPlugin::getSkillsOfProvider(const std::string& id){
......
......@@ -91,7 +91,7 @@ namespace armarx::plugins
std::vector<skills::FluxioProvider> getProviderList();
skills::FluxioProvider getProvider(const std::string& id);
std::optional<skills::FluxioProvider> getProvider(const std::string& id);
std::vector<skills::FluxioSkill> getSkillsOfProvider(const std::string& id);
......
......@@ -261,9 +261,14 @@ namespace armarx
return ret;
}
skills::manager::dto::FluxioProvider
IceUtil::Optional<skills::manager::dto::FluxioProvider>
SkillManagerComponentPluginUser::getProvider(const std::string& id,const Ice::Current& current){
return this->plugin->getProvider(id).toManagerIce();
auto provider = this->plugin->getProvider(id);
if (provider.has_value()) {
return provider->toManagerIce();
}
return {};
}
skills::manager::dto::FluxioSkillList
......
......@@ -94,7 +94,7 @@ namespace armarx
skills::manager::dto::FluxioProviderList
getProviderList(const Ice::Current& current) override;
skills::manager::dto::FluxioProvider
IceUtil::Optional<skills::manager::dto::FluxioProvider>
getProvider(const std::string& id,const Ice::Current& current) override;
skills::manager::dto::FluxioSkillList
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment