From b4d02c968b6f8219ac1a1aee65ebad43ab9e3d0d Mon Sep 17 00:00:00 2001 From: eahuma Date: Wed, 3 Jun 2020 18:47:11 +0200 Subject: [PATCH] PROFILES-26: Stack trace when trying to manage role for a profile --- .../profiles/business/IProfileDAO.java | 4 ++-- .../plugins/profiles/business/ProfileDAO.java | 8 +++---- .../profiles/business/ProfileHome.java | 4 ++-- .../ProfilesAdminUserFieldListener.java | 16 +++++++------- .../profiles/service/IProfilesService.java | 4 ++-- .../profiles/service/ProfilesService.java | 8 +++---- .../plugins/profiles/web/ProfilesJspBean.java | 22 +++++++++---------- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/java/fr/paris/lutece/plugins/profiles/business/IProfileDAO.java b/src/java/fr/paris/lutece/plugins/profiles/business/IProfileDAO.java index 267c9bf..ceb16ee 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/business/IProfileDAO.java +++ b/src/java/fr/paris/lutece/plugins/profiles/business/IProfileDAO.java @@ -34,7 +34,7 @@ package fr.paris.lutece.plugins.profiles.business; import fr.paris.lutece.plugins.profiles.business.views.View; -import fr.paris.lutece.portal.business.rbac.AdminRole; +import fr.paris.lutece.portal.business.rbac.RBACRole; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.user.AdminUser; import fr.paris.lutece.portal.business.workgroup.AdminWorkgroup; @@ -284,7 +284,7 @@ public interface IProfileDAO * Plugin * @return The list of roles */ - List selectRolesListForProfile( String strProfileKey, Plugin plugin ); + List selectRolesListForProfile( String strProfileKey, Plugin plugin ); /** * Check if a profile has the given role. diff --git a/src/java/fr/paris/lutece/plugins/profiles/business/ProfileDAO.java b/src/java/fr/paris/lutece/plugins/profiles/business/ProfileDAO.java index 36b4525..ff70641 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/business/ProfileDAO.java +++ b/src/java/fr/paris/lutece/plugins/profiles/business/ProfileDAO.java @@ -35,7 +35,7 @@ import fr.paris.lutece.plugins.profiles.business.views.View; import fr.paris.lutece.plugins.profiles.utils.constants.ProfilesConstants; -import fr.paris.lutece.portal.business.rbac.AdminRole; +import fr.paris.lutece.portal.business.rbac.RBACRole; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.user.AdminUser; import fr.paris.lutece.portal.business.workgroup.AdminWorkgroup; @@ -483,9 +483,9 @@ public void deleteWorkgroups( String strProfileKey, Plugin plugin ) * {@inheritDoc} */ @Override - public List selectRolesListForProfile( String strProfileKey, Plugin plugin ) + public List selectRolesListForProfile( String strProfileKey, Plugin plugin ) { - List listRoles = new ArrayList( ); + List listRoles = new ArrayList( ); DAOUtil daoUtil = new DAOUtil( SQL_QUERY_SELECT_ROLES_LIST_FOR_PROFILE, plugin ); daoUtil.setString( 1, strProfileKey ); @@ -494,7 +494,7 @@ public List selectRolesListForProfile( String strProfileKey, Plugin p while ( daoUtil.next( ) ) { - AdminRole role = new AdminRole( ); + RBACRole role = new RBACRole( ); role.setKey( daoUtil.getString( 1 ) ); listRoles.add( role ); diff --git a/src/java/fr/paris/lutece/plugins/profiles/business/ProfileHome.java b/src/java/fr/paris/lutece/plugins/profiles/business/ProfileHome.java index ff255b6..8b357e6 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/business/ProfileHome.java +++ b/src/java/fr/paris/lutece/plugins/profiles/business/ProfileHome.java @@ -34,7 +34,7 @@ package fr.paris.lutece.plugins.profiles.business; import fr.paris.lutece.plugins.profiles.business.views.View; -import fr.paris.lutece.portal.business.rbac.AdminRole; +import fr.paris.lutece.portal.business.rbac.RBACRole; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.user.AdminUser; import fr.paris.lutece.portal.business.workgroup.AdminWorkgroup; @@ -364,7 +364,7 @@ public static void removeWorkgroups( String strProfileKey, Plugin plugin ) * Plugin * @return The list of roles */ - public static List getRolesListForProfile( String strProfileKey, Plugin plugin ) + public static List getRolesListForProfile( String strProfileKey, Plugin plugin ) { return _dao.selectRolesListForProfile( strProfileKey, plugin ); } diff --git a/src/java/fr/paris/lutece/plugins/profiles/business/ProfilesAdminUserFieldListener.java b/src/java/fr/paris/lutece/plugins/profiles/business/ProfilesAdminUserFieldListener.java index 5040e5d..9352801 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/business/ProfilesAdminUserFieldListener.java +++ b/src/java/fr/paris/lutece/plugins/profiles/business/ProfilesAdminUserFieldListener.java @@ -34,8 +34,8 @@ package fr.paris.lutece.plugins.profiles.business; import fr.paris.lutece.plugins.profiles.service.ProfilesPlugin; -import fr.paris.lutece.portal.business.rbac.AdminRole; -import fr.paris.lutece.portal.business.rbac.AdminRoleHome; +import fr.paris.lutece.portal.business.rbac.RBACRole; +import fr.paris.lutece.portal.business.rbac.RBACRoleHome; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.right.RightHome; import fr.paris.lutece.portal.business.user.AdminUser; @@ -86,9 +86,9 @@ public void doCreateUserFields( AdminUser user, List listUserFie } // Add roles to the user - for ( AdminRole role : ProfileHome.getRolesListForProfile( strProfileKey, plugin ) ) + for ( RBACRole role : ProfileHome.getRolesListForProfile( strProfileKey, plugin ) ) { - role = AdminRoleHome.findByPrimaryKey( role.getKey( ) ); + role = RBACRoleHome.findByPrimaryKey( role.getKey( ) ); if ( !AdminUserHome.hasRole( user, role.getKey( ) ) ) { @@ -143,9 +143,9 @@ public void doModifyUserFields( AdminUser user, List listUserFie } // Remove roles to the user - for ( AdminRole role : ProfileHome.getRolesListForProfile( strKey, plugin ) ) + for ( RBACRole role : ProfileHome.getRolesListForProfile( strKey, plugin ) ) { - role = AdminRoleHome.findByPrimaryKey( role.getKey( ) ); + role = RBACRoleHome.findByPrimaryKey( role.getKey( ) ); if ( AdminUserHome.hasRole( user, role.getKey( ) ) ) { @@ -188,9 +188,9 @@ public void doModifyUserFields( AdminUser user, List listUserFie } // Add roles to the user - for ( AdminRole role : ProfileHome.getRolesListForProfile( strProfileKey, plugin ) ) + for ( RBACRole role : ProfileHome.getRolesListForProfile( strProfileKey, plugin ) ) { - role = AdminRoleHome.findByPrimaryKey( role.getKey( ) ); + role = RBACRoleHome.findByPrimaryKey( role.getKey( ) ); if ( role != null && !AdminUserHome.hasRole( user, role.getKey( ) ) ) { diff --git a/src/java/fr/paris/lutece/plugins/profiles/service/IProfilesService.java b/src/java/fr/paris/lutece/plugins/profiles/service/IProfilesService.java index 78a1c1d..5272292 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/service/IProfilesService.java +++ b/src/java/fr/paris/lutece/plugins/profiles/service/IProfilesService.java @@ -37,7 +37,7 @@ import fr.paris.lutece.plugins.profiles.business.ProfileAction; import fr.paris.lutece.plugins.profiles.business.ProfileFilter; import fr.paris.lutece.plugins.profiles.business.views.View; -import fr.paris.lutece.portal.business.rbac.AdminRole; +import fr.paris.lutece.portal.business.rbac.RBACRole; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.user.AdminUser; import fr.paris.lutece.portal.business.workgroup.AdminWorkgroup; @@ -365,7 +365,7 @@ public interface IProfilesService * Plugin * @return The list of roles */ - List getRolesListForProfile( String strProfileKey, Plugin plugin ); + List getRolesListForProfile( String strProfileKey, Plugin plugin ); /** * Check if a profile has the given role. diff --git a/src/java/fr/paris/lutece/plugins/profiles/service/ProfilesService.java b/src/java/fr/paris/lutece/plugins/profiles/service/ProfilesService.java index 8711ea6..ee4e2b9 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/service/ProfilesService.java +++ b/src/java/fr/paris/lutece/plugins/profiles/service/ProfilesService.java @@ -40,7 +40,7 @@ import fr.paris.lutece.plugins.profiles.business.views.View; import fr.paris.lutece.plugins.profiles.service.action.IProfileActionService; import fr.paris.lutece.plugins.profiles.utils.constants.ProfilesConstants; -import fr.paris.lutece.portal.business.rbac.AdminRole; +import fr.paris.lutece.portal.business.rbac.RBACRole; import fr.paris.lutece.portal.business.right.Right; import fr.paris.lutece.portal.business.user.AdminUser; import fr.paris.lutece.portal.business.user.AdminUserHome; @@ -166,7 +166,7 @@ public void doUnassignUserFromProfile( int nIdUser, String strProfileKey, AdminU List listProfiles = findProfileByIdUser( nIdUser, plugin ); Set listProfilesRights = new HashSet( ); - Set listProfilesRoles = new HashSet( ); + Set listProfilesRoles = new HashSet( ); Set listProfilesWorkgroups = new HashSet( ); for ( Profile profile : listProfiles ) { @@ -189,7 +189,7 @@ public void doUnassignUserFromProfile( int nIdUser, String strProfileKey, AdminU } // Remove roles to the user - for ( AdminRole role : getRolesListForProfile( strProfileKey, plugin ) ) + for ( RBACRole role : getRolesListForProfile( strProfileKey, plugin ) ) { if ( !listProfilesRoles.contains( role ) && AdminUserHome.hasRole( user, role.getKey( ) ) ) { @@ -462,7 +462,7 @@ public void removeWorkgroups( String strProfileKey, Plugin plugin ) * {@inheritDoc} */ @Override - public List getRolesListForProfile( String strProfileKey, Plugin plugin ) + public List getRolesListForProfile( String strProfileKey, Plugin plugin ) { return ProfileHome.getRolesListForProfile( strProfileKey, plugin ); } diff --git a/src/java/fr/paris/lutece/plugins/profiles/web/ProfilesJspBean.java b/src/java/fr/paris/lutece/plugins/profiles/web/ProfilesJspBean.java index 55f3c6a..cbb2199 100644 --- a/src/java/fr/paris/lutece/plugins/profiles/web/ProfilesJspBean.java +++ b/src/java/fr/paris/lutece/plugins/profiles/web/ProfilesJspBean.java @@ -43,9 +43,9 @@ import fr.paris.lutece.plugins.profiles.service.action.IProfileActionService; import fr.paris.lutece.plugins.profiles.service.views.IViewsService; import fr.paris.lutece.plugins.profiles.utils.constants.ProfilesConstants; -import fr.paris.lutece.portal.business.rbac.AdminRole; -import fr.paris.lutece.portal.business.rbac.AdminRoleHome; import fr.paris.lutece.portal.business.rbac.RBAC; +import fr.paris.lutece.portal.business.rbac.RBACRole; +import fr.paris.lutece.portal.business.rbac.RBACRoleHome; import fr.paris.lutece.portal.business.right.Level; import fr.paris.lutece.portal.business.right.LevelHome; import fr.paris.lutece.portal.business.right.Right; @@ -868,11 +868,11 @@ public String getAssignRolesProfile( HttpServletRequest request ) Profile profile = _profilesService.findByPrimaryKey( strProfileKey, getPlugin( ) ); // ASSIGNED ROLES - List listAssignedRoles = new ArrayList( ); + List listAssignedRoles = new ArrayList( ); - for ( AdminRole role : _profilesService.getRolesListForProfile( strProfileKey, getPlugin( ) ) ) + for ( RBACRole role : _profilesService.getRolesListForProfile( strProfileKey, getPlugin( ) ) ) { - role = AdminRoleHome.findByPrimaryKey( role.getKey( ) ); + role = RBACRoleHome.findByPrimaryKey( role.getKey( ) ); if ( role != null ) { @@ -885,14 +885,14 @@ public String getAssignRolesProfile( HttpServletRequest request ) ReferenceItem itemRole = null; boolean bAssigned; - for ( AdminRole role : AdminRoleHome.findAll( ) ) + for ( RBACRole role : RBACRoleHome.findAll( ) ) { itemRole = new ReferenceItem( ); itemRole.setCode( role.getKey( ) ); itemRole.setName( role.getKey( ) ); bAssigned = false; - for ( AdminRole assignedRole : listAssignedRoles ) + for ( RBACRole assignedRole : listAssignedRoles ) { if ( assignedRole.getKey( ).equals( itemRole.getCode( ) ) ) { @@ -947,8 +947,8 @@ public String getAssignRolesProfile( HttpServletRequest request ) // PAGINATOR url.addParameter( ProfilesConstants.PARAMETER_PROFILE_KEY, profile.getKey( ) ); - LocalizedPaginator paginator = new LocalizedPaginator( listAssignedRoles, _nItemsPerPage, url.getUrl( ), - Paginator.PARAMETER_PAGE_INDEX, _strCurrentPageIndex, getLocale( ) ); + LocalizedPaginator paginator = new LocalizedPaginator( listAssignedRoles, _nItemsPerPage, + url.getUrl( ), Paginator.PARAMETER_PAGE_INDEX, _strCurrentPageIndex, getLocale( ) ); // PERMISSIONS List listActions = _profilesService.getListActions( getUser( ), profile, strPermission, getLocale( ), getPlugin( ) ); @@ -1006,7 +1006,7 @@ public String doAssignRolesProfile( HttpServletRequest request ) _profilesService.addRoleForProfile( strProfileKey, arrayRoleIds [i], getPlugin( ) ); // Update users roles - AdminRole role = AdminRoleHome.findByPrimaryKey( arrayRoleIds [i] ); + RBACRole role = RBACRoleHome.findByPrimaryKey( arrayRoleIds[i] ); for ( AdminUser user : _profilesService.getUsersListForProfile( strProfileKey, getPlugin( ) ) ) { @@ -1048,7 +1048,7 @@ public String doUnassignRoleProfile( HttpServletRequest request ) _profilesService.removeRoleFromProfile( strProfileKey, strRoleKey, getPlugin( ) ); // Update users roles - AdminRole role = AdminRoleHome.findByPrimaryKey( strRoleKey ); + RBACRole role = RBACRoleHome.findByPrimaryKey( strRoleKey ); for ( AdminUser user : _profilesService.getUsersListForProfile( strProfileKey, getPlugin( ) ) ) {