Laszlo Hornyak has uploaded a new change for review. Change subject: engine: remove DBUser.desktopDevice [wip] ......................................................................
engine: remove DBUser.desktopDevice [wip] desktopDevice property was completely unused, so now it is removed Change-Id: I0a9cdcb4893c6643ef543a2fb22cc168336e36a0 Signed-off-by: Laszlo Hornyak <[email protected]> --- M backend/manager/dbscripts/create_tables.sql M backend/manager/dbscripts/create_views.sql M backend/manager/dbscripts/user_sp.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml 6 files changed, 7 insertions(+), 47 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/13531/1 diff --git a/backend/manager/dbscripts/create_tables.sql b/backend/manager/dbscripts/create_tables.sql index ae82de7..dc8cb0f 100644 --- a/backend/manager/dbscripts/create_tables.sql +++ b/backend/manager/dbscripts/create_tables.sql @@ -309,7 +309,6 @@ department VARCHAR(255), role VARCHAR(255), user_icon_path VARCHAR(255), - desktop_device VARCHAR(255), email VARCHAR(255), note VARCHAR(255), status INTEGER NOT NULL, diff --git a/backend/manager/dbscripts/create_views.sql b/backend/manager/dbscripts/create_views.sql index 94ca169..e6911a2 100644 --- a/backend/manager/dbscripts/create_views.sql +++ b/backend/manager/dbscripts/create_views.sql @@ -719,12 +719,12 @@ AS SELECT 'user' as user_group, users_1.name as name, users_1.user_id as user_id, users_1.surname as surname, users_1.domain as domain, users_1.username as username, users_1.groups as groups, users_1.department as department, - users_1.role as role, users_1.user_icon_path as user_icon_path, users_1.desktop_device as desktop_device, users_1.email as email, users_1.note as note, users_1.status as status, 0 as vm_admin, + users_1.role as role, users_1.user_icon_path as user_icon_path, users_1.email as email, users_1.note as note, users_1.status as status, 0 as vm_admin, users_1.session_count as session_count, users_1.last_admin_check_status as last_admin_check_status, users_1.group_ids as group_ids FROM users AS users_1 UNION SELECT 'group' as user_group, ad_groups.name as name, ad_groups.id as id, '' as surname, ad_groups.domain as domain, '' as username, '' as groups, '' as department, '' as role, - '' as user_icon_path, '' as desktop_device, '' as email, '' as note, ad_groups.status as status, 1 as vm_admin, 0 as session_count, null as last_admin_check_status, '' as group_ids + '' as user_icon_path, '' as email, '' as note, ad_groups.status as status, 1 as vm_admin, 0 as session_count, null as last_admin_check_status, '' as group_ids FROM ad_groups; @@ -734,7 +734,7 @@ AS SELECT users_1.user_group as user_group, users_1.name as name, permissions.object_id as vm_guid, users_1.user_id as user_id, users_1.surname as surname, users_1.domain as domain, - users_1.username as username, users_1.groups as groups, users_1.department as department, users_1.role as role, roles1.name as mla_role, users_1.user_icon_path as user_icon_path, users_1.desktop_device as desktop_device, users_1.email as email, + users_1.username as username, users_1.groups as groups, users_1.department as department, users_1.role as role, roles1.name as mla_role, users_1.user_icon_path as user_icon_path, users_1.email as email, users_1.note as note, users_1.status as status, users_1.vm_admin as vm_admin, tags_user_map_view_1.tag_name as tag_name, tags_user_map_view_1.tag_id as tag_id, users_1.session_count as session_count, users_1.last_admin_check_status as last_admin_check_status, users_1.group_ids as group_ids, pools.vm_pool_name as vm_pool_name FROM vdc_users AS users_1 LEFT OUTER JOIN @@ -746,7 +746,7 @@ WHERE (users_1.user_group = 'user') UNION SELECT users_2.user_group as user_group, users_2.name as name, permissions_1.object_id as vm_guid, users_2.user_id as user_id, users_2.surname as surname, users_2.domain as domain, - users_2.username as username, users_2.groups as groups, users_2.department as department, users_2.role as role, roles2.name as mla_role, users_2.user_icon_path as user_icon_path, users_2.desktop_device as desktop_device, users_2.email as email, + users_2.username as username, users_2.groups as groups, users_2.department as department, users_2.role as role, roles2.name as mla_role, users_2.user_icon_path as user_icon_path, users_2.email as email, users_2.note as note, users_2.status as status, users_2.vm_admin as vm_admin, tags_user_group_map_view.tag_name as tag_name, tags_user_group_map_view.tag_id as tag_id, users_2.session_count as session_count, users_2.last_admin_check_status as last_admin_check_status, users_2.group_ids as group_ids , pools1.vm_pool_name as vm_pool_name FROM vdc_users AS users_2 LEFT OUTER JOIN diff --git a/backend/manager/dbscripts/user_sp.sql b/backend/manager/dbscripts/user_sp.sql index 26cb5e4..c3ffe26 100644 --- a/backend/manager/dbscripts/user_sp.sql +++ b/backend/manager/dbscripts/user_sp.sql @@ -27,7 +27,6 @@ Create or replace FUNCTION InsertUser(v_department VARCHAR(255) , - v_desktop_device VARCHAR(255) , v_domain VARCHAR(255), v_email VARCHAR(255) , v_groups VARCHAR, @@ -43,8 +42,8 @@ RETURNS VOID AS $procedure$ BEGIN -INSERT INTO users(department, desktop_device, domain, email, groups, name, note, role, status, surname, user_icon_path, user_id, username, group_ids) - VALUES(v_department, v_desktop_device, v_domain, v_email, v_groups, v_name, v_note, v_role, v_status, v_surname, v_user_icon_path, v_user_id, v_username, v_group_ids); +INSERT INTO users(department, domain, email, groups, name, note, role, status, surname, user_icon_path, user_id, username, group_ids) + VALUES(v_department, v_domain, v_email, v_groups, v_name, v_note, v_role, v_status, v_surname, v_user_icon_path, v_user_id, v_username, v_group_ids); END; $procedure$ LANGUAGE plpgsql; @@ -53,7 +52,6 @@ Create or replace FUNCTION UpdateUser(v_department VARCHAR(255) , - v_desktop_device VARCHAR(255) , v_domain VARCHAR(255), v_email VARCHAR(255) , v_groups VARCHAR(4000), @@ -73,7 +71,7 @@ AS $procedure$ BEGIN UPDATE users - SET department = v_department,desktop_device = v_desktop_device,domain = v_domain, + SET department = v_department,domain = v_domain, email = v_email,groups = v_groups,name = v_name,note = v_note, role = v_role,status = v_status,surname = v_surname,user_icon_path = v_user_icon_path, username = v_username, 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 5c56891..811e115 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 @@ -35,9 +35,6 @@ @Size(max = BusinessEntitiesDefinitions.USER_ICON_PATH_SIZE) private String userIconPath = ""; - @Size(max = BusinessEntitiesDefinitions.USER_DESKTOP_DEVICE_SIZE) - private String desktopDevice = ""; - @Size(max = BusinessEntitiesDefinitions.USER_EMAIL_SIZE) private String email; @@ -61,32 +58,12 @@ public DbUser() { } - public DbUser(String department, String desktop_device, String domain, String email, String groups, String name, - String note, String role, int status, String surname, String user_icon_path, Guid user_id, String username, - String groupIds) { - this.department = department; - this.desktopDevice = desktop_device; - this.domain = domain; - this.email = email; - this.groups = groups; - this.name = name; - this.note = note; - this.role = role; - this.status = status; - this.surname = surname; - this.userIconPath = user_icon_path; - this.id = user_id; - this.username = username; - this.setGroupIds(groupIds); - } - @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((id == null) ? 0 : id.hashCode()); result = prime * result + ((department == null) ? 0 : department.hashCode()); - result = prime * result + ((desktopDevice == null) ? 0 : desktopDevice.hashCode()); result = prime * result + ((domain == null) ? 0 : domain.hashCode()); result = prime * result + ((email == null) ? 0 : email.hashCode()); result = prime * result + ((groups == null) ? 0 : groups.hashCode()); @@ -115,7 +92,6 @@ DbUser other = (DbUser) obj; return (ObjectUtils.objectsEqual(id, other.id) && ObjectUtils.objectsEqual(department, other.department) - && ObjectUtils.objectsEqual(desktopDevice, other.desktopDevice) && ObjectUtils.objectsEqual(domain, other.domain) && ObjectUtils.objectsEqual(email, other.email) && ObjectUtils.objectsEqual(groups, other.groups) @@ -135,14 +111,6 @@ public void setdepartment(String value) { this.department = value; - } - - public String getdesktop_device() { - return this.desktopDevice; - } - - public void setdesktop_device(String value) { - this.desktopDevice = value; } public String getdomain() { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java index f61743e..145e303 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbUserDAODbFacadeImpl.java @@ -24,7 +24,6 @@ public DbUser mapRow(ResultSet rs, int rowNum) throws SQLException { DbUser entity = new DbUser(); entity.setdepartment(rs.getString("department")); - entity.setdesktop_device(rs.getString("desktop_device")); entity.setdomain(rs.getString("domain")); entity.setemail(rs.getString("email")); entity.setgroups(rs.getString("groups")); @@ -48,7 +47,6 @@ public DbUserMapSqlParameterSource(DbUser user) { super(dialect); addValue("department", user.getdepartment()); - addValue("desktop_device", user.getdesktop_device()); addValue("domain", user.getdomain()); addValue("email", user.getemail()); addValue("groups", user.getgroups()); diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 050ef7a..e7dc1d9 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -2700,7 +2700,6 @@ <column>department</column> <column>role</column> <column>user_icon_path</column> - <column>desktop_device</column> <column>email</column> <column>note</column> <column>status</column> @@ -2718,7 +2717,6 @@ <null /> <null /> <null /> - <null /> <value>2</value> <value>0</value> <value>35487601-05ef-43b0-932d-8663ea4c9495,fa63c7e0-d9d4-492f-9e4e-6ed8c4719364</value> @@ -2730,7 +2728,6 @@ <value>testportal.redhat.com</value> <value>[email protected]</value> <value>[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users,[email protected]/test-all-users</value> - <null /> <null /> <null /> <null /> -- To view, visit http://gerrit.ovirt.org/13531 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a9cdcb4893c6643ef543a2fb22cc168336e36a0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
