Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10416 Drop superfluous immutable-entity cache configuration. Default to entity cache configuration if undefined.

This commit is contained in:
Paul Ferraro 2016-01-05 17:02:16 -05:00 committed by Steve Ebersole
parent af79fccb9d
commit dc4c6a7f4c
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java vendored
View File

@ -192,8 +192,9 @@ public class InfinispanRegionFactory implements RegionFactory {
/**
* Default value for {@link #IMMUTABLE_ENTITY_CACHE_RESOURCE_PROP}.
* @deprecated {@link #DEF_ENTITY_RESOURCE} is now the default for the {@link #IMMUTABLE_ENTITY_CACHE_RESOURCE_PROP} property.
*/
public static final String DEF_IMMUTABLE_ENTITY_RESOURCE = "immutable-entity";
@Deprecated public static final String DEF_IMMUTABLE_ENTITY_RESOURCE = "immutable-entity";
/**
* Default value for {@link #TIMESTAMPS_CACHE_RESOURCE_PROP}.
@ -539,7 +540,7 @@ public class InfinispanRegionFactory implements RegionFactory {
entityOverrides.setCacheName( DEF_ENTITY_RESOURCE );
typeOverrides.put( ENTITY_KEY, entityOverrides );
final TypeOverrides immutableEntityOverrides = new TypeOverrides();
immutableEntityOverrides.setCacheName( DEF_IMMUTABLE_ENTITY_RESOURCE );
immutableEntityOverrides.setCacheName( DEF_ENTITY_RESOURCE );
typeOverrides.put( IMMUTABLE_ENTITY_KEY, immutableEntityOverrides );
final TypeOverrides collectionOverrides = new TypeOverrides();
collectionOverrides.setCacheName( DEF_ENTITY_RESOURCE );

8
hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml vendored
View File

@ -26,14 +26,6 @@
<expiration max-idle="100000" interval="5000"/>
</invalidation-cache>
<!-- Default configuration for immutable entities -->
<invalidation-cache name="immutable-entity" mode="SYNC" remote-timeout="20000">
<locking concurrency-level="1000" acquire-timeout="15000"/>
<transaction mode="NONE"/>
<eviction max-entries="10000" strategy="LRU"/>
<expiration max-idle="100000" interval="5000"/>
</invalidation-cache>
<!-- A config appropriate for query caching. Does not replicate queries. -->
<local-cache name="local-query">
<locking concurrency-level="1000" acquire-timeout="15000"/>