Yair Zaslavsky has uploaded a new change for review.
Change subject: 5. [WIP] core, api, webadmin: Expose only Directory name via
DirectoryEntry
......................................................................
5. [WIP] core, api, webadmin: Expose only Directory name via DirectoryEntry
In many places of the code Directory is addresses as an entity.
Since it holds only the directory name as a field, DirectoryEntry is
changed to contain the DirectoryName.
This is a step in order to move Directory from common to aaa.
Change-Id: Ic5a1226902597d148e9cf57c9dc1f5be4d76d31e
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
M
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/nop/NopDirectory.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryStub.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
M
backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
M
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
M
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
D
frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/aaa/DirectoryManager.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
27 files changed, 51 insertions(+), 158 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/24809/1
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
index 962b832..592a4c2 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/internal/InternalDirectory.java
@@ -53,7 +53,7 @@
this.name = name;
// Create the builtin user:
- admin = new DirectoryUser(this, ADMIN_ID, ADMIN_NAME);
+ admin = new DirectoryUser(this.getName(), ADMIN_ID, ADMIN_NAME);
}
/**
diff --git
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/nop/NopDirectory.java
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/nop/NopDirectory.java
index 5fe8fac..f6d52d7 100644
---
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/nop/NopDirectory.java
+++
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/nop/NopDirectory.java
@@ -48,7 +48,7 @@
} catch (UnsupportedEncodingException e) {
return null;
}
- return new DirectoryUser(this, id, name);
+ return new DirectoryUser(this.getName(), id, name);
}
/**
@@ -62,7 +62,7 @@
} catch (UnsupportedEncodingException e) {
return null;
}
- return new DirectoryUser(this, id, name);
+ return new DirectoryUser(this.getName(), id, name);
}
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
index 5e9edb1..e7d81a0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/DirectoryUtils.java
@@ -17,7 +17,7 @@
if (groups != null) {
boolean first = true;
for (DirectoryGroup group : groups) {
- DbGroup dbGroup =
dao.getByExternalId(group.getDirectory().getName(), group.getId());
+ DbGroup dbGroup = dao.getByExternalId(group.getName(),
group.getId());
if (!first) {
sb.append(",");
} else {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
index 7c1be78..3870643 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/aaa/provisional/ProvisionalDirectory.java
@@ -126,7 +126,7 @@
}
// Create the directory user and populate the basic attributes:
- DirectoryUser directoryUser = new DirectoryUser(this,
ldapUser.getUserId(), name);
+ DirectoryUser directoryUser = new DirectoryUser(this.getName(),
ldapUser.getUserId(), name);
directoryUser.setFirstName(ldapUser.getName());
directoryUser.setLastName(ldapUser.getSurName());
directoryUser.setDepartment(ldapUser.getDepartment());
@@ -213,7 +213,7 @@
* Transforms a LDAP group into a directory group.
*/
private DirectoryGroup mapGroup(LdapGroup ldapGroup) {
- return new DirectoryGroup(this, ldapGroup.getid(),
ldapGroup.getname());
+ return new DirectoryGroup(this.getName(), ldapGroup.getid(),
ldapGroup.getname());
}
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
index 54c76a7..64be45d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddGroupCommand.java
@@ -58,7 +58,7 @@
// First check if the group is already in the database, if it is we
// need to update, if not we need to insert:
DbGroupDAO dao = getAdGroupDAO();
- DbGroup dbGroup =
dao.getByExternalId(directoryGroup.getDirectory().getName(),
directoryGroup.getId());
+ DbGroup dbGroup =
dao.getByExternalId(directoryGroup.getDirectoryName(), directoryGroup.getId());
if (dbGroup == null) {
dbGroup = new DbGroup(directoryGroup);
dbGroup.setId(Guid.newGuid());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
index 12a7298..f3fc86b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java
@@ -89,7 +89,7 @@
DbUserDAO dao = getDbUserDAO();
// First check if the user is already in the database, if it is we
need to update, if not we need to insert:
- DbUser dbUser =
dao.getByExternalId(directoryUser.getDirectory().getName(),
directoryUser.getId());
+ DbUser dbUser = dao.getByExternalId(directoryUser.getDirectoryName(),
directoryUser.getId());
if (dbUser == null) {
dbUser = new DbUser(directoryUser);
dbUser.setId(Guid.newGuid());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
index 3f531d7..f4ad86d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
@@ -188,8 +188,8 @@
dbUser.setLastName(directoryUser.getLastName());
update = true;
}
- if (!StringUtils.equals(dbUser.getDomain(),
directoryUser.getDirectory().getName())) {
- dbUser.setDomain(directoryUser.getDirectory().getName());
+ if (!StringUtils.equals(dbUser.getDomain(),
directoryUser.getDirectoryName())) {
+ dbUser.setDomain(directoryUser.getDirectoryName());
update = true;
}
if (!StringUtils.equals(dbUser.getLoginName(),
directoryUser.getName())) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
index 54b6991..539b831 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java
@@ -78,7 +78,7 @@
*/
public static DbUser persistAuthenticatedUser(DirectoryUser directoryUser)
{
DbUserDAO dao = DbFacade.getInstance().getDbUserDao();
- DbUser dbUser =
dao.getByExternalId(directoryUser.getDirectory().getName(),
directoryUser.getId());
+ DbUser dbUser = dao.getByExternalId(directoryUser.getDirectoryName(),
directoryUser.getId());
if (dbUser != null) {
dao.update(dbUser);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
index 19e153b..31bd3e7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryEntry.java
@@ -14,7 +14,7 @@
/**
* Reference to the directory where this entry was originated.
*/
- private Directory directory;
+ private String directoryName;
// The values o the attributes:
private ExternalId id;
@@ -26,8 +26,8 @@
*/
private List<DirectoryGroup> groups;
- public DirectoryEntry(Directory directory, ExternalId id, String name) {
- this.directory = directory;
+ public DirectoryEntry(String directoryName, ExternalId id, String name) {
+ this.directoryName = directoryName;
this.id = id;
this.name = name;
this.status = DirectoryEntryStatus.UNAVAILABLE;
@@ -42,12 +42,12 @@
this.id = id;
}
- public Directory getDirectory() {
- return directory;
+ public String getDirectoryName() {
+ return directoryName;
}
- public void setDirectory(Directory directory) {
- this.directory = directory;
+ public void setDirectoryName(String directoryName) {
+ this.directoryName = directoryName;
}
public String getName() {
@@ -93,7 +93,7 @@
result = prime * result + (id == null? 0: id.hashCode());
result = prime * result + (name == null? 0: name.hashCode());
result = prime * result + (status == null? 0: status.hashCode());
- result = prime * result + (directory == null? 0: directory.hashCode());
+ result = prime * result + (directoryName == null ? 0 :
directoryName.hashCode());
return result;
}
@@ -113,10 +113,10 @@
ObjectUtils.objectsEqual(id, other.id) &&
ObjectUtils.objectsEqual(name, other.name) &&
ObjectUtils.objectsEqual(status, other.status) &&
- ObjectUtils.objectsEqual(directory, other.directory);
+ ObjectUtils.objectsEqual(directoryName, other.directoryName);
}
public String toString() {
- return name + "@" + directory.getName();
+ return name + "@" + directoryName;
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
index 2a323ae..a509d1c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup.java
@@ -5,7 +5,7 @@
public class DirectoryGroup extends DirectoryEntry {
private static final long serialVersionUID = 7446478647138904658L;
- public DirectoryGroup(Directory directory, ExternalId id, String name) {
- super(directory, id, name);
+ public DirectoryGroup(String directoryName, ExternalId id, String name) {
+ super(directoryName, id, name);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryStub.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryStub.java
deleted file mode 100644
index 864d24e..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryStub.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.ovirt.engine.core.aaa;
-
-import java.util.List;
-
-import org.ovirt.engine.core.common.utils.ExternalId;
-
-/**
- * This is a dummy directory used only in the UI. It only contains the name of
the directory, as this is all what is
- * needed in the UI. All the methods, except {@link #getName()}, throw an
exception when invoked.
- */
-public class DirectoryStub implements Directory {
- /**
- * The name of the directory.
- */
- private String name;
-
- public DirectoryStub(String name) {
- this.name = name;
- }
-
- @Override
- public String getName() {
- return name;
- }
- @Override
- public DirectoryUser findUser(String name) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public DirectoryUser findUser(ExternalId id) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public List<DirectoryUser> findUsers(List<ExternalId> ids) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public DirectoryGroup findGroup(String name) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public DirectoryGroup findGroup(ExternalId id) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public List<DirectoryUser> queryUsers(String query) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public List<DirectoryGroup> queryGroups(String query) {
- throw new UnsupportedOperationException();
- }
-
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
index 8ba433a..957bdb0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser.java
@@ -16,8 +16,8 @@
// Flag indicating if this user has the administrator role:
private boolean isAdmin;
- public DirectoryUser(Directory directory, ExternalId id, String name) {
- super(directory, id, name);
+ public DirectoryUser(String directoryName, ExternalId id, String name) {
+ super(directoryName, id, name);
isAdmin = false;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
index 0fa97b8..92a9894 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbGroup.java
@@ -38,7 +38,7 @@
public DbGroup(DirectoryGroup directoryGroup) {
externalId = directoryGroup.getId();
- domain = directoryGroup.getDirectory().getName();
+ domain = directoryGroup.getDirectoryName();
name = directoryGroup.getName();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
index f1fcc32..e9e4204 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
@@ -99,7 +99,7 @@
public DbUser(DirectoryUser directoryUser) {
externalId = directoryUser.getId();
- domain = directoryUser.getDirectory().getName();
+ domain = directoryUser.getDirectoryName();
loginName = directoryUser.getName();
firstName = directoryUser.getFirstName();
lastName = directoryUser.getLastName();
diff --git
a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java
b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java
index 8b44e94..b47176e 100644
---
a/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java
+++
b/backend/manager/modules/extension-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/Configuration.java
@@ -65,6 +65,13 @@
public abstract File getFile();
/**
+ * Gets the properties object that is associated with the configuration
hierarchy
+ *
+ * @return the reference to the properties object
+ */
+ public abstract Properties getProperties();
+
+ /**
* Gets the value associated to a configuration parameter, searching it
only the this configuration.
*
* @param key the name of the configuration parameter
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java
index 39082b6..79b8419 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java
@@ -189,7 +189,7 @@
.build();
}
DirectoryIdParameters parameters = new DirectoryIdParameters();
- parameters.setDirectory(directoryUser.getDirectory().getName());
+ parameters.setDirectory(directoryUser.getDirectoryName());
parameters.setId(directoryUser.getId());
QueryIdResolver<Guid> resolver = new
QueryIdResolver<>(VdcQueryType.GetDbUserByUserId, IdQueryParameters.class);
return performCreate(VdcActionType.AddUser, parameters, resolver,
BaseResource.class);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
index 1dfc563..6c2b4e6 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainGroupResourceTest.java
@@ -6,11 +6,9 @@
import javax.ws.rs.core.UriInfo;
import org.junit.Test;
-
import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.Group;
import org.ovirt.engine.core.aaa.DirectoryGroup;
-import org.ovirt.engine.core.aaa.DirectoryStub;
import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -76,7 +74,7 @@
@Override
protected DirectoryGroup getEntity(int index) {
- return new DirectoryGroup(new DirectoryStub(DOMAIN),
EXTERNAL_IDS[index], NAMES[index]);
+ return new DirectoryGroup(DOMAIN, EXTERNAL_IDS[index], NAMES[index]);
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
index c99b1aa..d24524a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDomainUserResourceTest.java
@@ -8,7 +8,6 @@
import org.junit.Test;
import org.ovirt.engine.api.model.Domain;
import org.ovirt.engine.api.model.User;
-import org.ovirt.engine.core.aaa.DirectoryStub;
import org.ovirt.engine.core.aaa.DirectoryUser;
import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -75,7 +74,7 @@
@Override
protected DirectoryUser getEntity(int index) {
- return new DirectoryUser(new DirectoryStub(DOMAIN),
EXTERNAL_IDS[index], NAMES[index]);
+ return new DirectoryUser(DOMAIN, EXTERNAL_IDS[index], NAMES[index]);
}
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
index 4c7d5a5..bd8a819 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceTest.java
@@ -11,7 +11,6 @@
import org.ovirt.engine.api.model.Fault;
import org.ovirt.engine.api.model.Group;
import org.ovirt.engine.core.aaa.DirectoryGroup;
-import org.ovirt.engine.core.aaa.DirectoryStub;
import org.ovirt.engine.core.common.action.DirectoryIdParameters;
import org.ovirt.engine.core.common.action.IdParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
@@ -372,7 +371,7 @@
}
private DirectoryGroup getDirectoryGroup(int index) {
- return new DirectoryGroup(new DirectoryStub(DOMAIN),
EXTERNAL_IDS[index], GROUP_NAMES[index]);
+ return new DirectoryGroup(DOMAIN, EXTERNAL_IDS[index],
GROUP_NAMES[index]);
}
@Override
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
index 29fe958..9693dcf 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java
@@ -12,7 +12,6 @@
import org.ovirt.engine.api.model.Fault;
import org.ovirt.engine.api.model.Group;
import org.ovirt.engine.api.model.User;
-import org.ovirt.engine.core.aaa.DirectoryStub;
import org.ovirt.engine.core.aaa.DirectoryUser;
import org.ovirt.engine.core.common.action.DirectoryIdParameters;
import org.ovirt.engine.core.common.action.IdParameters;
@@ -214,7 +213,7 @@
}
private DirectoryUser getDirectoryUser(int index) {
- return new DirectoryUser(new DirectoryStub(DOMAIN),
EXTERNAL_IDS[index], NAMES[index]);
+ return new DirectoryUser(DOMAIN, EXTERNAL_IDS[index], NAMES[index]);
}
@Override
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
index 065f3f9..f2ff5aa 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
@@ -28,9 +28,9 @@
Group model = template != null ? template : new Group();
model.setName(entity.getName());
model.setId(entity.getId().toHex());
- if (!StringUtils.isEmpty(entity.getDirectory().getName())) {
+ if (!StringUtils.isEmpty(entity.getDirectoryName())) {
Domain dom = new Domain();
- dom.setId(new Guid(entity.getDirectory().getName().getBytes(),
true).toString());
+ dom.setId(new Guid(entity.getDirectoryName().getBytes(),
true).toString());
model.setDomain(dom);
}
return model;
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
index ec9b84c..8b2976d 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/UserMapper.java
@@ -42,7 +42,7 @@
public static User map(DirectoryUser entity, User template) {
User model = template != null ? template : new User();
model.setName(entity.getFirstName());
- model.setUserName(entity.getName() + "@" +
entity.getDirectory().getName());
+ model.setUserName(entity.getName() + "@" + entity.getDirectoryName());
model.setId(entity.getId().toHex());
model.setLastName(entity.getLastName());
model.setEmail(entity.getEmail());
@@ -55,9 +55,9 @@
model.getGroups().getGroups().add(group);
}
}
- if (!StringUtils.isEmpty(entity.getDirectory().getName())) {
+ if (!StringUtils.isEmpty(entity.getDirectoryName())) {
Domain dom = new Domain();
- dom.setId(new Guid(entity.getDirectory().getName().getBytes(),
true).toString());
+ dom.setId(new Guid(entity.getDirectoryName().getBytes(),
true).toString());
model.setDomain(dom);
}
return model;
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
index ca6382a..f9175c0 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
@@ -15,11 +15,9 @@
<include name="common/businessentities/LdapGroup.java" />
<include
name="common/businessentities/BusinessEntitiesDefinitions.java" />
<include name="common/businessentities/LdapUser.java" />
- <include name="aaa/Directory.java" />
<include name="aaa/DirectoryEntry.java" />
<include name="aaa/DirectoryEntryStatus.java" />
<include name="aaa/DirectoryGroup.java" />
- <include name="aaa/DirectoryStub.java" />
<include name="aaa/DirectoryUser.java" />
<include name="aaa/Managed.java" />
<include name="common/businessentities/AuditLog.java" />
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
index de9495b..a6aadaa 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryGroup_CustomFieldSerializer.java
@@ -13,14 +13,14 @@
public class DirectoryGroup_CustomFieldSerializer {
public static DirectoryGroup instantiate(SerializationStreamReader reader)
throws SerializationException {
- Directory directory =
DirectoryManager.getInstance().getDirectory(reader.readString());
+ String directoryName = reader.readString();
ExternalId id = (ExternalId) reader.readObject();
String name = reader.readString();
- return new DirectoryGroup(directory, id, name);
+ return new DirectoryGroup(directoryName, id, name);
}
public static void serialize(SerializationStreamWriter writer,
DirectoryGroup group) throws SerializationException {
- writer.writeObject(group.getDirectory().getName());
+ writer.writeObject(group.getDirectoryName());
writer.writeObject(group.getId());
writer.writeString(group.getName());
}
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
index df230a0..b785b00 100644
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
+++
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/aaa/DirectoryUser_CustomFieldSerializer.java
@@ -14,14 +14,14 @@
public class DirectoryUser_CustomFieldSerializer {
public static DirectoryUser instantiate(SerializationStreamReader reader)
throws SerializationException {
- Directory directory =
DirectoryManager.getInstance().getDirectory(reader.readString());
+ String directoryName = reader.readString();
ExternalId id = (ExternalId) reader.readObject();
String name = reader.readString();
- return new DirectoryUser(directory, id, name);
+ return new DirectoryUser(directoryName, id, name);
}
public static void serialize(SerializationStreamWriter writer,
DirectoryUser user) throws SerializationException {
- writer.writeString(user.getDirectory().getName());
+ writer.writeString(user.getDirectoryName());
writer.writeObject(user.getId());
writer.writeString(user.getName());
writer.writeBoolean(user.isAdmin());
diff --git
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/aaa/DirectoryManager.java
b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/aaa/DirectoryManager.java
deleted file mode 100644
index eaa47b2..0000000
---
a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/aaa/DirectoryManager.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.ovirt.engine.core.aaa;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class needs to be overriden because it is used by the directory custom
field serializer, and thus GWT wants its
- * source, but we can't use the original source because it makes references to
things that aren't supported by GWT, like
- * files, configuration, etc. Note that this overriden class doesn't need to
implement the same interfaces or methods
- * than the original one, only those methods that are actually used in the GWT
projects.
- */
-public class DirectoryManager {
- /**
- * This is a singleton and this is the instance.
- */
- private static DirectoryManager instance;
-
- static {
- instance = new DirectoryManager();
- }
-
- /**
- * Get an instance of the directory manager.
- */
- public static DirectoryManager getInstance() {
- return instance;
- }
-
- /**
- * In the UI directories are replaced by stubs that only contain the name
of the directory, and we store them here
- * to avoid creating multiple instances.
- */
- private Map<String, Directory> stubs = new HashMap<String, Directory>();
-
- private DirectoryManager() {
- // Nothing.
- }
-
- public Directory getDirectory(String name) {
- Directory stub = stubs.get(name);
- if (stub == null) {
- stub = new DirectoryStub(name);
- stubs.put(name, stub);
- }
- return stub;
- }
-}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
index 707e9ae..1f23f9b 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java
@@ -296,7 +296,7 @@
tempVar3.setFirstName(a.getName());
tempVar3.setLastName(""); //$NON-NLS-1$
tempVar3.setLoginName(""); //$NON-NLS-1$
- tempVar3.setDomain(a.getDirectory().getName());
+ tempVar3.setDomain(a.getDirectoryName());
DbUser user = tempVar3;
EntityModel tempVar4 = new EntityModel();
--
To view, visit http://gerrit.ovirt.org/24809
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5a1226902597d148e9cf57c9dc1f5be4d76d31e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
