IGNITE-2558 - NearCacheConfiguration does not extend MutableConfiguration. This fixes #1701.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/512b7af9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/512b7af9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/512b7af9 Branch: refs/heads/ignite-1192 Commit: 512b7af90e3fc8e6ae5690c4b187bb65ba82f218 Parents: f6ee9c0 Author: Max Kozlov <dreamx....@gmail.com> Authored: Sun Apr 9 00:05:46 2017 +0200 Committer: Valentin Kulichenko <valentin.luliche...@gmail.com> Committed: Sun Apr 9 00:05:46 2017 +0200 ---------------------------------------------------------------------- .../configuration/NearCacheConfiguration.java | 56 +------------------- 1 file changed, 2 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/512b7af9/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java index 7c948dc..19def1b 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java @@ -17,11 +17,7 @@ package org.apache.ignite.configuration; -import javax.cache.configuration.Factory; -import javax.cache.configuration.MutableConfiguration; -import javax.cache.expiry.ExpiryPolicy; -import javax.cache.integration.CacheLoader; -import javax.cache.integration.CacheWriter; +import java.io.Serializable; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.eviction.EvictionPolicy; import org.apache.ignite.internal.util.typedef.internal.S; @@ -36,7 +32,7 @@ import static org.apache.ignite.configuration.CacheConfiguration.DFLT_NEAR_START * or most frequently accessed data. Just like with a partitioned cache, * the user can control the size of the near cache and its eviction policies. */ -public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { +public class NearCacheConfiguration<K, V> implements Serializable { /** */ private static final long serialVersionUID = 0L; @@ -59,8 +55,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { * @param ccfg Configuration to copy. */ public NearCacheConfiguration(NearCacheConfiguration<K, V> ccfg) { - super(ccfg); - nearEvictPlc = ccfg.getNearEvictionPolicy(); nearStartSize = ccfg.getNearStartSize(); } @@ -112,52 +106,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setTypes(Class<K> keyType, Class<V> valueType) { - return (CacheConfiguration<K, V>)super.setTypes(keyType, valueType); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setCacheLoaderFactory(Factory<? extends CacheLoader<K, V>> factory) { - return (CacheConfiguration<K, V>)super.setCacheLoaderFactory(factory); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setCacheWriterFactory( - Factory<? extends CacheWriter<? super K, ? super V>> factory) { - return (CacheConfiguration<K, V>)super.setCacheWriterFactory(factory); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setExpiryPolicyFactory(Factory<? extends ExpiryPolicy> factory) { - return (CacheConfiguration<K, V>)super.setExpiryPolicyFactory(factory); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setReadThrough(boolean isReadThrough) { - return (CacheConfiguration<K, V>)super.setReadThrough(isReadThrough); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setWriteThrough(boolean isWriteThrough) { - return (CacheConfiguration<K, V>)super.setWriteThrough(isWriteThrough); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setStoreByValue(boolean isStoreByValue) { - return (CacheConfiguration<K, V>)super.setStoreByValue(isStoreByValue); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setStatisticsEnabled(boolean enabled) { - return (CacheConfiguration<K, V>)super.setStatisticsEnabled(enabled); - } - - /** {@inheritDoc} */ - @Override public CacheConfiguration<K, V> setManagementEnabled(boolean enabled) { - return (CacheConfiguration<K, V>)super.setManagementEnabled(enabled); - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(NearCacheConfiguration.class, this, super.toString()); }