Evict cache when role permissions are updated.

Increased size of small-heap configuration.

Author: chrisknoll

src/main/java/org/ohdsi/webapi/shiro/PermissionManager.java

@@ -294,13 +294,15 @@ public Set<PermissionEntity> getRolePermissions(Long roleId) {
     return permissions;
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void addPermission(Long roleId, Long permissionId) {
     PermissionEntity permission = this.getPermissionById(permissionId);
     RoleEntity role = this.getRoleById(roleId);
 
     this.addPermission(role, permission, null);
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void addPermission(RoleEntity role, PermissionEntity permission) {
     this.addPermission(role, permission, null);
   }
@@ -318,13 +320,15 @@ public Set<UserEntity> getRoleUsers(Long roleId) {
     return users;
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void addUser(Long userId, Long roleId) {
     UserEntity user = this.getUserById(userId);
     RoleEntity role = this.getRoleById(roleId);
 
     this.addUser(user, role, UserOrigin.SYSTEM, null);
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void removeUser(Long userId, Long roleId) {
     UserRoleEntity userRole = this.userRoleRepository.findByUserIdAndRoleId(userId, roleId);
     if (userRole != null)
@@ -553,6 +557,7 @@ public RoleEntity updateRole(RoleEntity roleEntity) {
     return this.roleRepository.save(roleEntity);
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void addPermissionsFromTemplate(RoleEntity roleEntity, Map<String, String> template, String value) {
     for (Map.Entry<String, String> entry : template.entrySet()) {
       String permission = String.format(entry.getKey(), value);
@@ -562,11 +567,13 @@ public void addPermissionsFromTemplate(RoleEntity roleEntity, Map<String, String
     }
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void addPermissionsFromTemplate(Map<String, String> template, String value) {
     RoleEntity currentUserPersonalRole = getCurrentUserPersonalRole();
     addPermissionsFromTemplate(currentUserPersonalRole, template, value);
   }
 
+	@CacheEvict(cacheNames = CachingSetup.AUTH_INFO_CACHE, allEntries = true)
   public void removePermissionsFromTemplate(Map<String, String> template, String value) {
     for (Map.Entry<String, String> entry : template.entrySet()) {
       String permission = String.format(entry.getKey(), value);

src/main/resources/appCache.xml

@@ -15,17 +15,17 @@
 	</service>
 	<cache-template name="small-heap">
 		<resources>
-			<heap unit="entries">10</heap>
+			<heap unit="entries">50</heap>
 		</resources>
 	</cache-template>
 	<cache-template name="medium-heap">
 		<resources>
-			<heap unit="entries">100</heap>
+			<heap unit="entries">500</heap>
 		</resources>
 	</cache-template>
 	<cache-template name="medium-offheap">
 		<resources>
-			<heap unit="entries">100</heap>
+			<heap unit="entries">500</heap>
 			<offheap unit="MB">10</offheap> <!-- unit of measure is case sensitive! -->
 		</resources>
 	</cache-template>