HHH-7102 Misleading error message is shown when no RegionFactory is manually set

Author: stliu

hibernate-core/src/main/java/org/hibernate/cache/NoCachingEnabledException.java renamed to hibernate-core/src/main/java/org/hibernate/cache/NoCacheRegionFactoryAvailableException.java

@@ -26,17 +26,16 @@
 import org.hibernate.cfg.Environment;
 
 /**
- * Implementation of NoCachingEnabledException.
+ * Implementation of NoCacheRegionFactoryAvailableException.
  *
  * @author Steve Ebersole
  */
-public class NoCachingEnabledException extends CacheException {
-private static final String MSG =
- "Second-level cache is not enabled for usage [" +
- Environment.USE_SECOND_LEVEL_CACHE +
- " | " + Environment.USE_QUERY_CACHE + "]";
-
-public NoCachingEnabledException() {
+public class NoCacheRegionFactoryAvailableException extends CacheException {
+private static final String MSG = "Second-level cache is used in the application, but property "
++ Environment.CACHE_REGION_FACTORY + "is not gaven, please either disable second level cache" +
+" or set correct region factory class name to property "+Environment.CACHE_REGION_FACTORY+
+" (and make sure the second level cache provider, hibernate-infinispan, for example, available in the classpath).";
+public NoCacheRegionFactoryAvailableException() {
 super( MSG );
 }
 }

hibernate-core/src/main/java/org/hibernate/cache/internal/NoCachingRegionFactory.java

@@ -26,7 +26,7 @@
 import java.util.Properties;
 
 import org.hibernate.cache.CacheException;
-import org.hibernate.cache.NoCachingEnabledException;
+import org.hibernate.cache.NoCacheRegionFactoryAvailableException;
 import org.hibernate.cache.spi.CacheDataDescription;
 import org.hibernate.cache.spi.CollectionRegion;
 import org.hibernate.cache.spi.EntityRegion;
@@ -66,24 +66,24 @@ public long nextTimestamp() {
 
 public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata)
 throws CacheException {
-throw new NoCachingEnabledException();
+throw new NoCacheRegionFactoryAvailableException();
 }
 
 public NaturalIdRegion buildNaturalIdRegion(String regionName, Properties properties, CacheDataDescription metadata)
 throws CacheException {
-throw new NoCachingEnabledException();
+throw new NoCacheRegionFactoryAvailableException();
 }
 
 public CollectionRegion buildCollectionRegion(String regionName, Properties properties, CacheDataDescription metadata)
 throws CacheException {
-throw new NoCachingEnabledException();
+throw new NoCacheRegionFactoryAvailableException();
 }
 
 public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties properties) throws CacheException {
-throw new NoCachingEnabledException();
+throw new NoCacheRegionFactoryAvailableException();
 }
 
 public TimestampsRegion buildTimestampsRegion(String regionName, Properties properties) throws CacheException {
-throw new NoCachingEnabledException();
+throw new NoCacheRegionFactoryAvailableException();
 }
 }