From 0d705f53ca6c56df0da575e49eacf173a4ac474e Mon Sep 17 00:00:00 2001
From: Ali Oezyetimoglu <ali.oezyetimoglu@knecon.com>
Date: Thu, 21 Dec 2023 11:40:27 +0100
Subject: [PATCH] Revert "RED-5246: updated ACLBeanConfiguration to use
 CustomAclPermissionEvaluator and also changed to custom NotFoundException"

This reverts commit 7172ae55d661374f4bbdfbc6398636909ebc3c52.
---
 .../v1/processor/acl/ACLBeanConfiguration.java           | 9 ++++++---
 .../v1/processor/acl/CustomAclPermissionEvaluator.java   | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

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 ee8738a1b..93c32eff3 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,7 +1,5 @@
 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;
@@ -9,6 +7,7 @@ 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;
@@ -21,6 +20,10 @@ 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
@@ -78,7 +81,7 @@ public class ACLBeanConfiguration {
     public MethodSecurityExpressionHandler defaultMethodSecurityExpressionHandler() {
 
         DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
-        CustomAclPermissionEvaluator permissionEvaluator = new CustomAclPermissionEvaluator(aclService());
+        AclPermissionEvaluator permissionEvaluator = new AclPermissionEvaluator(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 127555f38..59f847b33 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,16 +1,18 @@
 package com.iqser.red.service.persistence.management.v1.processor.acl;
 
-import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
-import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
+import java.io.Serializable;
+
 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 java.io.Serializable;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotAllowedException;
 
 public class CustomAclPermissionEvaluator extends AclPermissionEvaluator {
 
     public CustomAclPermissionEvaluator(AclService aclService) {
+
         super(aclService);
     }
 
-- 
2.47.2