Juan Hernandez has uploaded a new change for review. Change subject: core: Remove IVdcUser ......................................................................
core: Remove IVdcUser This interface only has one implementation, and there are no plans to have more so it can be removed, and that will simplify a bit the user management in the engine. Change-Id: I95315c0a31a1da9fbb2f758557bd0ec4ec3fc961 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractUserQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/IVdcUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalParamsContainer.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java 19 files changed, 63 insertions(+), 128 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/16638/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 45e7724..fcf5717 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -63,10 +63,10 @@ import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.errors.VdcFault; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.job.ExternalSystemType; import org.ovirt.engine.core.common.job.Step; import org.ovirt.engine.core.common.job.StepEnum; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.common.vdscommands.SPMTaskGuidBaseVDSCommandParameters; @@ -170,7 +170,7 @@ protected CommandBase(T parameters) { _parameters = parameters; // get the user from the session if the user is logged in - IVdcUser user = SessionDataContainer.getInstance().addUserToThreadContext(parameters.getSessionId(), true); + VdcUser user = SessionDataContainer.getInstance().addUserToThreadContext(parameters.getSessionId(), true); if (user != null) { setCurrentUser(user); } else diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java index 3b9e48c..f76c847 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; @@ -139,7 +138,7 @@ protected boolean isUserCanBeAuthenticated() { boolean authenticated = false; - IVdcUser vdcUser = SessionDataContainer.getInstance().getUser(false); + VdcUser vdcUser = SessionDataContainer.getInstance().getUser(false); if (vdcUser == null) { boolean domainFound = false; List<String> vdcDomains = LdapBrokerUtils.getDomainsList(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java index d92b5b8..c621e2f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java @@ -8,7 +8,7 @@ import org.ovirt.engine.core.common.businessentities.Role; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.DbUserDAO; @@ -52,7 +52,7 @@ * @param userId * @return True if user is admin */ - public static boolean isAdminUser(IVdcUser user) { + public static boolean isAdminUser(VdcUser user) { List<Role> userRoles = getRoleDAO().getAllForUserAndGroups(user.getUserId(), user.getGroupIds()); for (Role r : userRoles) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java index 630f3b1..cc8d817 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java @@ -9,10 +9,10 @@ import org.ovirt.engine.core.bll.interfaces.BackendInternal; import org.ovirt.engine.core.bll.session.SessionDataContainer; import org.ovirt.engine.core.common.errors.VdcBLLException; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcCommandBase; import org.ovirt.engine.core.dal.dbbroker.DbFacade; @@ -30,7 +30,7 @@ // get correct return value type private final VdcQueryReturnValue returnValue; private final VdcQueryType queryType; - private final IVdcUser user; + private final VdcUser user; private final P parameters; private boolean isInternalExecution = false; @@ -51,7 +51,7 @@ } } - private final IVdcUser initUser() { + private final VdcUser initUser() { return SessionDataContainer.getInstance().addUserToThreadContext(parameters.getSessionId(), parameters.getRefresh()); } @@ -165,7 +165,7 @@ this.isInternalExecution = isInternalExecution; } - protected IVdcUser getUser() { + protected VdcUser getUser() { return user; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java index 2cafba2..def8c88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.common.vdscommands.SetVmTicketVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; @@ -119,7 +119,7 @@ // Update the dynamic information of the virtual machine in memory (we need it // to update the database later): final VM vm = getVm(); - final IVdcUser user = getCurrentUser(); + final VdcUser user = getCurrentUser(); vm.setConsoleUserId(user.getUserId()); vm.setConsoleCurrentUserName(user.getFQN()); @@ -160,7 +160,7 @@ private void dontSendTicket() { // Send messages to the log explaining the situation: final VM vm = getVm(); - final IVdcUser user = getCurrentUser(); + final VdcUser user = getCurrentUser(); log.warnFormat("Can't give console of virtual machine \"{0}\" to user \"{1}\", it has probably been taken by another user.", vm.getId(), user.getUserId()); // Set the result messages indicating that the operation failed: @@ -176,7 +176,7 @@ */ private void sendTicket() { // Send the ticket to the virtual machine: - final IVdcUser user = getCurrentUser(); + final VdcUser user = getCurrentUser(); final boolean sent = Backend .getInstance() .getResourceManager() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java index 1933ae1..4bbc689 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmLogonCommand.java @@ -3,7 +3,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.action.VmOperationParameterBase; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VmLogonVDSCommandParameters; @@ -39,7 +39,7 @@ final VM vm = getVm(); // Send the log on command to the virtual machine: - final IVdcUser currentUser = getCurrentUser(); + final VdcUser currentUser = getCurrentUser(); final String domainController = currentUser != null ? currentUser.getDomainControler() : ""; final String password = currentUser != null ? currentUser.getPassword() : ""; final boolean sentToVM = Backend diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerCommandBase.java index 3858743..a0bfeaa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerCommandBase.java @@ -10,7 +10,7 @@ import org.ovirt.engine.core.common.businessentities.LdapGroup; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.businessentities.LdapUser; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -32,7 +32,7 @@ } protected void initCredentials(String domain) { - IVdcUser curUser; + VdcUser curUser; if (StringUtils.isEmpty(getParameters().getSessionId())) { curUser = SessionDataContainer.getInstance().getUser(false); } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java index 640817d..2553d49 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java @@ -5,7 +5,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; @@ -164,8 +164,8 @@ * @param sessionId * -id of session */ - public IVdcUser addUserToThreadContext(String sessionId, boolean refresh) { - IVdcUser vdcUser = ThreadLocalParamsContainer.getVdcUser(); + public VdcUser addUserToThreadContext(String sessionId, boolean refresh) { + VdcUser vdcUser = ThreadLocalParamsContainer.getVdcUser(); if (vdcUser == null) { if (!StringUtils.isEmpty(sessionId)) { vdcUser = getUser(sessionId, refresh); @@ -183,7 +183,7 @@ * @param sessionId The session to set * @param user The user to set */ - public final void setUser(String sessionId, IVdcUser user) { + public final void setUser(String sessionId, VdcUser user) { SetData(sessionId, VDC_USER_PARAMETER_NAME, user); } @@ -191,7 +191,7 @@ * Sets the user for the current session * @param user The user to set */ - public final boolean setUser(IVdcUser user) { + public final boolean setUser(VdcUser user) { return SetData(VDC_USER_PARAMETER_NAME, user); } @@ -200,12 +200,12 @@ * @param refresh Whether refreshing the session is needed * @return The user set for the given {@link #session} */ - public IVdcUser getUser(String sessionId, boolean refresh) { - return (IVdcUser) GetData(sessionId, VDC_USER_PARAMETER_NAME, refresh); + public VdcUser getUser(String sessionId, boolean refresh) { + return (VdcUser) GetData(sessionId, VDC_USER_PARAMETER_NAME, refresh); } /** @return The user set in the current session */ - public IVdcUser getUser(boolean refresh) { - return (IVdcUser) GetData(VDC_USER_PARAMETER_NAME, refresh); + public VdcUser getUser(boolean refresh) { + return (VdcUser) GetData(VDC_USER_PARAMETER_NAME, refresh); } } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractUserQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractUserQueryTest.java index 105f114..bdf573f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractUserQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractUserQueryTest.java @@ -8,15 +8,15 @@ import org.junit.Before; import org.junit.Test; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; /** An abstract test class for query classes that handles common mocking requirements */ public abstract class AbstractUserQueryTest<P extends VdcQueryParametersBase, Q extends QueriesCommandBase<? extends P>> extends AbstractQueryTest<P, Q> { - private IVdcUser user; + private VdcUser user; private Guid userID; @Before @@ -31,7 +31,7 @@ /** Sets up a mock for {@link #user} */ private void setUpMockUser() { userID = new Guid(UUID.randomUUID()); - user = mock(IVdcUser.class); + user = mock(VdcUser.class); when(user.getUserId()).thenReturn(userID); } @@ -48,7 +48,7 @@ } /** @return The mocked user to use in the test */ - protected IVdcUser getUser() { + protected VdcUser getUser() { return user; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java index 5cbf3ce..0946453 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackendTest.java @@ -10,9 +10,9 @@ import org.junit.After; import org.junit.Before; import org.ovirt.engine.core.bll.session.SessionDataContainer; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.users.VdcUser; /** A test case for the {@link Backend} class */ public class BackendTest { @@ -25,7 +25,7 @@ @Before public void setUp() { sessionIdToUse = RandomStringUtils.random(10); - SessionDataContainer.getInstance().setUser(sessionIdToUse, mock(IVdcUser.class)); + SessionDataContainer.getInstance().setUser(sessionIdToUse, mock(VdcUser.class)); parameters = mock(VdcQueryParametersBase.class); when(parameters.getHttpSessionId()).thenReturn(sessionIdToUse); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java index f888bae..f2b6af8 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java @@ -12,9 +12,9 @@ import org.junit.Before; import org.junit.Test; import org.ovirt.engine.core.bll.session.SessionDataContainer; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; @@ -85,7 +85,7 @@ Guid guid = mock(Guid.class); // Set up the user id env. - IVdcUser user = mock(IVdcUser.class); + VdcUser user = mock(VdcUser.class); when(user.getUserId()).thenReturn(guid); when(user.isAdmin()).thenReturn(isUserAdmin); ThreadLocalParamsContainer.setHttpSessionId(sessionId); @@ -113,7 +113,7 @@ @Test public void testGetUserID() { - IVdcUser user = mock(IVdcUser.class); + VdcUser user = mock(VdcUser.class); when(user.getUserId()).thenReturn(Guid.EVERYONE); ThreadLocalParamsContainer.setVdcUser(user); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java index c445213..f0d4559 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java @@ -11,7 +11,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; /** @@ -80,7 +80,7 @@ @Test public void testGetUserAndSetUserWithSessionParam() { - IVdcUser user = mock(IVdcUser.class); + VdcUser user = mock(VdcUser.class); container.setUser(TEST_SESSION_ID, user); assertEquals("Get should return the value with a given session", user, @@ -90,7 +90,7 @@ @Test public void testGetUserAndSetUserWithoutSessionParam() { ThreadLocalParamsContainer.setHttpSessionId(TEST_SESSION_ID); - IVdcUser user = mock(IVdcUser.class); + VdcUser user = mock(VdcUser.class); container.setUser(user); assertEquals("Get should return the value with a given session", user, @@ -182,7 +182,7 @@ /** Initializes the {@link #key} data */ private void initDataForClearTest(String key) { - container.SetData(TEST_SESSION_ID, key, mock(IVdcUser.class)); + container.SetData(TEST_SESSION_ID, key, mock(VdcUser.class)); } @Test diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java index a4f7bcd..7aa21b9 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java @@ -7,7 +7,7 @@ import org.ovirt.engine.core.common.asynctasks.EntityInfo; import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.common.utils.ValidationUtils; import org.ovirt.engine.core.common.validation.group.PreRun; import org.ovirt.engine.core.compat.Guid; @@ -19,7 +19,7 @@ private Guid commandId; private transient String sessionid; private boolean shouldbelogged; - private IVdcUser parametersCurrentUser; + private VdcUser parametersCurrentUser; private TransactionScopeOption transctionOption; private transient CommandExecutionReason executionReason = CommandExecutionReason.REGULAR_FLOW; @@ -84,12 +84,12 @@ sessionid = value; } - public IVdcUser getParametersCurrentUser() { + public VdcUser getParametersCurrentUser() { return parametersCurrentUser; } - public void setParametersCurrentUser(IVdcUser value) { + public void setParametersCurrentUser(VdcUser value) { parametersCurrentUser = value; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/IVdcUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/IVdcUser.java deleted file mode 100644 index 787a40b..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/IVdcUser.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ovirt.engine.core.common.interfaces; - -import java.io.Serializable; - -import org.ovirt.engine.core.compat.Guid; - -public interface IVdcUser extends Serializable { - String getPassword(); - - void setPassword(String value); - - Guid getUserId(); - - void setUserId(Guid value); - - String getUserName(); - - void setUserName(String value); - - String getDomainControler(); - - void setDomainControler(String value); - - String getGroupNames(); - - void setGroupNames(String value); - - String getFirstName(); - - void setFirstName(String value); - - String getSurName(); - - void setSurName(String value); - - boolean isAdmin(); - - void setAdmin(boolean isAdmin); - - String getGroupIds(); - - void setGroupIds(String groupIds); - - String getFQN(); -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java index 1d24548..49d4996 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java @@ -1,10 +1,11 @@ package org.ovirt.engine.core.common.users; +import java.io.Serializable; + import org.ovirt.engine.core.common.businessentities.LdapUser; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.compat.Guid; -public class VdcUser implements IVdcUser { +public class VdcUser implements Serializable { private static final long serialVersionUID = -5689096270467866486L; private Guid mUserId = Guid.Empty; @@ -14,12 +15,10 @@ private String mGroupNames; private String groupIds; - @Override public String getGroupIds() { return groupIds; } - @Override public void setGroupIds(String groupIds) { this.groupIds = groupIds; } @@ -53,82 +52,66 @@ mDomainControler = domain; } - @Override public String getUserName() { return mUserName; } - @Override public void setUserName(String value) { mUserName = value; } - @Override public String getPassword() { return mPassword; } - @Override public void setPassword(String value) { mPassword = value; } - @Override public Guid getUserId() { return mUserId; } - @Override public void setUserId(Guid value) { mUserId = value; } - @Override public String getDomainControler() { return mDomainControler; } - @Override public void setDomainControler(String value) { mDomainControler = value; } - @Override public String getGroupNames() { return mGroupNames; } - @Override public void setGroupNames(String value) { mGroupNames = value; } - @Override public String getFirstName() { return mFirstName; } - @Override public void setFirstName(String value) { mFirstName = value; } - @Override public String getSurName() { return mSurName; } - @Override public void setSurName(String value) { mSurName = value; } - @Override public boolean isAdmin() { return mIsAdmin; } - @Override public void setAdmin(boolean isAdmin) { this.mIsAdmin = isAdmin; } @@ -136,7 +119,6 @@ /** * return the FQDN of a user in a form of user@domain. if the domain is empty then only return the username */ - @Override public String getFQN() { String domain = getDomainControler(); String username = getUserName(); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 78e921c..3882041 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -19,7 +19,7 @@ import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.AdGroupDAO; @@ -49,7 +49,7 @@ public class AuditLogableBase extends TimeoutBase { private static final long serialVersionUID = -4764813076922800727L; private Guid mVmId = Guid.Empty; - private IVdcUser mVdcUser; + private VdcUser mVdcUser; private Guid mUserId = Guid.Empty; private String mUserName; private String mVmName; @@ -142,11 +142,11 @@ mUserName = value; } - public IVdcUser getCurrentUser() { + public VdcUser getCurrentUser() { return mVdcUser; } - public void setCurrentUser(final IVdcUser value) { + public void setCurrentUser(final VdcUser value) { mVdcUser = value; } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java index 95c853a..af785ee 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java @@ -19,7 +19,6 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.interfaces.IVdcUser; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dao.StorageDomainDAO; @@ -158,25 +157,25 @@ @Test public void currentUserDefault() { final AuditLogableBase b = new AuditLogableBase(); - final IVdcUser u = b.getCurrentUser(); + final VdcUser u = b.getCurrentUser(); assertNull(u); } @Test public void currentUserNull() { final AuditLogableBase b = new AuditLogableBase(); - final IVdcUser u = null; + final VdcUser u = null; b.setCurrentUser(u); - final IVdcUser cu = b.getCurrentUser(); + final VdcUser cu = b.getCurrentUser(); assertEquals(u, cu); } @Test public void currentUser() { final AuditLogableBase b = new AuditLogableBase(); - final IVdcUser u = new VdcUser(); + final VdcUser u = new VdcUser(); b.setCurrentUser(u); - final IVdcUser cu = b.getCurrentUser(); + final VdcUser cu = b.getCurrentUser(); assertEquals(u, cu); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalParamsContainer.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalParamsContainer.java index fb6b1d4..3bf0c73 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalParamsContainer.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ThreadLocalParamsContainer.java @@ -1,11 +1,11 @@ package org.ovirt.engine.core.utils; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; public class ThreadLocalParamsContainer { private static ThreadLocal<String> httpSessionId = new ThreadLocal<String>(); - private static ThreadLocal<IVdcUser> vdcUserKeeper = new ThreadLocal<IVdcUser>(); + private static ThreadLocal<VdcUser> vdcUserKeeper = new ThreadLocal<VdcUser>(); /** * Identifies the correlation-id associated with the current thread @@ -20,11 +20,11 @@ return httpSessionId.get(); } - public static void setVdcUser(IVdcUser vdcUser) { + public static void setVdcUser(VdcUser vdcUser) { vdcUserKeeper.set(vdcUser); } - public static IVdcUser getVdcUser() { + public static VdcUser getVdcUser() { return vdcUserKeeper.get(); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java index b8037e0..42bf7d9 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java @@ -15,7 +15,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.interfaces.IVdcUser; +import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.utils.ThreadLocalParamsContainer; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; @@ -48,7 +48,7 @@ private static class InternalWrapperRunnable implements Runnable { private Runnable job; - private IVdcUser vdcUser; + private VdcUser vdcUser; private String httpSessionId; /** @@ -56,7 +56,7 @@ */ private String correlationId; - public InternalWrapperRunnable(Runnable job, IVdcUser vdcUser, String httpSessionId, String correlationId) { + public InternalWrapperRunnable(Runnable job, VdcUser vdcUser, String httpSessionId, String correlationId) { this.job = job; this.vdcUser = vdcUser; this.httpSessionId = httpSessionId; @@ -76,7 +76,7 @@ private static class InternalCallable<V> implements Callable<V> { private Callable<V> job; - private IVdcUser vdcUser; + private VdcUser vdcUser; private String httpSessionId; /** -- To view, visit http://gerrit.ovirt.org/16638 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95315c0a31a1da9fbb2f758557bd0ec4ec3fc961 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
