sp-1 removed cloner
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db6d36a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db6d36a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db6d36a9 Branch: refs/heads/ignite-sql-tests Commit: db6d36a9ed1bd5c41a80eb23c4728c171520060b Parents: 56c832c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Feb 13 14:23:09 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Feb 13 14:23:09 2015 +0300 ---------------------------------------------------------------------- .../ignite/cache/cloner/CacheBasicCloner.java | 34 -------- .../apache/ignite/cache/cloner/CacheCloner.java | 57 ------------- .../ignite/cache/cloner/CacheDeepCloner.java | 87 -------------------- .../org/apache/ignite/cache/cloner/package.html | 24 ------ .../configuration/CacheConfiguration.java | 34 -------- .../processors/cache/GridCacheAttributes.java | 13 --- .../processors/cache/GridCacheContext.java | 11 +-- .../processors/cache/GridCacheProcessor.java | 6 -- .../visor/cache/VisorCacheConfiguration.java | 1 - ...idCacheConfigurationConsistencySelfTest.java | 12 --- .../cache/GridCacheLifecycleAwareSelfTest.java | 23 ------ pom.xml | 4 +- 12 files changed, 3 insertions(+), 303 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheBasicCloner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheBasicCloner.java b/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheBasicCloner.java deleted file mode 100644 index 7a31d2c..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheBasicCloner.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.cloner; - -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; - -/** - * Basic cache cloner based on utilization of {@link Cloneable} interface. If - * a passed in object implements {@link Cloneable} then its implementation of - * {@link Object#clone()} is used to get a copy. Otherwise, the object itself - * will be returned without cloning. - */ -public class CacheBasicCloner implements CacheCloner { - /** {@inheritDoc} */ - @Override public <T> T cloneValue(T val) throws IgniteCheckedException { - return X.cloneObject(val, false, true); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java b/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java deleted file mode 100644 index f274a09..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.cloner; - -import org.apache.ignite.*; -import org.jetbrains.annotations.*; - -/** - * Cache cloner which clones cached values before returning them from cache. - * It will only be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set - * on projection which the user is working with (this flag is disabled - * by default). - * <p> - * This behaviour is useful, as a an example, when we need to get some object - * from cache, change some of its properties and put it back into cache. - * In such a scenario it would be wrong to change properties of cached value - * itself without creating a copy first, since it would break cache integrity, - * and will affect the cached values returned to other threads even before - * the transaction commits. - * <p> - * Cache cloner can be set in cache configuration via {@link org.apache.ignite.configuration.CacheConfiguration#getCloner()} - * method. By default, cache uses {@link CacheBasicCloner} implementation - * which will clone only objects implementing {@link Cloneable} interface. You - * can also configure cache to use {@link CacheDeepCloner} which will perform - * deep-cloning of all objects returned from cache, regardless of the - * {@link Cloneable} interface. If none of the above cloners fit your logic, you - * can also provide your own implementation of this interface. - * - * @see CacheBasicCloner - * @see CacheDeepCloner - * @see org.apache.ignite.configuration.CacheConfiguration#getCloner() - * @see org.apache.ignite.configuration.CacheConfiguration#setCloner(CacheCloner) - * - */ -public interface CacheCloner { - /** - * @param val Object to make a clone for. - * @throws IgniteCheckedException If failed to clone given object. - * @return Clone for given object. - */ - @Nullable public <T> T cloneValue(T val) throws IgniteCheckedException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheDeepCloner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheDeepCloner.java b/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheDeepCloner.java deleted file mode 100644 index 84508b8..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheDeepCloner.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.cloner; - -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; - -/** - * Cache deep cloner that creates a copy of an object using deep reflection. - * <p> - * If {@link #isHonorCloneable()} is set to {@code true}, then deep cloner will - * first check if the passed in object implements {@link Cloneable} interface and, - * if it does, will delegate to {@code clone()} method. It is advisable for - * instances that need to be cloned to implement {@link Cloneable}, as cloning - * this way will generally be faster than reflection-based cloning. - * <p> - * This implementation will first check if the object to clone has an empty - * constructor. If it does, then it will be instantiated using such constructor. - * Otherwise an empty constructor will be fetched from JDK and used instead. - * Note that this behavior may not work on some JDKs in which case - * {@link #cloneValue(Object)} method will result in {@link IgniteCheckedException} - * being thrown. - */ -public class CacheDeepCloner implements CacheCloner { - /** */ - private boolean honorCloneable = true; - - /** - * Creates deep cloner with {@link #isHonorCloneable()} flag set to {@code true}. - */ - public CacheDeepCloner() { - // No-op. - } - - /** - * Creates a new instance of deep cloner with specified flag to honor - * {@link Cloneable} interface or not. - * - * @param honorCloneable Flag indicating whether {@link Cloneable} - * interface should be honored or not when cloning. - */ - public CacheDeepCloner(boolean honorCloneable) { - this.honorCloneable = honorCloneable; - } - - /** - * Gets flag indicating if {@link Cloneable} interface should be honored - * when cloning, or if reflection-based deep cloning should always be performed. - * - * @return Flag indicating if {@link Cloneable} interface should be honored - * when cloning - */ - public boolean isHonorCloneable() { - return honorCloneable; - } - - /** - * Sets flag indicating if {@link Cloneable} interface should be honored - * when cloning, or if reflection-based deep cloning should always be performed. - * - * @param honorCloneable Flag indicating whether {@link Cloneable} interface - * should be honored or not when cloning. - */ - public void setHonorCloneable(boolean honorCloneable) { - this.honorCloneable = honorCloneable; - } - - /** {@inheritDoc} */ - @Override public <T> T cloneValue(T val) throws IgniteCheckedException { - return X.cloneObject(val, true, honorCloneable); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/cache/cloner/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/cloner/package.html b/modules/core/src/main/java/org/apache/ignite/cache/cloner/package.html deleted file mode 100644 index 304ab50..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/cloner/package.html +++ /dev/null @@ -1,24 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<body> - <!-- Package description. --> - Contains cache cloner implementations. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 599059e..6105f26 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -20,7 +20,6 @@ package org.apache.ignite.configuration; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.cloner.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; @@ -294,9 +293,6 @@ public class CacheConfiguration extends MutableConfiguration { private CacheMemoryMode memMode = DFLT_MEMORY_MODE; /** */ - private CacheCloner cloner; - - /** */ private CacheAffinityKeyMapper affMapper; /** */ @@ -353,7 +349,6 @@ public class CacheConfiguration extends MutableConfiguration { cacheLoaderFactory = cc.getCacheLoaderFactory(); cacheMode = cc.getCacheMode(); cacheWriterFactory = cc.getCacheWriterFactory(); - cloner = cc.getCloner(); dfltLockTimeout = cc.getDefaultLockTimeout(); dfltQryTimeout = cc.getDefaultQueryTimeout(); distro = cc.getDistributionMode(); @@ -1297,35 +1292,6 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Cloner to be used for cloning values that are returned to user only if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} - * is set on {@link CacheProjection}. Cloning values is useful when it is needed to get value from - * cache, change it and put it back (if the value was not cloned, then user would be updating the - * cached reference which would violate cache integrity). - * <p> - * <b>NOTE:</b> by default, cache uses {@link org.apache.ignite.cache.cloner.CacheBasicCloner} implementation which will clone only objects - * implementing {@link Cloneable} interface. You can also configure cache to use - * {@link org.apache.ignite.cache.cloner.CacheDeepCloner} which will perform deep-cloning of all objects returned from cache, - * regardless of the {@link Cloneable} interface. If none of the above cloners fit your - * logic, you can also provide your own implementation of {@link org.apache.ignite.cache.cloner.CacheCloner} interface. - * - * @return Cloner to be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set on cache projection. - */ - @SuppressWarnings({"unchecked"}) - public CacheCloner getCloner() { - return cloner; - } - - /** - * Sets cloner to be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set on projection. - * - * @param cloner Cloner to use. - * @see #getCloner() - */ - public void setCloner(CacheCloner cloner) { - this.cloner = cloner; - } - - /** * Gets size of preloading thread pool. Note that size serves as a hint and implementation * may create more threads for preloading than specified here (but never less threads). * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index b0cfb6b..a4762ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -130,9 +130,6 @@ public class GridCacheAttributes implements Externalizable { /** */ private int affPartsCnt; - /** Cloner class name. */ - private String clonerClsName; - /** Eviction filter class name. */ private String evictFilterClsName; @@ -208,7 +205,6 @@ public class GridCacheAttributes implements Externalizable { affClsName = className(aff); } - clonerClsName = className(cfg.getCloner()); evictFilterClsName = className(cfg.getEvictionFilter()); evictPlcClsName = className(cfg.getEvictionPolicy()); nearEvictPlcClsName = className(cfg.getNearEvictionPolicy()); @@ -328,13 +324,6 @@ public class GridCacheAttributes implements Externalizable { } /** - * @return Cloner class name. - */ - public String clonerClassName() { - return clonerClsName; - } - - /** * @return Eviction filter class name. */ public String evictionFilterClassName() { @@ -554,7 +543,6 @@ public class GridCacheAttributes implements Externalizable { U.writeString(out, affReplicaCntAttrName); U.writeString(out, affHashIdRslvrClsName); - U.writeString(out, clonerClsName); U.writeString(out, evictFilterClsName); U.writeString(out, evictPlcClsName); U.writeString(out, nearEvictPlcClsName); @@ -599,7 +587,6 @@ public class GridCacheAttributes implements Externalizable { affReplicaCntAttrName = U.readString(in); affHashIdRslvrClsName = U.readString(in); - clonerClsName = U.readString(in); evictFilterClsName = U.readString(in); evictPlcClsName = U.readString(in); nearEvictPlcClsName = U.readString(in); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 5284ff0..39758a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.cloner.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -1110,15 +1109,7 @@ public class GridCacheContext<K, V> implements Externalizable { */ @SuppressWarnings({"unchecked"}) @Nullable public <T> T cloneValue(@Nullable T obj) throws IgniteCheckedException { - if (obj == null) - return obj; - - CacheCloner c = cacheCfg.getCloner(); - - if (c != null) - return c.cloneValue(obj); - - return X.cloneObject(obj, false, true); + return obj == null ? null : X.cloneObject(obj, false, true); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c7f739c..7b20915 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -484,7 +484,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { prepare(cfg, cfg.getNearEvictionPolicy(), true); prepare(cfg, cfg.getAffinity(), false); prepare(cfg, cfg.getAffinityMapper(), false); - prepare(cfg, cfg.getCloner(), false); prepare(cfg, cfg.getEvictionFilter(), false); prepare(cfg, cfg.getInterceptor(), false); @@ -519,7 +518,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { cleanup(cfg, cfg.getAffinity(), false); cleanup(cfg, cfg.getAffinityMapper(), false); cleanup(cfg, cctx.jta().tmLookup(), false); - cleanup(cfg, cfg.getCloner(), false); cleanup(cfg, cctx.store().configuredStore(), false); cctx.cleanup(); @@ -1113,9 +1111,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { locAttr.loadPreviousValue(), true); } - CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cloner", "Cache cloner", - locAttr.clonerClassName(), rmtAttr.clonerClassName(), false); - CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "transactionManagerLookup", "Transaction manager lookup", locAttr.transactionManagerLookupClassName(), rmtAttr.transactionManagerLookupClassName(), false); @@ -1823,7 +1818,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { ret.add(ccfg.getAffinity()); ret.add(ccfg.getAffinityMapper()); - ret.add(ccfg.getCloner()); ret.add(ccfg.getEvictionFilter()); ret.add(ccfg.getEvictionPolicy()); ret.add(ccfg.getNearEvictionPolicy()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java index 427d1c6..6005d6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java @@ -179,7 +179,6 @@ public class VisorCacheConfiguration implements Serializable { // cfg.batchUpdateOnCommit(ccfg.isBatchUpdateOnCommit()); cfg.invalidate(ccfg.isInvalidate()); cfg.startSize(ccfg.getStartSize()); - cfg.cloner(compactClass(ccfg.getCloner())); cfg.transactionManagerLookupClassName(ccfg.getTransactionManagerLookupClassName()); // cfg.txSerializableEnabled(ccfg.isTxSerializableEnabled()); cfg.offsetHeapMaxMemory(ccfg.getOffHeapMaxMemory()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index c26fc8b1..d2ea7d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cache.affinity.fair.*; -import org.apache.ignite.cache.cloner.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.eviction.lru.*; @@ -653,11 +652,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setCloner(new CacheCloner() { - @Nullable @Override public <T> T cloneValue(T val) { - return null; - } - }); cfg.setDefaultLockTimeout(1000); cfg.setDefaultQueryTimeout(1000); cfg.setDefaultTimeToLive(1000); @@ -673,11 +667,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac initCache = new C1<CacheConfiguration, Void>() { /** {@inheritDoc} */ @Override public Void apply(CacheConfiguration cfg) { - cfg.setCloner(new CacheCloner() { - @Nullable @Override public <T> T cloneValue(T val) { - return null; - } - }); cfg.setDefaultLockTimeout(2 * 1000); cfg.setDefaultQueryTimeout(2 * 1000); cfg.setDefaultTimeToLive(2 * 1000); @@ -690,7 +679,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac String log = strLog.toString(); - assertTrue(log.contains("Cache cloner mismatch")); assertTrue(log.contains("Default lock timeout")); assertTrue(log.contains("Default query timeout")); assertTrue(log.contains("Default time to live")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index d98c16a..52fae7c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -17,10 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.cloner.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; @@ -194,21 +192,6 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestCloner extends TestLifecycleAware implements CacheCloner { - /** - */ - TestCloner() { - super(CACHE_NAME); - } - - /** {@inheritDoc} */ - @Nullable @Override public <T> T cloneValue(T val) throws IgniteCheckedException { - return val; - } - } - - /** - */ private static class TestAffinityKeyMapper extends TestLifecycleAware implements CacheAffinityKeyMapper { /** */ @@ -314,12 +297,6 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS lifecycleAwares.add(evictionFilter); - TestCloner cloner = new TestCloner(); - - ccfg.setCloner(cloner); - - lifecycleAwares.add(cloner); - TestAffinityKeyMapper mapper = new TestAffinityKeyMapper(); ccfg.setAffinityMapper(mapper); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db6d36a9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fd6d59f..b577b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -708,7 +708,7 @@ </group> <group> <title>Data Grid APIs</title> - <packages>org.apache.ignite.cache:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.cache.cloner:org.apache.ignite.cache.store:org.apache.ignite.cache.store.hibernate:org.apache.ignite.cache.store.jdbc:org.apache.ignite.cache.query:org.apache.ignite.cache.query.annotations:org.apache.ignite.cache.affinity:org.apache.ignite.cache.affinity.consistenthash:org.apache.ignite.cache.affinity.rendezvous:org.apache.ignite.cache.affinity.fair:org.apache.ignite.cache.eviction:org.apache.ignite.cache.eviction.fifo:org.apache.ignite.cache.eviction.ignitefs:org.apache.ignite.cache.eviction.lru:org.apache.ignite.cache.eviction.random:org.apache.ignite.cache.jta:org.apache.ignite.cache.jta.jndi:org.apache.ignite.cache.jta.reflect:org.apache.ignite.cache.websession:org.apache.ignite.cache.hibernate:org.apache.ignite.dataload</packages> + <packages>org.apache.ignite.cache:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.cache.store:org.apache.ignite.cache.store.hibernate:org.apache.ignite.cache.store.jdbc:org.apache.ignite.cache.query:org.apache.ignite.cache.query.annotations:org.apache.ignite.cache.affinity:org.apache.ignite.cache.affinity.consistenthash:org.apache.ignite.cache.affinity.rendezvous:org.apache.ignite.cache.affinity.fair:org.apache.ignite.cache.eviction:org.apache.ignite.cache.eviction.fifo:org.apache.ignite.cache.eviction.ignitefs:org.apache.ignite.cache.eviction.lru:org.apache.ignite.cache.eviction.random:org.apache.ignite.cache.jta:org.apache.ignite.cache.jta.jndi:org.apache.ignite.cache.jta.reflect:org.apache.ignite.cache.websession:org.apache.ignite.cache.hibernate:org.apache.ignite.dataload</packages> </group> <group> <title>Service Grid APIs</title> @@ -903,7 +903,7 @@ </group> <group> <title>Data Grid APIs</title> - <packages>org.apache.ignite.cache:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.cache.cloner:org.apache.ignite.cache.store:org.apache.ignite.cache.store.hibernate:org.apache.ignite.cache.store.jdbc:org.apache.ignite.cache.store.jdbc.dialect:org.apache.ignite.cache.query:org.apache.ignite.cache.query.annotations:org.apache.ignite.cache.affinity:org.apache.ignite.cache.affinity.consistenthash:org.apache.ignite.cache.affinity.rendezvous:org.apache.ignite.cache.affinity.fair:org.apache.ignite.cache.eviction:org.apache.ignite.cache.eviction.fifo:org.apache.ignite.cache.eviction.ignitefs:org.apache.ignite.cache.eviction.lru:org.apache.ignite.cache.eviction.random:org.apache.ignite.cache.jta:org.apache.ignite.cache.jta.jndi:org.apache.ignite.cache.jta.reflect:org.apache.ignite.cache.websession:org.apache.ignite.cache.hibernate:org.apache.ignite.dataload</packages> + <packages>org.apache.ignite.cache:org.apache.ignite.transactions:org.apache.ignite.datastructures:org.apache.ignite.cache.store:org.apache.ignite.cache.store.hibernate:org.apache.ignite.cache.store.jdbc:org.apache.ignite.cache.store.jdbc.dialect:org.apache.ignite.cache.query:org.apache.ignite.cache.query.annotations:org.apache.ignite.cache.affinity:org.apache.ignite.cache.affinity.consistenthash:org.apache.ignite.cache.affinity.rendezvous:org.apache.ignite.cache.affinity.fair:org.apache.ignite.cache.eviction:org.apache.ignite.cache.eviction.fifo:org.apache.ignite.cache.eviction.ignitefs:org.apache.ignite.cache.eviction.lru:org.apache.ignite.cache.eviction.random:org.apache.ignite.cache.jta:org.apache.ignite.cache.jta.jndi:org.apache.ignite.cache.jta.reflect:org.apache.ignite.cache.websession:org.apache.ignite.cache.hibernate:org.apache.ignite.dataload</packages> </group> <group> <title>Service Grid APIs</title>
