Fixing 2nd level cache, finally

Author: ilgrosso

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/PersistenceContext.java

@@ -186,6 +186,8 @@
 import org.apache.syncope.core.persistence.jpa.dao.repo.UserRepoExtImpl;
 import org.apache.syncope.core.persistence.jpa.dao.repo.WAConfigRepo;
 import org.apache.syncope.core.persistence.jpa.entity.task.JPATaskUtilsFactory;
+import org.apache.syncope.core.persistence.jpa.hibernate.DomainJCacheRegionFactory;
+import org.apache.syncope.core.persistence.jpa.hibernate.Jackson3JsonFormatMapper;
 import org.apache.syncope.core.persistence.jpa.spring.CommonEntityManagerFactoryConf;
 import org.apache.syncope.core.persistence.jpa.spring.DomainRoutingEntityManagerFactory;
 import org.apache.syncope.core.persistence.jpa.spring.MultiJarAwarePersistenceUnitPostProcessor;
@@ -237,6 +239,7 @@ public CommonEntityManagerFactoryConf commonEMFConf(
         jpaPropertyMap.put("hibernate.javax.cache.provider", props.getCacheProvider());
         Optional.ofNullable(props.getCacheURI()).
                 ifPresent(cacheURI -> jpaPropertyMap.put("hibernate.javax.cache.uri", cacheURI));
+        jpaPropertyMap.put("hibernate.cache.region.factory_class", DomainJCacheRegionFactory.class.getName());
 
         // until https://hibernate.atlassian.net/browse/HHH-19890 https://github.com/hibernate/hibernate-orm/pull/11357
         jpaPropertyMap.put("hibernate.type.json_format_mapper", Jackson3JsonFormatMapper.class.getName());

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/repo/NotificationRepo.java

@@ -24,5 +24,4 @@
 
 public interface NotificationRepo
         extends ListCrudRepository<JPANotification, String>, NotificationRepoExt, NotificationDAO {
-
 }

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/hibernate/DomainJCacheRegionFactory.java

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.core.persistence.jpa.hibernate;
+
+import org.hibernate.cache.jcache.internal.JCacheRegionFactory;
+
+public class DomainJCacheRegionFactory extends JCacheRegionFactory {
+
+    private static final long serialVersionUID = -6813667559684397717L;
+
+    @Override
+    protected void releaseFromUse() {
+        // nothing to release, there might be other Domains using the cacheManager instance
+    }
+}

…stence/jpa/Jackson3JsonFormatMapper.java …/hibernate/Jackson3JsonFormatMapper.javacore/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/Jackson3JsonFormatMapper.java renamed to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/hibernate/Jackson3JsonFormatMapper.java core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/Jackson3JsonFormatMapper.java renamed to core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/hibernate/Jackson3JsonFormatMapper.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.jpa;
+package org.apache.syncope.core.persistence.jpa.hibernate;
 
 import java.lang.reflect.Type;
 import java.util.List;

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/CommonEntityManagerFactoryConf.java

@@ -22,6 +22,7 @@
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.sql.DataSource;
 import org.apache.syncope.core.persistence.api.DomainHolder;
@@ -98,8 +99,6 @@ public void setPersistenceUnitPostProcessors(final PersistenceUnitPostProcessor.
     }
 
     public void setJpaPropertyMap(final Map<String, ?> jpaProperties) {
-        if (jpaProperties != null) {
-            this.jpaPropertyMap.putAll(jpaProperties);
-        }
+        Optional.ofNullable(jpaProperties).ifPresent(jpaPropertyMap::putAll);
     }
 }

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainEntityManagerFactoryBean.java

@@ -27,6 +27,7 @@
 import org.apache.syncope.core.persistence.jpa.ConnectorManagerRemoteCommitListener;
 import org.apache.syncope.core.persistence.jpa.entity.JPAConnInstance;
 import org.apache.syncope.core.persistence.jpa.entity.JPAExternalResource;
+import org.hibernate.cache.spi.support.RegionNameQualifier;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
 /**
@@ -42,15 +43,13 @@ public class DomainEntityManagerFactoryBean extends LocalContainerEntityManagerF
     public void setCommonEntityManagerFactoryConf(final CommonEntityManagerFactoryConf commonEMFConf) {
         super.setJpaPropertyMap(commonEMFConf.getJpaPropertyMap());
 
-        if (commonEMFConf.getPackagesToScan() != null) {
-            super.setPackagesToScan(commonEMFConf.getPackagesToScan());
-        }
+        Optional.ofNullable(commonEMFConf.getPackagesToScan()).
+                ifPresent(super::setPackagesToScan);
 
         super.setValidationMode(commonEMFConf.getValidationMode());
 
-        if (commonEMFConf.getPersistenceUnitPostProcessors() != null) {
-            super.setPersistenceUnitPostProcessors(commonEMFConf.getPersistenceUnitPostProcessors());
-        }
+        Optional.ofNullable(commonEMFConf.getPersistenceUnitPostProcessors()).
+                ifPresent(super::setPersistenceUnitPostProcessors);
     }
 
     public void setConnectorManagerRemoteCommitListener(
@@ -64,13 +63,15 @@ protected void postProcessEntityManagerFactory(final EntityManagerFactory emf, f
         super.postProcessEntityManagerFactory(emf, pui);
 
         Optional.ofNullable(Caching.getCachingProvider().getCacheManager().
-                getCache(JPAConnInstance.class.getName())).
+                getCache(RegionNameQualifier.INSTANCE.qualify(
+                        pui.getPersistenceUnitName(), JPAConnInstance.class.getName()))).
                 ifPresent(cache -> cache.registerCacheEntryListener(
                 new MutableCacheEntryListenerConfiguration<Object, Object>(
                         FactoryBuilder.factoryOf(connectorManagerRemoteCommitListener),
                         null, false, false)));
         Optional.ofNullable(Caching.getCachingProvider().getCacheManager().
-                getCache(JPAExternalResource.class.getName())).
+                getCache(RegionNameQualifier.INSTANCE.qualify(
+                        pui.getPersistenceUnitName(), JPAExternalResource.class.getName()))).
                 ifPresent(cache -> cache.registerCacheEntryListener(
                 new MutableCacheEntryListenerConfiguration<Object, Object>(
                         FactoryBuilder.factoryOf(connectorManagerRemoteCommitListener),

core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/spring/DomainRoutingEntityManagerFactory.java

@@ -64,12 +64,15 @@ public DomainRoutingEntityManagerFactory(final CommonEntityManagerFactoryConf co
     protected void addToJpaPropertyMap(
             final DomainEntityManagerFactoryBean emf,
             final JpaVendorAdapter vendorAdapter,
-            final String dbSchema) {
+            final String dbSchema,
+            final String domain) {
 
         emf.getJpaPropertyMap().putAll(vendorAdapter.getJpaPropertyMap());
 
         Optional.ofNullable(dbSchema).
                 ifPresent(s -> emf.getJpaPropertyMap().put("hibernate.default_schema", s));
+
+        emf.getJpaPropertyMap().put("hibernate.cache.region_prefix", domain);
     }
 
     public void master(
@@ -93,7 +96,8 @@ public void master(
         addToJpaPropertyMap(
                 emf,
                 vendorAdapter,
-                props.getDomain().getFirst().getDbSchema());
+                props.getDomain().getFirst().getDbSchema(),
+                SyncopeConstants.MASTER_DOMAIN);
 
         emf.afterPropertiesSet();
 
@@ -117,7 +121,7 @@ public void domain(
         emf.setCommonEntityManagerFactoryConf(commonEMFConf);
         emf.setConnectorManagerRemoteCommitListener(new ConnectorManagerRemoteCommitListener(this, domain.getKey()));
 
-        addToJpaPropertyMap(emf, vendorAdapter, domain.getDbSchema());
+        addToJpaPropertyMap(emf, vendorAdapter, domain.getDbSchema(), domain.getKey());
 
         emf.afterPropertiesSet();