http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java index d7a8a75..cbcbde2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOrderedPreloadingSelfTest.java @@ -35,7 +35,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Number of grids in test. */ private static final int GRID_CNT = 4; @@ -60,11 +60,11 @@ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { cacheConfig(firstCacheMode, 1, FIRST_CACHE_NAME), cacheConfig(secondCacheMode, 2, SECOND_CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); return cfg; }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index f01b9fe..db78aac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -51,11 +51,11 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disc = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disc = new TcpDiscoverySpiConfiguration(); - disc.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disc.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(disc); + cfg.setDiscoverySpiConfiguration(disc); CacheConfiguration ccfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index b27cf5d..6aec81c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final Map<Object, Object> storeMap = new ConcurrentHashMap8<>(); @@ -82,7 +82,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setMaxMissedHeartbeats(Integer.MAX_VALUE); @@ -91,7 +91,7 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { if (isDebug()) disco.setAckTimeout(Integer.MAX_VALUE); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration(gridName)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index 00d0ccf..efe9490 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -49,7 +49,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { private static final AtomicInteger cntr = new AtomicInteger(); /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Start grid by default. @@ -62,11 +62,11 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index cecb254..2063992 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -40,9 +40,6 @@ import static org.apache.ignite.cache.CacheMode.*; * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicException}. */ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstractSelfTest { - /** Index SPI throwing exception. */ - private static TestIndexingSpi idxSpi = new TestIndexingSpi(); - /** */ private static final int PRIMARY = 0; @@ -64,7 +61,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setIndexingSpi(idxSpi); + cfg.setIndexingSpiConfiguration(new TestIndexingSpiConfiguration()); cfg.getTransactionsConfiguration().setTxSerializableEnabled(true); @@ -93,7 +90,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - idxSpi.forceFail(false); + forceFail(false); } /** @@ -286,7 +283,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac GridCache<Integer, Integer> cache = grid(0).cache(null); if (putBefore) { - idxSpi.forceFail(false); + forceFail(false); info("Start transaction."); @@ -309,7 +306,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac grid(i).cache(null).get(key); } - idxSpi.forceFail(true); + forceFail(true); try { info("Start transaction."); @@ -341,7 +338,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ private void checkEmpty(final Integer key) throws Exception { - idxSpi.forceFail(false); + forceFail(false); info("Check key: " + key); @@ -382,7 +379,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac */ private void checkPut(boolean putBefore, final Integer key) throws Exception { if (putBefore) { - idxSpi.forceFail(false); + forceFail(false); info("Put key: " + key); @@ -393,7 +390,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac for (int i = 0; i < gridCount(); i++) grid(i).cache(null).get(key); - idxSpi.forceFail(true); + forceFail(true); info("Going to put: " + key); @@ -415,7 +412,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac */ private void checkTransform(boolean putBefore, final Integer key) throws Exception { if (putBefore) { - idxSpi.forceFail(false); + forceFail(false); info("Put key: " + key); @@ -426,7 +423,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac for (int i = 0; i < gridCount(); i++) grid(i).cache(null).get(key); - idxSpi.forceFail(true); + forceFail(true); info("Going to transform: " + key); @@ -458,7 +455,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac assert keys.length > 1; if (putBefore) { - idxSpi.forceFail(false); + forceFail(false); Map<Integer, Integer> m = new HashMap<>(); @@ -476,7 +473,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac grid(i).cache(null).get(key); } - idxSpi.forceFail(true); + forceFail(true); final Map<Integer, Integer> m = new HashMap<>(); @@ -504,7 +501,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac */ private void checkRemove(boolean putBefore, final Integer key) throws Exception { if (putBefore) { - idxSpi.forceFail(false); + forceFail(false); info("Put key: " + key); @@ -515,7 +512,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac for (int i = 0; i < gridCount(); i++) grid(i).cache(null).get(key); - idxSpi.forceFail(true); + forceFail(true); info("Going to remove: " + key); @@ -586,6 +583,18 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac throw new IllegalStateException("Failed to find key."); } + private void forceFail(boolean fail){ + for (int i = 0; i < gridCount(); i++) + ((TestIndexingSpi)grid(i).configuration().getIndexingSpi()).forceFail(fail); + } + + private static class TestIndexingSpiConfiguration implements GridIndexingSpiConfiguration<TestIndexingSpi> { + /** {@inheritDoc} */ + @Override public Class<? extends TestIndexingSpi> spiClass() { + return TestIndexingSpi.class; + } + } + /** * Indexing SPI that can fail on demand. */ @@ -594,6 +603,15 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac private volatile boolean fail; /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public TestIndexingSpi(TestIndexingSpiConfiguration spiCfg) { + super(spiCfg); + } + + /** * @param fail Fail flag. */ public void forceFail(boolean fail) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 724929d..a13f9e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -58,7 +58,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe protected static final int GRID_CNT = 4; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final int RETRIES = 300; @@ -85,11 +85,11 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java index 88b9991..eddc6ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.*; */ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int QUEUE_CAPACITY = 3; @@ -59,11 +59,11 @@ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstra @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index a3b78df..6f10a4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -47,7 +47,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon private static final int GRID_CNT = 4; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int RETRIES = 20; @@ -105,11 +105,11 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setRestEnabled(false); cfg.setExecutorService( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java index d76f29e..20a8026 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java @@ -42,7 +42,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra protected static final int GRID_CNT = 3; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final int RETRIES = 20; @@ -68,11 +68,11 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); cc.setCacheMode(PARTITIONED); cc.setQueryIndexEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java index bbed86f..16a0a34 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java @@ -42,7 +42,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo protected static final int GRID_CNT = 4; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final int RETRIES = 133; @@ -79,11 +79,11 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index cee2004..e752385 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -61,7 +61,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs private static CacheAtomicSequence[] seqArr = new CacheAtomicSequence[SEQ_NUM]; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Constructor. @@ -74,11 +74,11 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java index b63e1a1..79d5688 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java @@ -44,7 +44,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom protected static final int BATCH_SIZE = 33; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final int RETRIES = 1111; @@ -63,11 +63,11 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java index c8eedbe..a8e143e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java @@ -34,7 +34,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Constructs a test. @@ -47,11 +47,11 @@ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractT @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index e5472f8..6ca302a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int INIT_GRID_NUM = 3; @@ -61,11 +61,11 @@ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 111980f..f26035c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -45,17 +45,17 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); c.setIncludeEventTypes(); c.setPeerClassLoadingEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 61c4ff2..c364b37 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -56,7 +56,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend offheapCacheConfiguration(), offheapTieredCacheConfiguration()); - c.setSwapSpaceSpi(new FileSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); c.setPeerClassLoadingEnabled(peerClassLoading()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 172e914..4711088 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Job counter. */ private static final AtomicInteger cntr = new AtomicInteger(0); @@ -54,11 +54,11 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 22bd632..bdfc52b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -93,18 +93,18 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs private int retries = DFLT_RETRIES; /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); // Discovery. - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index b6a973f..bf46342 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -55,7 +55,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac private static final String VALUE = "test"; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grid instances. */ private static final List<Ignite> IGNITEs = new ArrayList<>(); @@ -71,13 +71,13 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setMaxMissedHeartbeats(Integer.MAX_VALUE); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setDeploymentMode(IgniteDeploymentMode.SHARED); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java index bccdcb9..782e50e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java @@ -50,7 +50,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid private static final int BACKUP_CNT = 1; /** IP finder. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Map where dummy cache store values are stored. */ private final Map<Integer, String> map = new ConcurrentHashMap8<>(); @@ -63,11 +63,11 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 1e5322f..a6223fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -52,7 +52,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb protected LifecycleBean lifecycleBean; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Default keys. */ protected static final String[] DFLT_KEYS = new String[] { @@ -71,11 +71,11 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); c.setIncludeProperties(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index 080ec6a..a1b223e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -92,17 +92,17 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon private int retries = DFLT_RETRIES; /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); // Discovery. - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setDeploymentMode(CONTINUOUS); // Cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java index 8dbf81e..486541e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java @@ -79,7 +79,7 @@ public abstract class GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest ex atomicOffheapCacheCfg, atomicOffheapTieredCacheCfg); - c.setSwapSpaceSpi(new FileSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); c.setPeerClassLoadingEnabled(peerClassLoading()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java index dc8f159..48b1770 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java @@ -64,7 +64,7 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri public static final int KEYS_CNT = 30; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Value increment processor. */ private static final EntryProcessor<String, Integer, Void> INCR_CLOS = new EntryProcessor<String, Integer, Void>() { @@ -103,11 +103,11 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); GridCacheGenericTestStore<String, Integer> store = new GridCacheGenericTestStore<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java index 4e4b850..c860840 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedOptimisticTransactionSelfTest.java @@ -52,7 +52,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA private static final String VAL = "val"; /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grids. */ private static Ignite[] ignites; @@ -66,7 +66,7 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA c.getTransactionsConfiguration().setTxSerializableEnabled(true); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); @@ -82,9 +82,9 @@ public class GridCacheColocatedOptimisticTransactionSelfTest extends GridCommonA cc.setEvictSynchronized(false); cc.setEvictNearSynchronized(false); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setCacheConfiguration(cc); - c.setSwapSpaceSpi(new FileSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index edaad78..850ab03 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -38,7 +38,7 @@ import java.util.concurrent.*; */ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryVmIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Creates new test. @@ -168,7 +168,7 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract } } - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(new TcpDiscoveryVmIpFinder(IP_FINDER)); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 1d77b81..2ca4444 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -76,7 +76,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { private int partitions = DFLT_PARTITIONS; /** IP finder. */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @@ -89,11 +89,11 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration(gridName)); cfg.setDeploymentMode(CONTINUOUS); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java index 4cc7120..130ab2b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java @@ -48,28 +48,19 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest private int gridInstanceNum; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi() { - @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) { - super.setNodeAttributes(attrs, ver); + TestTcpDiscoverySpiConfiguration spi = new TestTcpDiscoverySpiConfiguration(gridInstanceNum); - // Set unique mac addresses for every group of three nodes. - String macAddrs = "MOCK_MACS_" + (gridInstanceNum / 3); - - attrs.put(GridNodeAttributes.ATTR_MACS, macAddrs); - - gridInstanceNum++; - } - }; + ++gridInstanceNum; spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); CacheConfiguration cc = defaultCacheConfiguration(); @@ -181,4 +172,60 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest stopAllGrids(); } } + + /** + * + */ + public static class TestTcpDiscoverySpiConfiguration extends TcpDiscoverySpiConfiguration { + /** */ + private final int instanceNum; + + /** + * + */ + public TestTcpDiscoverySpiConfiguration(int instanceNum) { + this.instanceNum = instanceNum; + } + + /** {@inheritDoc} */ + @Override public Class<? extends TcpDiscoverySpi> spiClass() { + return TestTcpDiscoverySpi.class; + } + + /** + * + */ + public int getInstanceNum() { + return instanceNum; + } + } + + /** + * + */ + public static class TestTcpDiscoverySpi extends TcpDiscoverySpi { + /** */ + private final int gridInstanceNum; + + /** + * + */ + public TestTcpDiscoverySpi(TestTcpDiscoverySpiConfiguration spiCfg) { + super(spiCfg); + + gridInstanceNum = spiCfg.getInstanceNum(); + } + + /** + * + */ + @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) { + super.setNodeAttributes(attrs, ver); + + // Set unique mac addresses for every group of three nodes. + String macAddrs = "MOCK_MACS_" + (gridInstanceNum / 3); + + attrs.put(GridNodeAttributes.ATTR_MACS, macAddrs); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index 08f9339..e7865f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -51,7 +51,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { private static final int GRID_CNT = 3; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @SuppressWarnings({"ConstantConditions"}) @@ -71,12 +71,12 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { cc.setPreloadMode(NONE); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); spi.setMaxMissedHeartbeats(Integer.MAX_VALUE); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index 7aa9482..749a75a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -63,7 +63,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { private static TestStore store = new TestStore(); /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grid counter. */ private AtomicInteger cntr = new AtomicInteger(0); @@ -86,12 +86,12 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); spi.setMaxMissedHeartbeats(Integer.MAX_VALUE); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java index 9180151..d58fa8d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearPartitionedClearSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes private static CacheStore<Object, Object> store = new GridCacheGenericTestStore<>(); /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { @@ -73,11 +73,11 @@ public class GridCacheNearPartitionedClearSelfTest extends GridCommonAbstractTes cfg.setLocalHost("127.0.0.1"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration ccfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java index 1dae0c9..0277640 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityExcludeNeighborsPerformanceTest.java @@ -49,7 +49,7 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends private boolean excNeighbores; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static Collection<String> msgs = new ArrayList<>(); @@ -58,11 +58,11 @@ public class GridCachePartitionedAffinityExcludeNeighborsPerformanceTest extends @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java index abb106f..b5f08a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinityHashIdResolverSelfTest.java @@ -38,7 +38,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Hash ID resolver. */ private CacheAffinityNodeHashResolver rslvr; @@ -54,14 +54,14 @@ public class GridCachePartitionedAffinityHashIdResolverSelfTest extends GridComm cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setAffinity(aff); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); IgniteConfiguration cfg = super.getConfiguration(gridName); cfg.setCacheConfiguration(cacheCfg); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index 4abbd14..7071578 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -60,7 +60,7 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest private static AtomicBoolean failFlag = new AtomicBoolean(false); /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -73,14 +73,14 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); IgniteConfiguration cfg = super.getConfiguration(gridName); cfg.setCacheConfiguration(cacheCfg); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index a8be626..be1d3db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -67,7 +67,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst private static final String CNTR_KEY = "CNTR_KEY"; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static CountDownLatch startLatchMultiNode; @@ -90,11 +90,11 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); // Default cache configuration. CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index 36515f4..097fe8f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -54,7 +54,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA private static final int TX_CNT = 500; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -77,11 +77,11 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA c.setCacheConfiguration(cc); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java index 561f97e..65605d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java @@ -39,7 +39,7 @@ public class GridCacheReplicatedTxSingleThreadedSelfTest extends IgniteTxSingleT private static final boolean LOG_TO_FILE = true; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) @@ -58,11 +58,11 @@ public class GridCacheReplicatedTxSingleThreadedSelfTest extends IgniteTxSingleT c.setCacheConfiguration(cc); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); if (CACHE_DEBUG) resetLog4j(Level.DEBUG, LOG_TO_FILE, GridCacheProcessor.class.getPackage().getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java index 194bc12..21dd764 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheReplicatedTxTimeoutSelfTest extends IgniteTxTimeoutAbstrac private static final long TIMEOUT = 50; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -49,11 +49,11 @@ public class GridCacheReplicatedTxTimeoutSelfTest extends IgniteTxTimeoutAbstrac c.setCacheConfiguration(cc); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - c.setDiscoverySpi(spi); + c.setDiscoverySpiConfiguration(spi); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java index 73a99cf..9d262d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -51,11 +51,11 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheReplicatedUnswapAdvancedSelfTest.class.getName(), TestClass.class.getName()); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -64,7 +64,7 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest extends GridCommonAbstrac cfg.setCacheConfiguration(cacheCfg); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java index a30ef73..c6af6e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheSyncReplicatedPreloadSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTest { /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final boolean DISCO_DEBUG_MODE = false; @@ -56,12 +56,12 @@ public class GridCacheSyncReplicatedPreloadSelfTest extends GridCommonAbstractTe @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); disco.setDebugMode(DISCO_DEBUG_MODE); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 38b4011..72bd464 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private int gridCnt = 2; @@ -95,11 +95,11 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes c.setCacheConfiguration(cc); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, idxGen.getAndIncrement())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java index 6a2e05a..501923e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheLruNearEvictionPolicySelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Maximum size for near eviction policy. */ private static final int EVICTION_MAX_SIZE = 10; @@ -68,11 +68,11 @@ public class GridCacheLruNearEvictionPolicySelfTest extends GridCommonAbstractTe c.setCacheConfiguration(cc); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 0111754..8e21583 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -61,7 +61,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Latch timeout. */ protected static final long LATCH_TIMEOUT = 5000; @@ -88,11 +88,11 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo cfg.setCacheConfiguration(cacheCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java index f5a1b81..43e220e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java @@ -47,7 +47,7 @@ public class GridClosureProcessorRemoteTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setDiscoverySpi(new TcpDiscoverySpi()); + cfg.setDiscoverySpiConfiguration(new TcpDiscoverySpiConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edbfd9ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index 0213de3..2ae9764 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -219,11 +219,11 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes cfg.setGridName(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg);
