diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/ACLBeanConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/ACLBeanConfiguration.java index 93c32eff3..ee8738a1b 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/ACLBeanConfiguration.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/ACLBeanConfiguration.java @@ -1,5 +1,7 @@ package com.iqser.red.service.persistence.management.v1.processor.acl; +import com.knecon.fforesight.databasetenantcommons.providers.MultiTenantDataSource; +import lombok.RequiredArgsConstructor; import org.springframework.cache.CacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +9,6 @@ import org.springframework.context.annotation.Primary; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.acls.AclPermissionCacheOptimizer; -import org.springframework.security.acls.AclPermissionEvaluator; import org.springframework.security.acls.domain.AclAuthorizationStrategy; import org.springframework.security.acls.domain.ConsoleAuditLogger; import org.springframework.security.acls.domain.DefaultPermissionFactory; @@ -20,10 +21,6 @@ import org.springframework.security.acls.jdbc.LookupStrategy; import org.springframework.security.acls.model.PermissionGrantingStrategy; import org.springframework.transaction.annotation.EnableTransactionManagement; -import com.knecon.fforesight.databasetenantcommons.providers.MultiTenantDataSource; - -import lombok.RequiredArgsConstructor; - @Configuration @RequiredArgsConstructor @EnableTransactionManagement @@ -81,7 +78,7 @@ public class ACLBeanConfiguration { public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() { DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler(); - AclPermissionEvaluator permissionEvaluator = new AclPermissionEvaluator(aclService()); + CustomAclPermissionEvaluator permissionEvaluator = new CustomAclPermissionEvaluator(aclService()); permissionEvaluator.setPermissionFactory(permissionFactory()); expressionHandler.setPermissionEvaluator(permissionEvaluator); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/CustomAclPermissionEvaluator.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/CustomAclPermissionEvaluator.java index 59f847b33..127555f38 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/CustomAclPermissionEvaluator.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/CustomAclPermissionEvaluator.java @@ -1,18 +1,16 @@ package com.iqser.red.service.persistence.management.v1.processor.acl; -import java.io.Serializable; - +import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException; +import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; import org.springframework.security.acls.AclPermissionEvaluator; import org.springframework.security.acls.model.AclService; -import org.springframework.security.acls.model.NotFoundException; import org.springframework.security.core.Authentication; -import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException; +import java.io.Serializable; public class CustomAclPermissionEvaluator extends AclPermissionEvaluator { public CustomAclPermissionEvaluator(AclService aclService) { - super(aclService); }