Laszlo Hornyak has uploaded a new change for review.
Change subject: engine: [wip] Remove DbUser.iconPath property
......................................................................
engine: [wip] Remove DbUser.iconPath property
icon path property was not used in any processing, only in DB
persistence and entity.
Change-Id: Iebc78ad1b8f7d1432ee4ffcaa484e41fc39c3412
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
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/BusinessEntitiesDefinitions.java
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
7 files changed, 8 insertions(+), 31 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/13705/1
diff --git a/backend/manager/dbscripts/create_tables.sql
b/backend/manager/dbscripts/create_tables.sql
index ae82de7..9ba13dd 100644
--- a/backend/manager/dbscripts/create_tables.sql
+++ b/backend/manager/dbscripts/create_tables.sql
@@ -308,7 +308,6 @@
groups VARCHAR NOT NULL,
department VARCHAR(255),
role VARCHAR(255),
- user_icon_path VARCHAR(255),
desktop_device VARCHAR(255),
email VARCHAR(255),
note VARCHAR(255),
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index 94ca169..65bff77 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.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.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 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
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.desktop_device as desktop_device, 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.desktop_device as desktop_device, 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..e5bd417 100644
--- a/backend/manager/dbscripts/user_sp.sql
+++ b/backend/manager/dbscripts/user_sp.sql
@@ -36,15 +36,14 @@
v_role VARCHAR(255) ,
v_status INTEGER,
v_surname VARCHAR(255) ,
- v_user_icon_path VARCHAR(255) ,
v_user_id UUID,
v_username VARCHAR(255),
v_group_ids VARCHAR(2048))
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, desktop_device, domain, email, groups, name,
note, role, status, surname, 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_id, v_username,
v_group_ids);
END; $procedure$
LANGUAGE plpgsql;
@@ -62,7 +61,6 @@
v_role VARCHAR(255) ,
v_status INTEGER,
v_surname VARCHAR(255) ,
- v_user_icon_path VARCHAR(255) ,
v_user_id UUID,
v_username VARCHAR(255),
v_last_admin_check_status BOOLEAN,
@@ -75,7 +73,7 @@
UPDATE users
SET department = v_department,desktop_device = v_desktop_device,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,
+ role = v_role,status = v_status,surname = v_surname,
username = v_username,
last_admin_check_status = v_last_admin_check_status,
group_ids = v_group_ids
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
index 9a79e38..ef5e2f62 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitiesDefinitions.java
@@ -73,7 +73,6 @@
public static final int USER_NOTE_SIZE = 255;
public static final int USER_ROLE_SIZE = 255;
public static final int USER_SURENAME_SIZE = 255;
- public static final int USER_ICON_PATH_SIZE = 255;
public static final int USER_USER_NAME_SIZE = 255;
// General descriptions
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..f83cada 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
@@ -32,9 +32,6 @@
@Size(max = BusinessEntitiesDefinitions.USER_ROLE_SIZE)
private String role = "";
- @Size(max = BusinessEntitiesDefinitions.USER_ICON_PATH_SIZE)
- private String userIconPath = "";
-
@Size(max = BusinessEntitiesDefinitions.USER_DESKTOP_DEVICE_SIZE)
private String desktopDevice = "";
@@ -62,7 +59,7 @@
}
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 note, String role, int status, String surname, Guid
user_id, String username,
String groupIds) {
this.department = department;
this.desktopDevice = desktop_device;
@@ -74,7 +71,6 @@
this.role = role;
this.status = status;
this.surname = surname;
- this.userIconPath = user_icon_path;
this.id = user_id;
this.username = username;
this.setGroupIds(groupIds);
@@ -96,7 +92,6 @@
result = prime * result + ((role == null) ? 0 : role.hashCode());
result = prime * result + status;
result = prime * result + ((surname == null) ? 0 : surname.hashCode());
- result = prime * result + ((userIconPath == null) ? 0 :
userIconPath.hashCode());
result = prime * result + ((username == null) ? 0 :
username.hashCode());
return result;
}
@@ -125,7 +120,6 @@
&& ObjectUtils.objectsEqual(role, other.role)
&& status == other.status
&& ObjectUtils.objectsEqual(surname, other.surname)
- && ObjectUtils.objectsEqual(userIconPath, other.userIconPath)
&& ObjectUtils.objectsEqual(username, other.username));
}
@@ -207,14 +201,6 @@
public void setsurname(String value) {
this.surname = value;
- }
-
- public String getuser_icon_path() {
- return this.userIconPath;
- }
-
- public void setuser_icon_path(String value) {
- this.userIconPath = value;
}
public Guid getuser_id() {
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..6aae3ab 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
@@ -34,7 +34,6 @@
entity.setrole(rs.getString("role"));
entity.setstatus(rs.getInt("status"));
entity.setsurname(rs.getString("surname"));
- entity.setuser_icon_path(rs.getString("user_icon_path"));
entity.setuser_id(Guid.createGuidFromString(rs.getString("user_id")));
entity.setusername(rs.getString("username"));
entity.setLastAdminCheckStatus(rs.getBoolean("last_admin_check_status"));
@@ -57,7 +56,6 @@
addValue("role", user.getrole());
addValue("status", user.getstatus());
addValue("surname", user.getsurname());
- addValue("user_icon_path", user.getuser_icon_path());
addValue("user_id", user.getuser_id());
addValue("username", user.getusername());
addValue("last_admin_check_status",
user.getLastAdminCheckStatus());
diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml
b/backend/manager/modules/dal/src/test/resources/fixtures.xml
index 050ef7a..db46df0 100644
--- a/backend/manager/modules/dal/src/test/resources/fixtures.xml
+++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml
@@ -2699,7 +2699,6 @@
<column>groups</column>
<column>department</column>
<column>role</column>
- <column>user_icon_path</column>
<column>desktop_device</column>
<column>email</column>
<column>note</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>userport...@testportal.redhat.com</value>
<value>qa-membersgr...@testportal.redhat.com/test-all-users,qb-membersgr...@testportal.redhat.com/test-all-users,qc-membersgr...@testportal.redhat.com/test-all-users,qd-membersgr...@testportal.redhat.com/test-all-users,qe-membersgr...@testportal.redhat.com/test-all-users,qf-membersgr...@testportal.redhat.com/test-all-users,qg-membersgr...@testportal.redhat.com/test-all-users,qh-membersgr...@testportal.redhat.com/test-all-users,qi-membersgr...@testportal.redhat.com/test-all-users</value>
- <null />
<null />
<null />
<null />
--
To view, visit http://gerrit.ovirt.org/13705
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebc78ad1b8f7d1432ee4ffcaa484e41fc39c3412
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
