http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java index f70c8f0..f841ff5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @SuppressWarnings("deprecation") public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { /** */ - private TcpDiscoveryIpFinder ipFinder; + private TcpDiscoveryIpFinderConfiguration ipFinder; /** */ private boolean swapEnabled; @@ -65,15 +65,15 @@ public class GridCacheMemoryModeSelfTest 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.setNetworkTimeout(2000); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -237,8 +237,9 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { * @param x Cache modifier. * @throws IgniteCheckedException If failed. */ - void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<GridCache<String, Integer>> x) throws Exception { - ipFinder = new TcpDiscoveryVmIpFinder(true); + void doTest(int cache, int offheapSwap, boolean offheapEmpty, boolean swapEmpty, CIX1<GridCache<String, Integer>> x) + throws Exception { + ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); startGrid();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java index b47df6d..47e232a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMissingCommitVersionSelfTest.java @@ -56,11 +56,11 @@ public class GridCacheMissingCommitVersionSelfTest extends GridCommonAbstractTes IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration ccfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index c58ce0a..ff9b81d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Near enabled flag. */ private boolean nearEnabled; @@ -54,15 +54,15 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String name) throws Exception { IgniteConfiguration cfg = super.getConfiguration(name); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(cacheConfiguration()); - cfg.setCheckpointSpi(new NoopCheckpointSpi()); + cfg.setCheckpointSpiConfiguration(new NoopCheckpointSpiConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java index 5677e9f..27bdb60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccPartitionedSelfTest.java @@ -40,7 +40,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { private IgniteKernal grid; /** VM ip finder for TCP discovery. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @@ -63,11 +63,11 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java index 2044753..486f624 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java @@ -39,7 +39,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { private IgniteKernal grid; /** VM ip finder for TCP discovery. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @@ -62,11 +62,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java index d7df849..1db2560 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Counter key. */ private static final String CNTR_KEY = "CNTR_KEY"; @@ -61,11 +61,11 @@ public class GridCacheNestedTxAbstractTest 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); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index 43b18f2..ea1a64a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Cache mode for test. */ private CacheMode cacheMode; @@ -58,9 +58,9 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index bb8ae3c..34170a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -60,21 +60,21 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { private final Map<Integer, Object> versions = new HashMap<>(); /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @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.setNetworkTimeout(2000); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java index 4f77b8d..85d226e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private CacheMode mode; @@ -59,13 +59,13 @@ public class GridCacheOffHeapTest 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.setSwapSpaceSpi(new NoopSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new NoopSwapSpaceSpiConfiguration()); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java index 40bd1d2..10ae603 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -50,7 +50,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { private static final long OFFHEAP = 0;// 4 * 1024 * 1024; /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private final AtomicInteger idxGen = new AtomicInteger(); @@ -67,15 +67,15 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { cfg.setNetworkTimeout(2000); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setMarshaller(new IgniteJdkMarshaller()); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); CacheConfiguration repCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java index c9d3fa6..f6d7c78 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.internal.GridTopic.*; */ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int GRID_CNT = 3; @@ -61,7 +61,7 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setDiscoverySpi(discoverySpi()); + cfg.setDiscoverySpiConfiguration(discoverySpi()); cfg.setCacheConfiguration(cacheConfiguration()); return cfg; @@ -70,8 +70,8 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { /** * @return Discovery SPI; */ - private DiscoverySpi discoverySpi() { - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + private DiscoverySpiConfiguration discoverySpi() { + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java index 30e381e..b916881 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java @@ -45,7 +45,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb private static final int GRIDS = 3; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -62,11 +62,11 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb cfg.setCacheConfiguration(cacheCfg); - 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java index 99e7110..b3f7933 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java @@ -45,11 +45,11 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 4fdf767..2cd4d3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -51,7 +51,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest private static final String VALUE = createValue(); /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private final AtomicInteger idxGen = new AtomicInteger(); @@ -60,11 +60,11 @@ public class GridCachePreloadingEvictionsSelfTest 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); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration partCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java index 006ed74..0335aa3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -47,7 +47,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Size of the test map. */ private static final int TEST_MAP_SIZE = 30000; @@ -90,9 +90,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { */ private final BlockingQueue<ComputeTaskFuture<?>> resQueue = new LinkedBlockingQueue<>(50); - /** Test failover SPI. */ - private MasterFailoverSpi failoverSpi = new MasterFailoverSpi((IgnitePredicate)workerNodesFilter); - /** * @throws Exception If failed. */ @@ -597,20 +594,22 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { cfg.setDeploymentMode(IgniteDeploymentMode.CONTINUOUS); - TcpDiscoverySpi discoverySpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoverySpi = new TcpDiscoverySpiConfiguration(); discoverySpi.setAckTimeout(60000); discoverySpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoverySpi); + cfg.setDiscoverySpiConfiguration(discoverySpi); if (gridName.startsWith("master")) { cfg.setUserAttributes(ImmutableMap.of("segment", "master")); + MasterFailoverSpiConfiguration failoverSpi = new MasterFailoverSpiConfiguration(); + // For sure. failoverSpi.setMaximumFailoverAttempts(50); - cfg.setFailoverSpi(failoverSpi); + cfg.setFailoverSpiConfiguration(failoverSpi); } else if (gridName.startsWith("worker")) { cfg.setUserAttributes(ImmutableMap.of("segment", "worker")); @@ -637,28 +636,37 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { } /** + * + */ + public static class MasterFailoverSpiConfiguration extends AlwaysFailoverSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends AlwaysFailoverSpi> spiClass() { + return MasterFailoverSpi.class; + } + } + + /** * Test failover SPI for master node. */ @IgniteSpiConsistencyChecked(optional = true) - private static class MasterFailoverSpi extends AlwaysFailoverSpi { + public static class MasterFailoverSpi extends AlwaysFailoverSpi { /** */ private static final String FAILOVER_NUMBER_ATTR = "failover:number:attr"; /** */ private Set<ComputeJobContext> failedOverJobs = new HashSet<>(); - /** Node filter. */ - private IgnitePredicate<? super ClusterNode>[] filter; - /** */ @IgniteLoggerResource private IgniteLogger log; /** - * @param filter Filter. + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. */ - MasterFailoverSpi(IgnitePredicate<? super ClusterNode>... filter) { - this.filter = filter; + public MasterFailoverSpi(MasterFailoverSpiConfiguration spiCfg) { + super(spiCfg); } /** {@inheritDoc} */ @@ -690,7 +698,7 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { // Keep collection type. F.retain(cp, false, new IgnitePredicate<ClusterNode>() { @Override public boolean apply(ClusterNode node) { - return F.isAll(node, filter); + return F.isAll(node, workerNodesFilter); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java index f499ff5..5f0c676 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*; */ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Cache mode for the current test. */ private CacheMode mode; @@ -55,11 +55,11 @@ public class GridCacheReferenceCleanupSelfTest 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); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java index e846b16..119f460 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReloadSelfTest.java @@ -64,14 +64,14 @@ public class GridCacheReloadSelfTest extends GridCommonAbstractTest { cfg.setLocalHost("127.0.0.1"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(); ipFinder.setAddresses(Collections.singleton("127.0.0.1:47500")); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setName(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java index d37eab5..cf00675 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java @@ -51,10 +51,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract private static final String NO_COMMIT = "no_commit"; /** */ - private final Collection<TestCommunicationSpi> commSpis = new ConcurrentLinkedDeque8<>(); - - /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @@ -75,17 +72,15 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract c.setCacheConfiguration(cc); - TestCommunicationSpi commSpi = new TestCommunicationSpi(gridName.equals(NO_COMMIT)); + TestCommunicationSpiConfiguration commSpi = new TestCommunicationSpiConfiguration(gridName.equals(NO_COMMIT)); - c.setCommunicationSpi(commSpi); + c.setCommunicationSpiConfiguration(commSpi); - commSpis.add(commSpi); - - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); return c; } @@ -93,8 +88,6 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { super.afterTest(); - - commSpis.clear(); } /** @@ -111,10 +104,11 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract firstCache.put(1, "val1"); - int cnt = 0; + int cnt = ((TestCommunicationSpi)firstIgnite.configuration().getCommunicationSpi()).messagesCount(); - for (TestCommunicationSpi commSpi : commSpis) - cnt += commSpi.messagesCount(); + for (int i = 0; i < ADDITION_CACHE_NUMBER; i++) + cnt += ((TestCommunicationSpi)grid(String.valueOf(i + 2)).configuration().getCommunicationSpi()) + .messagesCount(); assert cnt == ADDITION_CACHE_NUMBER; } @@ -163,18 +157,49 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract /** * */ - private static class TestCommunicationSpi extends TcpCommunicationSpi { + public static class TestCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** */ + private final boolean noCommit; + + /** + * + */ + public TestCommunicationSpiConfiguration(boolean noCommit) { + this.noCommit = noCommit; + } + + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return TestCommunicationSpi.class; + } + + /** + * + */ + public boolean isNoCommit() { + return noCommit; + } + } + + /** + * + */ + public static class TestCommunicationSpi extends TcpCommunicationSpi { /** */ private final AtomicInteger msgCnt = new AtomicInteger(); /** */ - private boolean noCommit; + private final boolean noCommit; /** - * @param noCommit Send Commit or not. + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. */ - private TestCommunicationSpi(boolean noCommit) { - this.noCommit = noCommit; + public TestCommunicationSpi(TestCommunicationSpiConfiguration spiCfg) { + super(spiCfg); + + noCommit = spiCfg.isNoCommit(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java index d546966..d41d0df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java @@ -36,7 +36,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { /** IP finder. */ - 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 { @@ -60,11 +60,11 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { c.setCacheConfiguration(cc1, cc2, cc3); - 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java index 862ed65..b8f5b9f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static AtomicInteger loads; @@ -64,11 +64,11 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(ccfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java index 94fd587..948bfa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -37,17 +37,17 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { private boolean storeValBytes; /** VM ip finder for TCP discovery. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @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); CacheConfiguration ccfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java index ea04a12..f6eff53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -42,7 +42,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { private static final int ENTRY_CNT = 15000; /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private CacheMode cacheMode; @@ -51,11 +51,11 @@ public class GridCacheSwapPreloadSelfTest 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.setNetworkTimeout(2000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java index c80a872d..426355e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -47,24 +47,24 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); - FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); + FileSwapSpaceSpiConfiguration swap = new FileSwapSpaceSpiConfiguration(); swap.setWriteBufferSize(1); - cfg.setSwapSpaceSpi(swap); + cfg.setSwapSpaceSpiConfiguration(swap); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java index 0145559..fd9a6ce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTtlManagerSelfTest.java @@ -38,7 +38,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Test cache mode. */ protected CacheMode cacheMode; @@ -47,11 +47,11 @@ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 4fb357e..e007754 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -44,7 +44,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { private static final Random RAND = new Random(); /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Constructs test. */ public GridCacheVariableTopologySelfTest() { @@ -55,11 +55,11 @@ public class GridCacheVariableTopologySelfTest 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); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); // Default cache configuration. CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 074b4d9..c07cb60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -78,11 +78,11 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb @Override protected final IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration c = super.getConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 735fc2a..f45c34c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -44,7 +44,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private static final int GRID_CNT = 5; /** Ip finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Flush frequency. */ public static final int WRITE_BEHIND_FLUSH_FREQ = 1000; @@ -60,11 +60,11 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC @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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 8a956de..b7a63e5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -42,7 +42,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra private static final boolean DEBUG = false; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int THREAD_NUM = 20; @@ -59,11 +59,11 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra @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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java index 254cf5a..24b0f54 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** @return Cache mode. */ protected abstract CacheMode cacheMode(); @@ -72,12 +72,12 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setCommunicationSpi(new CountingCommunicationSpi()); - cfg.setDiscoverySpi(discoSpi); + cfg.setCommunicationSpiConfiguration(new CountingCommunicationSpiConfiguration()); + cfg.setDiscoverySpiConfiguration(discoSpi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -122,8 +122,16 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract } } + /** Counting communication SPI configuration. */ + public static class CountingCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return CountingCommunicationSpi.class; + } + } + /** Counting communication SPI. */ - protected static class CountingCommunicationSpi extends TcpCommunicationSpi { + public static class CountingCommunicationSpi extends TcpCommunicationSpi { /** Distributed lock requests. */ private AtomicInteger distLocks = new AtomicInteger(); @@ -133,6 +141,15 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract /** Dht locks. */ private AtomicInteger dhtLocks = new AtomicInteger(); + /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public CountingCommunicationSpi(CountingCommunicationSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override public void sendMessage(ClusterNode node, GridTcpCommunicationMessageAdapter msg) throws IgniteSpiException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java index 12643d6..c4317e8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java @@ -43,7 +43,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private static final Random RND = new Random(); /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -51,11 +51,11 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { cfg.setLocalHost("127.0.0.1"); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration repCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java index 2e163b7..d3f21f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; */ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private AtomicBoolean storeCalled = new AtomicBoolean(); @@ -62,11 +62,11 @@ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCo @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); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java index d3c7a29..0414035 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java @@ -37,7 +37,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid protected static final int GRID_CNT = 4; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Constructs test. @@ -67,11 +67,11 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid @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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java index d6051f7..fd67d63 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java @@ -32,7 +32,7 @@ import java.util.*; */ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Constructs a test. @@ -45,11 +45,11 @@ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridComm @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); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java index 00add7c..488aca1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java @@ -54,7 +54,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl private static final int THREADS_CNT = 5; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final Random RND = new Random(); @@ -72,11 +72,11 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl cfg.setLocalHost("127.0.0.1"); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); CacheConfiguration repCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java index 95a84b9..fdb220a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java @@ -43,7 +43,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo protected static final int GRID_CNT = 3; /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final int ITEMS_CNT = 300; @@ -62,11 +62,11 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo @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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java index 2017f19..68b5f7c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Number of threads for multithreaded test. */ private static final int THREAD_NUM = 30; @@ -56,11 +56,11 @@ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCom @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); // Default cache configuration. CacheConfiguration dfltCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index b1f97a8..ec6f77d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Queue capacity. */ private static final int QUEUE_CAP = 5; @@ -71,11 +71,11 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra cfg.setCacheConfiguration(cacheCfg); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); if (nodeId != null) { cfg.setNodeId(nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 4149d98..c337d18 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -40,7 +40,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs private 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); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -57,11 +57,11 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs cfg.setCacheConfiguration(ccfg); - 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 6d62a84..8944c76 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -54,11 +54,11 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TestCommunicationSpi commSpi = new TestCommunicationSpi(); + TestCommunicationSpiConfiguration commSpi = new TestCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); CacheConfiguration ccfg = defaultCacheConfiguration(); @@ -258,9 +258,19 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { } /** + * + */ + public static class TestCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return TestCommunicationSpi.class; + } + } + + /** * Communication SPI that will count single partition update messages. */ - private static class TestCommunicationSpi extends TcpCommunicationSpi { + public static class TestCommunicationSpi extends TcpCommunicationSpi { /** */ private boolean skipNearRequest; @@ -273,6 +283,15 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { /** */ private boolean skipDhtResponse; + /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public TestCommunicationSpi(TestCommunicationSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override public void sendMessage(ClusterNode node, GridTcpCommunicationMessageAdapter msg) throws IgniteSpiException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index a49a390..5ebc5f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -52,17 +52,17 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes private static Ignite ignite3; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @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); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index f83e151..4c3d34e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -55,7 +55,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { private static IgniteCache<Integer, String> cache2; /** Ip-finder. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @@ -68,11 +68,11 @@ public abstract class GridCacheLockAbstractTest 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()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index f82441f..44cf043 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -60,7 +60,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT private static GridCache<Integer, String> cache3; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Listeners. */ private static Collection<CacheEventListener> lsnrs = new ArrayList<>(); @@ -69,11 +69,11 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT @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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 7681046..2413ffe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -49,7 +49,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr private static Ignite ignite2; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Listeners. */ private static Collection<IgnitePredicate<IgniteEvent>> lsnrs = new ArrayList<>(); @@ -65,11 +65,11 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr @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(defaultCacheConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 023d576..3557c39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -64,7 +64,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra private final Condition putCond = lock.newCondition(); /** Shared IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Caches comparison start latch. */ private CountDownLatch cmpLatch; @@ -227,11 +227,11 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra IgniteConfiguration cfg = getConfiguration(nodeName(idx)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setLocalHost("127.0.0.1"); cfg.setCacheConfiguration(ccfg); cfg.setRestEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java index 98c7fee..7d685fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedAffinityFilterSelfTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; @SuppressWarnings({"PointlessArithmeticExpression"}) public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Backup count. */ private static final int BACKUPS = 1; @@ -80,14 +80,14 @@ public class GridCachePartitionedAffinityFilterSelfTest extends GridCommonAbstra cacheCfg.setAtomicityMode(TRANSACTIONAL); cacheCfg.setDistributionMode(NEAR_PARTITIONED); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER); IgniteConfiguration cfg = super.getConfiguration(gridName); cfg.setCacheConfiguration(cacheCfg); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setUserAttributes(F.asMap(SPLIT_ATTRIBUTE_NAME, splitAttrVal));
