http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 711a03e..b87f3f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.clock.*; import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.direct.*; +import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -58,7 +59,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes private static final String VAL = "test"; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * Don't start grid by default. @@ -73,13 +74,13 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes c.getTransactionsConfiguration().setTxSerializableEnabled(true); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); - c.setCommunicationSpi(new TestCommunicationSpi()); + c.setCommunicationSpiConfiguration(new TestCommunicationSpiConfiguration()); CacheConfiguration cc = defaultCacheConfiguration(); @@ -198,10 +199,32 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes /** * */ - private class TestCommunicationSpi extends TcpCommunicationSpi { + public static class TestCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return TestCommunicationSpi.class; + } + } + + /** + * + */ + public static class TestCommunicationSpi extends TcpCommunicationSpi { /** */ private final Map<UUID, Integer> msgCntMap = new HashMap<>(); + @IgniteLoggerResource + private IgniteLogger logger; + + /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public TestCommunicationSpi(TestCommunicationSpiConfiguration spiCfg) { + super(spiCfg); + } + /** * @param destNodeId Node id to check. * @return Number of messages that was sent to node. @@ -229,8 +252,8 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes Object msg0 = ((GridIoMessage)msg).message(); if (!(msg0 instanceof GridClockDeltaSnapshotMessage)) { - info("Sending message [locNodeId=" + getLocalNodeId() + ", destNodeId= " + destNode.id() - + ", msg=" + msg + ']'); + logger.info("Sending message [locNodeId=" + getLocalNodeId() + ", destNodeId= " + destNode.id() + + ", msg=" + msg + ']'); synchronized (msgCntMap) { Integer cnt = msgCntMap.get(destNode.id());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java index 439c4f9..3e60430 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java @@ -39,7 +39,7 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr private static final boolean LOG_TO_FILE = true; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) @@ -62,11 +62,11 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index cdd77b8..72a9f6d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { private int poolSize = 2; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -68,11 +68,11 @@ public class GridCacheReplicatedPreloadSelfTest 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.setPeerClassLoadingLocalClassPathExclude(GridCacheReplicatedPreloadSelfTest.class.getName(), @@ -82,11 +82,11 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { cfg.setUserAttributes(F.asMap("EVEN", !gridName.endsWith("0") && !gridName.endsWith("2"))); - MemoryEventStorageSpi spi = new MemoryEventStorageSpi(); + MemoryEventStorageSpiConfiguration spi = new MemoryEventStorageSpiConfiguration(); spi.setExpireCount(50_000); - cfg.setEventStorageSpi(spi); + cfg.setEventStorageSpiConfiguration(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/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java index 9f2d05f..b9d8cdf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadStartStopEventsSelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommonAbstractTest { /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -50,7 +50,7 @@ public class GridCacheReplicatedPreloadStartStopEventsSelfTest extends GridCommo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + ((TcpDiscoverySpiConfiguration)cfg.getDiscoverySpiConfiguration()).setIpFinder(ipFinder); 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/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index 28b59fb..9cb010b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Default iteration count. */ private static final int ITERATION_CNT = 50000; @@ -83,11 +83,11 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 172da23..3e342c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Replicated cache. */ private CacheMode mode = REPLICATED; @@ -82,11 +82,11 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 60f5182..b61e78d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private CacheEvictionPolicy<?, ?> plc; @@ -97,11 +97,11 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 56f48a1..35ea407 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -46,7 +46,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolicy<?, ?>> extends GridCommonAbstractTest { /** IP finder. */ - protected static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Replicated cache. */ protected CacheMode mode = REPLICATED; @@ -100,11 +100,11 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic c.setCacheConfiguration(cc); - 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); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java index ffbc85c..765e0d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionFilterSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Replicated cache. */ private CacheMode mode = REPLICATED; @@ -82,11 +82,11 @@ public class GridCacheEvictionFilterSelfTest extends GridCommonAbstractTest { 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java index 3ea9090..af7f207 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionLockUnlockSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Evict latch. */ private static CountDownLatch evictLatch; @@ -79,11 +79,11 @@ public class GridCacheEvictionLockUnlockSelfTest extends GridCommonAbstractTest c.setCacheConfiguration(cc); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); 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/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index c6a7823..09c4a10 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private CacheEvictionPolicy<?, ?> plc; @@ -92,11 +92,11 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { 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/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java index 6f60e56..4effb96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/lru/GridCacheNearOnlyLruNearEvictionPolicySelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grid count. */ private static final int GRID_COUNT = 2; @@ -79,11 +79,11 @@ public class GridCacheNearOnlyLruNearEvictionPolicySelfTest extends GridCommonAb c.setCacheConfiguration(cc); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); cnt++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 2b5a745..0ff201c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -76,7 +76,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte c.setCacheConfiguration(cc1, cc2); - c.setSwapSpaceSpi(new FileSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); 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/local/GridCacheLocalLoadAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java index 99757a6..a95a320 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java @@ -60,11 +60,11 @@ public class GridCacheLocalLoadAllSelfTest 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(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - 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/local/GridCacheLocalLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java index 9b8d648..f48e2b5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalLockSelfTest.java @@ -60,11 +60,11 @@ public class GridCacheLocalLockSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - 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/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index a5f9402..e472041 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -65,11 +65,11 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - 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/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index 8cb6fa1..d4bfed3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -51,11 +51,11 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { c.getTransactionsConfiguration().setTxSerializableEnabled(true); c.getTransactionsConfiguration().setDefaultTxTimeout(50); - 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/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 0040e75..b075311 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected static final String ATOMIC_CACHE_NAME = "atomicCache"; @@ -58,13 +58,13 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); - cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); cfg.setCacheConfiguration(cacheConfiguration(ATOMIC_CACHE_NAME, ATOMIC), cacheConfiguration(TRANSACTIONAL_CACHE_NAME, TRANSACTIONAL)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java index 729db68..a6af007 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Flag indicating if starting node should have cache. */ protected boolean hasCache; @@ -59,7 +59,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom else cfg.setCacheConfiguration(); - cfg.setDiscoverySpi(discovery()); + cfg.setDiscoverySpiConfiguration(discovery()); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); return cfg; @@ -95,8 +95,8 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom /** * @return Discovery SPI. */ - private static DiscoverySpi discovery() { - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + private static DiscoverySpiConfiguration discovery() { + 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/clock/GridTimeSyncProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java index b625492..fc86a8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java @@ -36,7 +36,7 @@ import java.util.*; */ public class GridTimeSyncProcessorSelfTest 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. */ public static final int GRID_CNT = 4; @@ -48,11 +48,11 @@ public class GridTimeSyncProcessorSelfTest 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); cfg.setLifecycleBeans(new TimeShiftLifecycleBean(idx * 2000)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java index d9de1f4..83c46b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java @@ -52,7 +52,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { private static final long JOB_TIMEOUT = 100; /** IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -60,11 +60,11 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java index 565d73b..14c2db4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderImplSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Number of keys to load via data loader. */ private static final int KEYS_COUNT = 1000; @@ -53,10 +53,10 @@ public class GridDataLoaderImplSelfTest 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); // Forth node goes without cache. if (cnt < 4) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java index 603f592..bfc416a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridDataLoaderPerformanceTest 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; @@ -62,11 +62,11 @@ public class GridDataLoaderPerformanceTest 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(IP_FINDER); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setIncludeProperties(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java index c4b5829..ec649cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -53,7 +53,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { private static ConcurrentHashMap<Object, Object> storeMap; /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private CacheMode mode = PARTITIONED; @@ -82,11 +82,11 @@ public class GridDataLoaderProcessorSelfTest 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); cfg.setIncludeProperties(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 340bb4d..6c6a003 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -124,11 +124,11 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGridName("grid-primary"); - 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); @@ -182,11 +182,11 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGridName("grid-secondary"); - 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); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java index 28d557f..00852d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsCacheSelfTest.java @@ -50,11 +50,11 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME), cacheConfiguration(CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java index e8d17d8..d12adf4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManagerSelfTest.java @@ -47,7 +47,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*; */ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { /** Test IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Meta-information cache name. */ private static final String META_CACHE_NAME = "meta"; @@ -89,11 +89,11 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java index 67bcb85..659b7a9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManagerSelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*; */ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { /** Test IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Meta-information cache name. */ private static final String META_CACHE_NAME = "replicated"; @@ -70,11 +70,11 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java index 503f1f2..fb462f5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java @@ -122,11 +122,11 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGridName("ggfs-grid"); - 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(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); @@ -179,11 +179,11 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGridName("ggfs-grid-secondary"); - 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(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java index 974070d..1e5e2fa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorSelfTest.java @@ -46,7 +46,7 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { /** Test IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Meta-information cache name. */ private static final String META_CACHE_NAME = "replicated"; @@ -104,11 +104,11 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java index 15ccb08..6f8650c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsProcessorValidationSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.fs.IgniteFsMode.*; */ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grid #1 config. */ private IgniteConfiguration g1Cfg; @@ -76,11 +76,11 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT @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); g1GgfsCfg1.setName("g1GgfsCfg1"); g1GgfsCfg1.setDataCacheName(dataCache1Name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java index 38765d2..53eafec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsSizeSelfTest.java @@ -75,7 +75,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { private static final String GGFS_NAME = "ggfs"; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** GGFS management port */ private static int mgmtPort; @@ -148,11 +148,11 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { metaCfg.setQueryIndexEnabled(false); metaCfg.setAtomicityMode(TRANSACTIONAL); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCfg, dataCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java index 14a9220..4ec0d9d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsStreamsSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.testframework.GridTestUtils.*; */ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { /** Test IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Meta-information cache name. */ private static final String META_CACHE_NAME = "replicated"; @@ -104,11 +104,11 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(META_CACHE_NAME), cacheConfiguration(DATA_CACHE_NAME)); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java index a5f92cb..8745570 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsTaskSelfTest.java @@ -53,7 +53,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { private static final IgniteFsPath FILE = new IgniteFsPath("/file"); /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Block size: 64 Kb. */ private static final int BLOCK_SIZE = 64 * 1024; @@ -127,11 +127,11 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index 2a55227..33b8aaa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -48,9 +48,9 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration() throws Exception { // Discovery config. - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); // Cache config. CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -63,7 +63,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { cfg.setLocalHost("localhost"); cfg.setRestEnabled(true); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheCfg); // Add 'null' cache configuration. return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 595b17d..4ab5e4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -46,7 +46,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs public static final String CACHE_NAME = "testServiceCache"; /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Random generator. */ private static final Random RAND = new Random(); @@ -55,11 +55,11 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); ManagedServiceConfiguration[] svcs = services(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java index d03a1f9..d26039b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerEvictionSelfTest.java @@ -39,7 +39,7 @@ import static java.util.concurrent.TimeUnit.*; */ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Number of events used in test. */ private static final int EVENTS_COUNT = 10; @@ -56,11 +56,11 @@ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest { cfg.setStreamerConfiguration(streamerConfiguration()); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java index 201d5d4..ef45105 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/streamer/GridStreamerFailoverSelfTest.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*; */ public class GridStreamerFailoverSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Event router. */ private TestRandomRouter router; @@ -54,11 +54,11 @@ public class GridStreamerFailoverSelfTest extends GridCommonAbstractTest { cfg.setStreamerConfiguration(streamerConfiguration()); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setPeerClassLoadingEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java index 0b980b7..99eceec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java @@ -38,7 +38,7 @@ import static org.apache.ignite.internal.util.IgniteUtils.*; */ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int GRID_COUNT = 2; @@ -79,14 +79,14 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase { assert ggHome0 == null; - TcpDiscoverySpi disc = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disc = new TcpDiscoverySpiConfiguration(); disc.setIpFinder(IP_FINDER); IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridLogger(log); - cfg.setDiscoverySpi(disc); + cfg.setDiscoverySpiConfiguration(disc); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java index 36769db..2977d49 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.internal.util.IgniteUtils.*; */ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int GRID_COUNT = 2; @@ -78,7 +78,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { log.info("Grid start-stop test count: " + GRID_COUNT); for (int i = 0; i < GRID_COUNT; i++) { - TcpDiscoverySpi disc = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disc = new TcpDiscoverySpiConfiguration(); disc.setIpFinder(IP_FINDER); @@ -89,7 +89,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { // Default console logger is used cfg.setGridLogger(log); - cfg.setDiscoverySpi(disc); + cfg.setDiscoverySpiConfiguration(disc); cfg.setRestEnabled(false); try (Ignite g = G.start(cfg)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java index 108f5e4..24c4dd0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNodeStartup.java @@ -45,11 +45,11 @@ public class IpcSharedMemoryNodeStartup { IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); Map<String, String> endpointCfg = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java index 0911283..23da58b 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/GridFuncSelfTest.java @@ -2848,11 +2848,11 @@ public class GridFuncSelfTest 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(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - 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/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index fc8ba61..7104514 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.transactions.IgniteTxIsolation.*; */ public class GridCacheAffinityTransactionsOffHeapTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int NODE_CNT = 4; @@ -187,11 +187,11 @@ public class GridCacheAffinityTransactionsOffHeapTest { cfg.setCacheConfiguration(cacheCfg); - 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/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java index 9df16dd..21938c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -110,17 +110,17 @@ public class GridCacheSingleNodeLoadTest { private static void start() throws Exception { IgniteConfiguration c = new IgniteConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); - FifoQueueCollisionSpi cols = new FifoQueueCollisionSpi(); + FifoQueueCollisionSpiConfiguration cols = new FifoQueueCollisionSpiConfiguration(); cols.setParallelJobsNumber(Integer.MAX_VALUE); - c.setCollisionSpi(cols); + c.setCollisionSpiConfiguration(cols); c.setExecutorService(new IgniteThreadPoolExecutor(THREADS / 2, THREADS / 2, 0L, new LinkedBlockingQueue<Runnable>())); c.setSystemExecutorService(new IgniteThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 489bd26..76dc909 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -97,11 +97,11 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { @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/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java index 78b1aca..6ad003c 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java @@ -55,7 +55,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { private static final long TEST_TIMEOUT = 3 * 60 * 1000; /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -71,13 +71,13 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); - c.setCommunicationSpi(getCommunication()); + c.setCommunicationSpiConfiguration(getCommunication()); return c; } @@ -450,8 +450,8 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { /** * @return SPI instance. */ - private CommunicationSpi getCommunication() { - TcpCommunicationSpi spi = new TcpCommunicationSpi(); + private CommunicationSpiConfiguration getCommunication() { + TcpCommunicationSpiConfiguration spi = new TcpCommunicationSpiConfiguration(); spi.setTcpNoDelay(true); spi.setSharedMemoryPort(-1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 72329b7..a1579e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -44,7 +44,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe private static final long DURATION = 8 * 60 * 60 * 1000; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final AtomicInteger idx = new AtomicInteger(); @@ -71,11 +71,11 @@ public class GridCachePartitionedAtomicLongLoadTest 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/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java index 25bba93..6d7439e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java @@ -54,13 +54,13 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - CommunicationSpi commSpi = new TcpCommunicationSpi(); + CommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); - DiscoverySpi discoSpi = new TcpDiscoverySpi(); + DiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index 8c53588..325053e 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -41,7 +41,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo * @param cfg Current configuration. * @return Configured discovery spi. */ - protected abstract DiscoverySpi getDiscoverySpi(IgniteConfiguration cfg); + protected abstract DiscoverySpiConfiguration getDiscoverySpiConfiguration(IgniteConfiguration cfg); /** * @return Discovery spi heartbeat frequency. @@ -53,9 +53,9 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setCommunicationSpi(new TcpCommunicationSpi()); + cfg.setCommunicationSpiConfiguration(new TcpCommunicationSpiConfiguration()); - cfg.setDiscoverySpi(getDiscoverySpi(cfg)); + cfg.setDiscoverySpiConfiguration(getDiscoverySpiConfiguration(cfg)); cfg.setMetricsHistorySize(1000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java index baf7a51..8103a63 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesMulticastLoadTest.java @@ -28,8 +28,8 @@ import org.apache.ignite.testframework.junits.common.*; @GridCommonTest(group = "Load Test") public class GridSingleSplitsNewNodesMulticastLoadTest extends GridSingleSplitsNewNodesAbstractLoadTest { /** {@inheritDoc} */ - @Override protected DiscoverySpi getDiscoverySpi(IgniteConfiguration cfg) { - DiscoverySpi discoSpi = cfg.getDiscoverySpi(); + @Override protected DiscoverySpiConfiguration getDiscoverySpiConfiguration(IgniteConfiguration cfg) { + DiscoverySpiConfiguration discoSpi = cfg.getDiscoverySpiConfiguration(); assert discoSpi instanceof TcpDiscoverySpi : "Wrong default SPI implementation.";
