HHH-12146 - Support enabling caching at any level within a mapped hi…

…erarchy
hibernate · Dec 14, 2017 · 9f50157 · 9f50157
1 parent 58e6235
commit 9f50157
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
@@ -600,7 +600,7 @@ public void applyCaching(
 				}
 			}
 
-			cacheConcurrentStrategy = effectiveCacheAnn.usage().name();
+			cacheConcurrentStrategy = resolveCacheConcurrencyStrategy( effectiveCacheAnn.usage() );
 			cacheRegion = effectiveCacheAnn.region();
 			switch ( effectiveCacheAnn.include().toLowerCase( Locale.ROOT ) ) {
 				case "all": {
@@ -674,6 +674,11 @@ else if ( explicitCacheableAnn == null && persistentClass.getSuperclass() != nul
 		}
 	}
 
+	private static String resolveCacheConcurrencyStrategy(CacheConcurrencyStrategy strategy) {
+		final org.hibernate.cache.spi.access.AccessType accessType = strategy.toAccessType();
+		return accessType == null ? null : accessType.getExternalName();
+	}
+
 	private static Cache buildCacheMock(String region, MetadataBuildingContext context) {
 		return new LocalCacheAnnotationStub( region, determineCacheConcurrencyStrategy( context ) );
 	}