Migrates Participant and OperatorManagement to generated rtiddsgen API

Converts accessor calls to plain member access in ppm and opm services and plugins.

qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_group.cpp

@@ -120,13 +120,13 @@ void HandlerGroup::updateRolePresetId(const int operatorId, const int rolePreset
 
 Core::FunctionReplyObject HandlerGroup::changeMembership(const OperatorManagement::GroupChangeMembersRequest &request)
 {
-  ObjectGroup *ifs = m_groupObjMap.value(request.id());
+  ObjectGroup *ifs = m_groupObjMap.value(request.id);
   if (!ifs)
     return Core::FunctionReplyObject(0, tr_lts("dds", "No valid group id for changing memberships."));
 
   Core::FunctionReplyObject fro;
-  if (request.memberships().size() > 0)
-    fro = ifs->updateMemberships(request.memberships());
+  if (request.memberships.size() > 0)
+    fro = ifs->updateMemberships(request.memberships);
   else
     fro = ifs->removeAllMemberships();
 
@@ -141,8 +141,8 @@ void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdenti
 {
   DEBUG_LOG(m_logger) << "onGroupChangeMembershipsRequest " << request;
   Core::FunctionReplyObject ret = changeMembership(request);
-  if (request.operatorId().is_set() && request.rolePresetId().is_set())
-    updateRolePresetId(request.operatorId().get(), request.rolePresetId().get());
+  if (request.operatorId.is_set() && request.rolePresetId.is_set())
+    updateRolePresetId(request.operatorId.get(), request.rolePresetId.get());
   if (ret.error())
     WARNING_LOG(m_logger) << ret();
   m_mainHandler->fts()->groupChangeMembershipsReply(cookie, ret);
@@ -151,18 +151,18 @@ void HandlerGroup::onGroupChangeMembershipsRequest(const rti::core::SampleIdenti
 Core::FunctionReplyObject HandlerGroup::create(const GroupCreateRequest &request)
 {
   Database::OpmGroup group;
-  group.name = QString::fromStdString(request.name());
+  group.name = QString::fromStdString(request.name);
   for (const ObjectGroup *g : qAsConst(m_groupObjMap))
   {
     if (g->name().compare(group.name, Qt::CaseInsensitive) == 0)
       return Core::FunctionReplyObject(-1, tr_lts("dds", "Name '%1' already exists")).arg(group.name);
   }
-  group.description = QString::fromStdString(request.description());
-  group.typeId = request.type();
-  group.isHidden = request.isHidden().is_set() ? request.isHidden().get() : false;
+  group.description = QString::fromStdString(request.description);
+  group.typeId = request.type;
+  group.isHidden = request.isHidden.is_set() ? request.isHidden.get() : false;
 
   ObjectGroup *ifs(new ObjectGroup(m_mainHandler));
-  Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships().is_set() ? request.memberships().get() : std::vector<int32_t>());
+  Core::FunctionReplyObject ret = ifs->createObject(group, request.memberships.is_set() ? request.memberships.get() : std::vector<int32_t>());
   if (ret.error())
   {
     delete ifs;
@@ -185,13 +185,13 @@ void HandlerGroup::onGroupCreateRequest(const rti::core::SampleIdentity &cookie,
 
 Core::FunctionReplyObject HandlerGroup::changeName(const OperatorManagement::GroupChangeNameRequest &request)
 {
-  ObjectGroup *ifs = m_groupObjMap.value(request.id());
+  ObjectGroup *ifs = m_groupObjMap.value(request.id);
   if (!ifs)
     return Core::FunctionReplyObject(0, tr_lts("dds", "No valid group id for renaming."));
 
   Database::OpmGroup group = ifs->data();
-  group.name        = QString::fromStdString(request.name());
-  group.description = QString::fromStdString(request.description());
+  group.name        = QString::fromStdString(request.name);
+  group.description = QString::fromStdString(request.description);
 
   for (const ObjectGroup *g : qAsConst(m_groupObjMap))
   {
@@ -210,7 +210,7 @@ void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &coo
   DEBUG_LOG(m_logger) << "onGroupChangeNameRequest" << request;
 
   Core::FunctionReplyObject ret;
-  ObjectGroup *ifs = m_groupObjMap.value(request.id());
+  ObjectGroup *ifs = m_groupObjMap.value(request.id);
   if (!ifs)
   {
     ret = Core::FunctionReplyObject(0, tr_lts("dds", "No valid group id for renaming."));
@@ -219,7 +219,7 @@ void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &coo
   }
 
   Database::OpmGroup group = ifs->data();
-  if (group.typeId == GroupType_def::OperatorGroup && (group.name != QString::fromStdString(request.name())))
+  if (group.typeId == GroupType::OperatorGroup && (group.name != QString::fromStdString(request.name)))
   {
     ret = Core::FunctionReplyObject(0, tr_lts("dds", "Operator group may not be renamed."));
     m_mainHandler->fts()->groupChangeNameReply(cookie, ret);
@@ -231,23 +231,23 @@ void HandlerGroup::onGroupChangeNameRequest(const rti::core::SampleIdentity &coo
 
 Core::FunctionReplyObject HandlerGroup::remove(const Core::RemoveElementRequest &request)
 {
-  ObjectGroup *ifs = m_groupObjMap.value(request.id());
+  ObjectGroup *ifs = m_groupObjMap.value(request.id);
   if (!ifs)
     return Core::FunctionReplyObject(0, tr_lts("dds", "No valid group id for deleting."));
 
   OperatorManagement::Group ddsData;
-  ddsData.id(request.id());
+  ddsData.id = request.id;
 
   if (m_mainHandler->dds()->topicLockMaster()->isLocked(ddsData, 0))
-    return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Group '%1' is used by another user!")).arg(ifs->name());
+    return Core::FunctionReplyObject(request.id, tr_lts("dds", "Group '%1' is used by another user!")).arg(ifs->name());
 
   Core::FunctionReplyObject ret = ifs->removeObject();
   if (ret.error())
     return ret;
-  m_groupObjMap.remove(request.id());
-  m_groupGroupMap.remove(request.id());
+  m_groupObjMap.remove(request.id);
+  m_groupGroupMap.remove(request.id);
   for (auto it = m_groupGroupMap.begin(); it != m_groupGroupMap.end();)
-    if (it.value() == request.id())
+    if (it.value() == request.id)
       it = m_groupGroupMap.erase(it);
     else
       ++it;