Yair Zaslavsky has submitted this change and it was merged. Change subject: core: Merge VdcUser and DbUser ...................................................................... core: Merge VdcUser and DbUser Currently we have three different classes to represent information about users: VdcUser, DbUser and LdapUser. The VdcUser and DbUser classes are almost identical, so they can be merged. This change removes the VdcUser class and changes the engine to use DbUser instead. Change-Id: I2ed315043858260ba997203b8e3fc05feb0bad20 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.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/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java 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/GetQuotasConsumptionForCurrentUserQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCreateTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.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/LogoutUserCommand.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/PermissionsCommandBase.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/RemoveUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.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/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidateSessionQuery.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/VmPoolUserCommandBase.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/network/dc/AddNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/template/VmTemplateInterfaceCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AbstractVmInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVnicProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.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/CommandBaseTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVdsByStoragePoolQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllVmSnapshotsByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetClustersWithPermittedActionQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDataCentersWithPermittedActionOnClustersQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetImagesListByStoragePoolIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsByAdElementIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetPermissionsForObjectQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsCertificateSubjectByVdsIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsGroupByIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVdsGroupsByStoragePoolIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmByVmNameForDataCenterQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmGuestAgentInterfacesByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmPoolByIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmTemplatesWithPermittedActionQueryTest.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/SetVmTicketCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ValidateSessionQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/GetAllNetworksByClusterIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/GetManagementInterfaceAddressByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/template/GetTemplateInterfacesByTemplateIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/GetVmInterfacesByVmIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainByIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByStoragePoolIdQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStoragePoolByIdQueryTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddUserParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PermissionsOperationsParametes.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmPoolUserParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/users/VdcUser.java D backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendEntityAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserAssignedPermissionsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.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 M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/gwtservices/GenericApiGWTService.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/FrontendActionTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/AutoLoginData.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpNativeImpl.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/UserStatusColumn.java 112 files changed, 407 insertions(+), 574 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/17224 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ed315043858260ba997203b8e3fc05feb0bad20 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com&gt; Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com&gt; Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com&gt; Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com&gt; Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server