Remove dependency on EhCache and use Spring's AclCache instead.

Author: hirokiterashima

pom.xml

@@ -428,10 +428,6 @@
       <artifactId>mysql-connector-java</artifactId>
       <version>8.0.30</version>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.zaxxer</groupId>
       <artifactId>HikariCP</artifactId>

src/main/java/org/wise/portal/spring/impl/ACLContext.java

@@ -23,24 +23,22 @@
  */
 package org.wise.portal.spring.impl;
 
-import java.util.Properties;
-
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.ehcache.EhCacheFactoryBean;
-import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.cache.CacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 import org.springframework.security.acls.domain.AclAuthorizationStrategy;
 import org.springframework.security.acls.domain.AclAuthorizationStrategyImpl;
 import org.springframework.security.acls.domain.ConsoleAuditLogger;
 import org.springframework.security.acls.domain.DefaultPermissionGrantingStrategy;
-import org.springframework.security.acls.domain.EhCacheBasedAclCache;
+import org.springframework.security.acls.domain.SpringCacheBasedAclCache;
 import org.springframework.security.acls.jdbc.BasicLookupStrategy;
 import org.springframework.security.acls.jdbc.JdbcMutableAclService;
 import org.springframework.security.acls.jdbc.LookupStrategy;
+import org.springframework.security.acls.model.AclCache;
 import org.springframework.security.acls.model.MutableAclService;
 import org.springframework.security.acls.model.PermissionGrantingStrategy;
 import org.wise.portal.domain.authentication.MutableAclSid;
@@ -60,22 +58,13 @@ public class ACLContext {
   @Autowired
   Environment appProperties;
 
-  @Bean
-  public EhCacheBasedAclCache aclCache() {
-    return new EhCacheBasedAclCache(aclEhCacheFactoryBean().getObject(), permissionGrantingStrategy(), aclAuthorizationStrategy());
-  }
-
-  @Bean
-  public EhCacheFactoryBean aclEhCacheFactoryBean() {
-    EhCacheFactoryBean ehCacheFactoryBean = new EhCacheFactoryBean();
-    ehCacheFactoryBean.setCacheManager(aclCacheManager().getObject());
-    ehCacheFactoryBean.setCacheName("aclCache");
-    return ehCacheFactoryBean;
-  }
+  @Autowired
+  CacheManager cacheManager;
 
   @Bean
-  public EhCacheManagerFactoryBean aclCacheManager() {
-    return new EhCacheManagerFactoryBean();
+  public AclCache aclCache() {
+    return new SpringCacheBasedAclCache(cacheManager.getCache("aclCache"),
+        permissionGrantingStrategy(), aclAuthorizationStrategy());
   }
 
   @Bean
@@ -90,14 +79,17 @@ public AclAuthorizationStrategy aclAuthorizationStrategy() {
 
   @Bean
   public LookupStrategy lookupStrategy() {
-    return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(), new ConsoleAuditLogger());
+    return new BasicLookupStrategy(dataSource, aclCache(), aclAuthorizationStrategy(),
+        new ConsoleAuditLogger());
   }
 
   @Bean
   public MutableAclService aclservice() {
-    JdbcMutableAclService aclService = new JdbcMutableAclService(dataSource, lookupStrategy(), aclCache());
+    JdbcMutableAclService aclService = new JdbcMutableAclService(dataSource, lookupStrategy(),
+        aclCache());
     if (appProperties.containsProperty("spring.datasource.driver-class-name")) {
-      String driverClass = (String) appProperties.getProperty("spring.datasource.driver-class-name");
+      String driverClass = (String) appProperties
+          .getProperty("spring.datasource.driver-class-name");
       if ("com.mysql.cj.jdbc.Driver".equals(driverClass)) {
         aclService.setClassIdentityQuery("SELECT @@IDENTITY");
         aclService.setSidIdentityQuery("SELECT @@IDENTITY");