rename Group as UserGroup

[modules/gde.git] / projects / GDE_API_CPP / api / src / UserService.cpp

diff --git a/projects/GDE_API_CPP/api/src/UserService.cpp b/projects/GDE_API_CPP/api/src/UserService.cpp
index 329dfc2302721e68c94bcade5d1de073dcd89e99..3f6196cc12a3582595f821b5178e22c5169c10aa 100644 (file)
--- a/projects/GDE_API_CPP/api/src/UserService.cpp
+++ b/projects/GDE_API_CPP/api/src/UserService.cpp
@@ -76,8 +76,8 @@ gde::UserService::findUser(const std::string& name)
   }
 }
 
-const gde::Group
-gde::UserService::createGroup(const std::string& name)
+const gde::UserGroup
+gde::UserService::createUserGroup(const std::string& name)
 {
   CommandTO cto(CREATE_GROUP);
   cto.setParameter("name", name);
@@ -86,17 +86,17 @@ gde::UserService::createGroup(const std::string& name)
   std::string uri = _session.getServiceURI(_servletName);
   CommandResultTO crto = gde::HttpConnection(Poco::URI(uri), credentials).doPost(cto);
 
-  // build Group object from CommandResultTO data (json format)
+  // build UserGroup object from CommandResultTO data (json format)
   {
     Poco::JSON::Object::Ptr object = JsonFormatter::parse(crto.getData());
     int id = JsonFormatter::extract<int>(object, "id");
     std::string name = JsonFormatter::extract<std::string>(object, "name");
-    return gde::Group(id, name);
+    return gde::UserGroup(id, name);
   }
 }
 
 bool
-gde::UserService::deleteGroup(const gde::Group& group)
+gde::UserService::deleteUserGroup(const gde::UserGroup& group)
 {
   CommandTO cto(DELETE_GROUP);
   cto.setParameter("id", group.getId());
@@ -107,8 +107,8 @@ gde::UserService::deleteGroup(const gde::Group& group)
   return crto.getCode() == CommandResultTO::OK;
 }
 
-const gde::Group
-gde::UserService::findGroup(const std::string& name)
+const gde::UserGroup
+gde::UserService::findUserGroup(const std::string& name)
 {
   CommandTO cto(FIND_GROUP);
   cto.setParameter("groupname", name);
@@ -117,17 +117,17 @@ gde::UserService::findGroup(const std::string& name)
   std::string uri = _session.getServiceURI(_servletName);
   CommandResultTO crto = gde::HttpConnection(Poco::URI(uri), credentials).doPost(cto);
 
-  // build Group object from CommandResultTO data (json format)
+  // build UserGroup object from CommandResultTO data (json format)
   {
     Poco::JSON::Object::Ptr object = JsonFormatter::parse(crto.getData());
     int id = JsonFormatter::extract<int>(object, "id");
     std::string name = JsonFormatter::extract<std::string>(object, "name");
-    return gde::Group(id, name);
+    return gde::UserGroup(id, name);
   }
 }
 
 bool
-gde::UserService::addToGroup(const gde::Group& group, const gde::User& user)
+gde::UserService::addToUserGroup(const gde::UserGroup& group, const gde::User& user)
 {
   CommandTO cto(ADD_TO_GROUP);
   cto.setParameter("groupId", group.getId());
@@ -140,7 +140,7 @@ gde::UserService::addToGroup(const gde::Group& group, const gde::User& user)
 }
 
 bool
-gde::UserService::removeFromGroup(const gde::Group& group, const gde::User& user)
+gde::UserService::removeFromUserGroup(const gde::UserGroup& group, const gde::User& user)
 {
   CommandTO cto(REMOVE_FROM_GROUP);
   cto.setParameter("groupId", group.getId());