Use EvictionConfig for IMap eviction configuration

hazelcast · Oct 8, 2019 · 44eb21b · 44eb21b
1 parent 15efbb1
commit 44eb21b
Show file tree

Hide file tree

Showing 117 changed files with 1,194 additions and 1,606 deletions.
diff --git a/...cast-spring/src/main/java/com/hazelcast/spring/AbstractHazelcastBeanDefinitionParser.java b/...cast-spring/src/main/java/com/hazelcast/spring/AbstractHazelcastBeanDefinitionParser.java
@@ -29,6 +29,7 @@
 import com.hazelcast.config.IndexType;
 import com.hazelcast.config.InvalidConfigurationException;
 import com.hazelcast.config.JavaSerializationFilterConfig;
+import com.hazelcast.config.MapConfig;
 import com.hazelcast.config.NearCachePreloaderConfig;
 import com.hazelcast.config.SerializationConfig;
 import com.hazelcast.config.SerializerConfig;
@@ -408,8 +409,8 @@ protected void handleSpringAware() {
             configBuilder.addPropertyValue("managedContext", managedContextBeanBuilder.getBeanDefinition());
         }
 
-        @SuppressWarnings("checkstyle:npathcomplexity")
-        protected BeanDefinition getEvictionConfig(Node node, boolean isNearCache) {
+        @SuppressWarnings({"checkstyle:npathcomplexity", "checkstyle:cyclomaticcomplexity"})
+        protected BeanDefinition getEvictionConfig(Node node, boolean isNearCache, boolean isIMap) {
             Node size = node.getAttributes().getNamedItem("size");
             Node maxSizePolicy = node.getAttributes().getNamedItem("max-size-policy");
             Node evictionPolicy = node.getAttributes().getNamedItem("eviction-policy");
@@ -422,14 +423,19 @@ protected BeanDefinition getEvictionConfig(Node node, boolean isNearCache) {
 
             BeanDefinitionBuilder evictionConfigBuilder = createBeanBuilder(EvictionConfig.class);
 
-            Integer sizeValue = EvictionConfig.DEFAULT_MAX_ENTRY_COUNT;
-            EvictionConfig.MaxSizePolicy maxSizePolicyValue = EvictionConfig.DEFAULT_MAX_SIZE_POLICY;
-            EvictionPolicy evictionPolicyValue = EvictionConfig.DEFAULT_EVICTION_POLICY;
+            Integer maxSize = isIMap ? MapConfig.DEFAULT_MAX_SIZE : EvictionConfig.DEFAULT_MAX_ENTRY_COUNT;
+            EvictionConfig.MaxSizePolicy maxSizePolicyValue = isIMap
+                    ? MapConfig.DEFAULT_MAX_SIZE_POLICY : EvictionConfig.DEFAULT_MAX_SIZE_POLICY;
+            EvictionPolicy evictionPolicyValue = isIMap
+                    ? MapConfig.DEFAULT_EVICTION_POLICY : EvictionConfig.DEFAULT_EVICTION_POLICY;
             String comparatorClassNameValue = null;
             String comparatorBeanValue = null;
 
             if (size != null) {
-                sizeValue = parseInt(getTextContent(size));
+                maxSize = parseInt(getTextContent(size));
+                if (isIMap && maxSize == 0) {
+                    maxSize = MapConfig.DEFAULT_MAX_SIZE;
+                }
             }
             if (maxSizePolicy != null) {
                 maxSizePolicyValue = EvictionConfig.MaxSizePolicy.valueOf(
@@ -447,13 +453,15 @@ protected BeanDefinition getEvictionConfig(Node node, boolean isNearCache) {
             }
 
             try {
-                checkEvictionConfig(evictionPolicyValue, comparatorClassNameValue, comparatorBean, isNearCache);
+                checkEvictionConfig(maxSizePolicyValue,
+                        evictionPolicyValue, comparatorClassNameValue,
+                        comparatorBean, isNearCache, isIMap);
             } catch (IllegalArgumentException e) {
                 throw new InvalidConfigurationException(e.getMessage());
             }
 
-            evictionConfigBuilder.addPropertyValue("size", sizeValue);
-            evictionConfigBuilder.addPropertyValue("maximumSizePolicy", maxSizePolicyValue);
+            evictionConfigBuilder.addPropertyValue("size", maxSize);
+            evictionConfigBuilder.addPropertyValue("maxSizePolicy", maxSizePolicyValue);
             evictionConfigBuilder.addPropertyValue("evictionPolicy", evictionPolicyValue);
             if (comparatorClassNameValue != null) {
                 evictionConfigBuilder.addPropertyValue("comparatorClassName", comparatorClassNameValue);

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastClientBeanDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastClientBeanDefinitionParser.java
@@ -60,8 +60,8 @@
 import static com.hazelcast.config.DomConfigHelper.cleanNodeName;
 import static com.hazelcast.config.DomConfigHelper.getBooleanValue;
 import static com.hazelcast.config.DomConfigHelper.getIntegerValue;
-import static com.hazelcast.spring.HazelcastInstanceDefinitionParser.CP_SUBSYSTEM_SUFFIX;
 import static com.hazelcast.internal.util.StringUtil.upperCaseInternal;
+import static com.hazelcast.spring.HazelcastInstanceDefinitionParser.CP_SUBSYSTEM_SUFFIX;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.rootBeanDefinition;
 import static org.springframework.util.Assert.isTrue;
 
@@ -381,7 +381,7 @@ private void handleReliableTopic(Node node) {
         }
 
         private void handleEvictionConfig(Node node, BeanDefinitionBuilder configBuilder, boolean isNearCache) {
-            configBuilder.addPropertyValue("evictionConfig", getEvictionConfig(node, isNearCache));
+            configBuilder.addPropertyValue("evictionConfig", getEvictionConfig(node, isNearCache, false));
         }
 
         private void handlePreloaderConfig(Node node, BeanDefinitionBuilder configBuilder) {
@@ -454,7 +454,7 @@ private void parseQueryCacheInternal(BeanDefinitionBuilder builder, Node node, S
                 ManagedList indexes = getIndexes(node);
                 builder.addPropertyValue("indexConfigs", indexes);
             } else if ("eviction".equals(nodeName)) {
-                builder.addPropertyValue("evictionConfig", getEvictionConfig(node, false));
+                builder.addPropertyValue("evictionConfig", getEvictionConfig(node, false, false));
             }
         }
 

diff --git a/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastConfigBeanDefinitionParser.java b/hazelcast-spring/src/main/java/com/hazelcast/spring/HazelcastConfigBeanDefinitionParser.java
@@ -19,6 +19,7 @@
 import com.hazelcast.config.AdvancedNetworkConfig;
 import com.hazelcast.config.AliasedDiscoveryConfig;
 import com.hazelcast.config.AliasedDiscoveryConfigUtils;
+import com.hazelcast.config.AttributeConfig;
 import com.hazelcast.config.CRDTReplicationConfig;
 import com.hazelcast.config.CachePartitionLostListenerConfig;
 import com.hazelcast.config.CacheSimpleConfig;
@@ -52,13 +53,10 @@
 import com.hazelcast.config.LoginModuleConfig;
 import com.hazelcast.config.MCMutualAuthConfig;
 import com.hazelcast.config.ManagementCenterConfig;
-import com.hazelcast.config.AttributeConfig;
 import com.hazelcast.config.MapConfig;
 import com.hazelcast.config.MapPartitionLostListenerConfig;
 import com.hazelcast.config.MapStoreConfig;
 import com.hazelcast.config.MapStoreConfig.InitialLoadMode;
-import com.hazelcast.config.MaxSizeConfig;
-import com.hazelcast.config.MaxSizeConfig.MaxSizePolicy;
 import com.hazelcast.config.MemberAddressProviderConfig;
 import com.hazelcast.config.MemberAttributeConfig;
 import com.hazelcast.config.MemberGroupConfig;
@@ -110,19 +108,19 @@
 import com.hazelcast.config.WanReplicationConfig;
 import com.hazelcast.config.WanReplicationRef;
 import com.hazelcast.config.WanSyncConfig;
-import com.hazelcast.config.cp.SemaphoreConfig;
 import com.hazelcast.config.cp.CPSubsystemConfig;
 import com.hazelcast.config.cp.FencedLockConfig;
 import com.hazelcast.config.cp.RaftAlgorithmConfig;
+import com.hazelcast.config.cp.SemaphoreConfig;
 import com.hazelcast.instance.EndpointQualifier;
 import com.hazelcast.instance.ProtocolType;
+import com.hazelcast.internal.nio.ClassLoaderUtil;
 import com.hazelcast.internal.services.ServiceConfigurationParser;
+import com.hazelcast.internal.util.ExceptionUtil;
 import com.hazelcast.map.eviction.MapEvictionPolicy;
 import com.hazelcast.memory.MemorySize;
 import com.hazelcast.memory.MemoryUnit;
-import com.hazelcast.internal.nio.ClassLoaderUtil;
 import com.hazelcast.splitbrainprotection.SplitBrainProtectionOn;
-import com.hazelcast.internal.util.ExceptionUtil;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -1221,19 +1219,8 @@ public void handleMap(Node node) {
             Node attName = node.getAttributes().getNamedItem("name");
             String name = getTextContent(attName);
             mapConfigBuilder.addPropertyValue("name", name);
-            fillAttributeValues(node, mapConfigBuilder, "maxSize", "maxSizePolicy");
-            BeanDefinitionBuilder maxSizeConfigBuilder = createBeanBuilder(MaxSizeConfig.class);
-            AbstractBeanDefinition maxSizeConfigBeanDefinition = maxSizeConfigBuilder.getBeanDefinition();
-            mapConfigBuilder.addPropertyValue("maxSizeConfig", maxSizeConfigBeanDefinition);
-            Node maxSizeNode = node.getAttributes().getNamedItem("max-size");
-            if (maxSizeNode != null) {
-                maxSizeConfigBuilder.addPropertyValue("size", getTextContent(maxSizeNode));
-            }
-            Node maxSizePolicyNode = node.getAttributes().getNamedItem("max-size-policy");
-            if (maxSizePolicyNode != null) {
-                maxSizeConfigBuilder.addPropertyValue(xmlToJavaName(cleanNodeName(maxSizePolicyNode)),
-                        MaxSizePolicy.valueOf(getTextContent(maxSizePolicyNode)));
-            }
+            fillAttributeValues(node, mapConfigBuilder);
+
             Node cacheDeserializedValueNode = node.getAttributes().getNamedItem("cache-deserialized-values");
             if (cacheDeserializedValueNode != null) {
                 mapConfigBuilder.addPropertyValue("cacheDeserializedValues", getTextContent(cacheDeserializedValueNode));
@@ -1282,6 +1269,8 @@ public void handleMap(Node node) {
                     handleEventJournalConfig(mapConfigBuilder, childNode);
                 } else if ("map-eviction-policy".equals(nodeName)) {
                     handleMapEvictionPolicyConfig(mapConfigBuilder, childNode);
+                } else if ("eviction".equals(nodeName)) {
+                    handleEvictionConfig(childNode, mapConfigBuilder, false, true);
                 } else if ("partition-strategy".equals(nodeName)) {
                     PartitioningStrategyConfig psConfig = new PartitioningStrategyConfig(getTextContent(childNode));
                     mapConfigBuilder.addPropertyValue("partitioningStrategyConfig", psConfig);
@@ -1406,7 +1395,7 @@ private BeanDefinitionBuilder parseQueryCaches(Node queryCacheNode) {
                     }
                     builder.addPropertyValue("indexConfigs", indexes);
                 } else if ("eviction".equals(nodeName)) {
-                    builder.addPropertyValue("evictionConfig", getEvictionConfig(node, false));
+                    builder.addPropertyValue("evictionConfig", getEvictionConfig(node, false, false));
                 }
             }
             return builder;
@@ -1420,7 +1409,8 @@ public void handleCache(Node node) {
             for (Node childNode : childElements(node)) {
                 String nodeName = cleanNodeName(childNode);
                 if ("eviction".equals(nodeName)) {
-                    cacheConfigBuilder.addPropertyValue("evictionConfig", getEvictionConfig(childNode, false));
+                    cacheConfigBuilder.addPropertyValue("evictionConfig",
+                            getEvictionConfig(childNode, false, false));
                 } else if ("expiry-policy-factory".equals(cleanNodeName(childNode))) {
                     cacheConfigBuilder.addPropertyValue("expiryPolicyFactoryConfig", getExpiryPolicyFactoryConfig(childNode));
                 } else if ("cache-entry-listeners".equals(nodeName)) {
@@ -1615,14 +1605,15 @@ public void handleNearCacheConfig(Node node, BeanDefinitionBuilder configBuilder
             for (Node childNode : childElements(node)) {
                 String nodeName = cleanNodeName(childNode);
                 if ("eviction".equals(nodeName)) {
-                    handleEvictionConfig(childNode, nearCacheConfigBuilder, true);
+                    handleEvictionConfig(childNode, nearCacheConfigBuilder, true, false);
                 }
             }
             configBuilder.addPropertyValue("nearCacheConfig", nearCacheConfigBuilder.getBeanDefinition());
         }
 
-        private void handleEvictionConfig(Node node, BeanDefinitionBuilder configBuilder, boolean isNearCache) {
-            configBuilder.addPropertyValue("evictionConfig", getEvictionConfig(node, isNearCache));
+        private void handleEvictionConfig(Node node, BeanDefinitionBuilder configBuilder,
+                                          boolean isNearCache, boolean isIMap) {
+            configBuilder.addPropertyValue("evictionConfig", getEvictionConfig(node, isNearCache, isIMap));
         }
 
         private ExpiryPolicyFactoryConfig getExpiryPolicyFactoryConfig(Node node) {