From dc4c6a7f4c8e7410e9fe638fbe2f68ffa9717cbb Mon Sep 17 00:00:00 2001 From: Paul Ferraro Date: Tue, 5 Jan 2016 17:02:16 -0500 Subject: [PATCH] HHH-10416 Drop superfluous immutable-entity cache configuration. Default to entity cache configuration if undefined. --- .../cache/infinispan/InfinispanRegionFactory.java | 5 +++-- .../cache/infinispan/builder/infinispan-configs.xml | 8 -------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java index ce732c4ed3..4e2a86b609 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java @@ -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 ); diff --git a/hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml b/hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml index 3889db9aa1..c474069159 100644 --- a/hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml +++ b/hibernate-infinispan/src/main/resources/org/hibernate/cache/infinispan/builder/infinispan-configs.xml @@ -26,14 +26,6 @@ - - - - - - - -