http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 96370bf..ca79a79 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -46,7 +46,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Cache name. */ private static final String CACHE = "cache"; @@ -74,7 +74,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs else cfg.setCacheConfiguration(); - cfg.setDiscoverySpi(discovery()); + cfg.setDiscoverySpiConfiguration(discovery()); return cfg; } @@ -108,8 +108,8 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs } /** @return Discovery SPI. */ - private DiscoverySpi discovery() { - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + private DiscoverySpiConfiguration discovery() { + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(IP_FINDER);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java index a7b98d1..22a89d4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -63,7 +63,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT private static TestStore store = new TestStore(); /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final UUID subjId = UUID.fromString("8EB3B06D-0885-4B4A-9A54-02C93EF09B65"); @@ -100,11 +100,11 @@ public abstract class GridCacheAbstractQuerySelfTest 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); IgniteQueryConfiguration idxCfg = new IgniteQueryConfiguration(); @@ -113,7 +113,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT c.setQueryConfiguration(idxCfg); // Otherwise noop swap space will be chosen on Windows. - c.setSwapSpaceSpi(new FileSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); c.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 42d1bf7..e4cdf56 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private Ignite ignite; @@ -50,11 +50,11 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 60281b7..1714e41 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -105,21 +105,21 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { }; /** */ - 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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java index 6f94780..02723c0 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Puts count. */ private static final int PUT_CNT = 10; @@ -73,11 +73,11 @@ public class GridCacheQueryLoadSelfTest 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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java index 0122336..695b9f3 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -41,7 +41,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { private static final CacheMode CACHE_MODE = REPLICATED; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { @@ -57,11 +57,11 @@ public class GridCacheQueryMetricsSelfTest 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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 743abcd..14f2b66 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest private static final int GRID_CNT = 2; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static AtomicInteger idxSwapCnt = new AtomicInteger(); @@ -75,13 +75,13 @@ public class GridCacheQueryMultiThreadedSelfTest 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 FileSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new FileSwapSpaceSpiConfiguration()); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index 4681028..9003b5f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -39,17 +39,17 @@ import static org.apache.ignite.cache.CacheMode.*; */ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); CacheConfiguration ccfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index 7972eed..9a8fcee 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -60,7 +60,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { private final Map<Integer, Object> versions = new HashMap<>(); /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private boolean swapEnabled = true; @@ -69,11 +69,11 @@ public class GridCacheSwapSelfTest 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/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index bfc0566..0e48c0a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ protected Ignite ignite; @@ -49,13 +49,13 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); - c.setSwapSpaceSpi(new NoopSwapSpaceSpi()); + c.setSwapSpaceSpiConfiguration(new NoopSwapSpaceSpiConfiguration()); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 166a0dd..72080ee 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -47,7 +47,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac private static final int CNT = 2000; /** 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 { @@ -56,9 +56,9 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); // DiscoverySpi - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); // Cache. cfg.setCacheConfiguration(cacheConfiguration(gridName)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index 32924d8..2f1c4c1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -50,7 +50,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest private static final int KEY_CNT = 1000; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected int gridCount() { @@ -66,11 +66,11 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest @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/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index 63898f6..2faff37 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridQueryParsingTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static Ignite ignite; @@ -49,11 +49,11 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); IgniteQueryConfiguration idxCfg = new IgniteQueryConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java index 9a415e8..29dde4e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java @@ -46,7 +46,7 @@ import static org.apache.ignite.cache.CachePreloadMode.*; */ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Cancel latch. */ private static CountDownLatch cancelLatch; @@ -68,13 +68,13 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - cfg.setCommunicationSpi(new CommunicationSpi()); + cfg.setCommunicationSpiConfiguration(new CommunicationSpiConfiguration()); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } @@ -164,7 +164,26 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest { /** * Communication SPI. */ - private static class CommunicationSpi extends TcpCommunicationSpi { + public static class CommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return CommunicationSpi.class; + } + } + + /** + * Communication SPI. + */ + public static class CommunicationSpi extends TcpCommunicationSpi { + /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public CommunicationSpi(CommunicationSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg, IgniteRunnable msgC) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index f296812..95c88c2 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -62,7 +62,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setDiscoverySpi(new TcpDiscoverySpi()); + cfg.setDiscoverySpiConfiguration(new TcpDiscoverySpiConfiguration()); CacheConfiguration ccfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index c4ccf59..66a488c 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -433,11 +433,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { cfg.setRestEnabled(false); - cfg.setDiscoverySpi(new TcpDiscoverySpi() { - @Override public void spiStart(String gridName) throws IgniteSpiException { - throw new IgniteSpiException("This SPI will never start."); - } - }); + cfg.setDiscoverySpiConfiguration(new NeverStartDiscoverySpiConfiguration()); G.start(cfg); @@ -458,8 +454,8 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg1 = getConfiguration(); IgniteConfiguration cfg2 = getConfiguration(); - cfg1.setCollisionSpi(new TestSingleInstancesCollisionSpi()); - cfg2.setCollisionSpi(new TestSingleInstancesCollisionSpi()); + cfg1.setCollisionSpiConfiguration(new TestSingleInstancesCollisionSpiConfiguration()); + cfg2.setCollisionSpiConfiguration(new TestSingleInstancesCollisionSpiConfiguration()); G.start(cfg1); @@ -505,9 +501,9 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg2 = getConfiguration(); IgniteConfiguration cfg3 = getConfiguration(); - cfg1.setCollisionSpi(new TestMultipleInstancesCollisionSpi()); - cfg2.setCollisionSpi(new TestMultipleInstancesCollisionSpi()); - cfg3.setCollisionSpi(new TestMultipleInstancesCollisionSpi()); + cfg1.setCollisionSpiConfiguration(new TestMultipleInstancesCollisionSpiConfiguration()); + cfg2.setCollisionSpiConfiguration(new TestMultipleInstancesCollisionSpiConfiguration()); + cfg3.setCollisionSpiConfiguration(new TestMultipleInstancesCollisionSpiConfiguration()); cfg2.setGridName(getTestGridName() + '1'); @@ -541,11 +537,25 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { /** */ @IgniteSpiMultipleInstancesSupport(true) - private static class TestMultipleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { + public static class TestMultipleInstancesCollisionSpiConfiguration + implements CollisionSpiConfiguration<TestMultipleInstancesCollisionSpi> { + /** {@inheritDoc} */ + @Override public Class<? extends TestMultipleInstancesCollisionSpi> spiClass() { + return TestMultipleInstancesCollisionSpi.class; + } + } + + /** */ + @IgniteSpiMultipleInstancesSupport(true) + public static class TestMultipleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** Grid logger. */ @IgniteLoggerResource private IgniteLogger log; + public TestMultipleInstancesCollisionSpi(TestMultipleInstancesCollisionSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override public void onCollision(CollisionContext ctx) { // No-op. @@ -575,15 +585,33 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { } /** + * + */ + public static class TestSingleInstancesCollisionSpiConfiguration + implements CollisionSpiConfiguration<TestSingleInstancesCollisionSpi> { + /** {@inheritDoc} */ + @Override public Class<? extends TestSingleInstancesCollisionSpi> spiClass() { + return TestSingleInstancesCollisionSpi.class; + } + } + + /** * DO NOT CHANGE MULTIPLE INSTANCES SUPPORT. * This test might be working on distributed environment. */ @IgniteSpiMultipleInstancesSupport(true) - private static class TestSingleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { + public static class TestSingleInstancesCollisionSpi extends IgniteSpiAdapter implements CollisionSpi { /** Grid logger. */ @IgniteLoggerResource private IgniteLogger log; + /** + * + */ + public TestSingleInstancesCollisionSpi(TestSingleInstancesCollisionSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override public void onCollision(CollisionContext ctx) { // No-op. @@ -787,4 +815,31 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { return null; } } + + /** + * + */ + public static class NeverStartDiscoverySpiConfiguration extends TcpDiscoverySpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpDiscoverySpi> spiClass() { + return NeverStartDiscoverySpi.class; + } + } + + /** + * This SPI will never start. + */ + public static class NeverStartDiscoverySpi extends TcpDiscoverySpi { + /** + * + */ + public NeverStartDiscoverySpi(NeverStartDiscoverySpiConfiguration spiCfg) { + super(spiCfg); + } + + /** {@inheritDoc} */ + @Override public void spiStart(String gridName) throws IgniteSpiException { + throw new IgniteSpiException("This SPI will never start."); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java index 17c29c9..b402fb5 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.testframework.junits.common.*; */ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Marshaller. */ private static final IgniteMarshaller MARSHALLER = new IgniteOptimizedMarshaller(); @@ -58,11 +58,11 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest private IgniteConfiguration config() { IgniteConfiguration cfg = new IgniteConfiguration(); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setUserAttributes(F.asMap(ATTR_KEY, true)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java index 0c4d474..dcadead 100644 --- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java @@ -59,7 +59,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { private static final String TEST_RCRS_NAME = "org.apache.ignite.tests.p2p.TestUserResource"; /** IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ public GridP2PUserVersionChangeSelfTest() { @@ -85,11 +85,11 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { cfg.setDeploymentMode(depMode); cfg.setNetworkTimeout(10000); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); if (gridName.contains("testCacheRedeployVersionChangeContinuousMode")) { CacheConfiguration cacheCfg = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java index 1d888c4..31e57f8 100644 --- a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringCacheManagerSelfTest.java @@ -31,7 +31,7 @@ import org.springframework.context.support.*; */ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final String CACHE_NAME = "testCache"; @@ -49,11 +49,11 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - 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/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java index febcaaf..1d9d243 100644 --- a/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/spring/GridSpringDynamicCacheManagerSelfTest.java @@ -35,7 +35,7 @@ import java.util.*; */ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final String DATA_CACHE_NAME = "data"; @@ -56,11 +56,11 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes cfg.setCacheConfiguration(cache); - 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/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java index b030d66..7c5e08b 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java @@ -41,7 +41,7 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - UriDeploymentSpi deploymentSpi = new UriDeploymentSpi(); + UriDeploymentSpiConfiguration deploymentSpi = new UriDeploymentSpiConfiguration(); deploymentSpi.setUriList( Arrays.asList(U.resolveGridGainUrl("modules/core/src/test/resources/").toURI().toString())); @@ -55,7 +55,7 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes f.set(deploymentSpi, true); } - c.setDeploymentSpi(deploymentSpi); + c.setDeploymentSpiConfiguration(deploymentSpi); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java index 7c4ee8c..0902d61 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/p2p/GridP2PDisabledSelfTest.java @@ -72,11 +72,11 @@ public class GridP2PDisabledSelfTest extends GridCommonAbstractTest { cfg.setDeploymentMode(depMode); if (initGar) { - UriDeploymentSpi depSpi = new UriDeploymentSpi(); + UriDeploymentSpiConfiguration depSpi = new UriDeploymentSpiConfiguration(); depSpi.setUriList(Collections.singletonList(garFile)); - cfg.setDeploymentSpi(depSpi); + cfg.setDeploymentSpiConfiguration(depSpi); } ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java index e6d4536..4a8ef8d 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassLoaderSelfTest.java @@ -28,7 +28,7 @@ import java.util.*; /** * Grid URI deployment class loader test. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentClassLoaderSelfTest extends GridUriDeploymentAbstractSelfTest { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java index 5c7478f..2a9a402 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentClassloaderRegisterSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; /** * Test for classloader registering. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentClassloaderRegisterSelfTest extends GridSpiAbstractTest<UriDeploymentSpi> { /** */ private static Map<ClassLoader, Set<Class<? extends ComputeTask<?, ?>>>> tasks = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java index aa5d700..52213b7 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentConfigSelfTest.java @@ -24,14 +24,16 @@ import java.util.*; /** * */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentConfigSelfTest extends GridSpiAbstractConfigTest<UriDeploymentSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new UriDeploymentSpi(), "uriList", null); - checkNegativeSpiProperty(new UriDeploymentSpi(), "uriList", Collections.singletonList("qwertyuiop"), false); - checkNegativeSpiProperty(new UriDeploymentSpi(), "uriList", Collections.singletonList(null), false); + checkNegativeSpiProperty(new UriDeploymentSpi(new UriDeploymentSpiConfiguration()), "uriList", null); + checkNegativeSpiProperty(new UriDeploymentSpi(new UriDeploymentSpiConfiguration()), "uriList", + Collections.singletonList("qwertyuiop"), false); + checkNegativeSpiProperty(new UriDeploymentSpi(new UriDeploymentSpiConfiguration()), "uriList", + Collections.singletonList(null), false); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java index 0e05389..0d767a3 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java @@ -29,7 +29,7 @@ import java.util.*; /** * */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbstractSelfTest { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java index 91539b0..5356592 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMd5CheckSelfTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*; /** * Redundancy for URI deployment test */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentMd5CheckSelfTest extends GridUriDeploymentAbstractSelfTest { /** * Used to count number of unit undeployments. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersErrorThrottlingTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersErrorThrottlingTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersErrorThrottlingTest.java index 21e5eb5..2c62724 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersErrorThrottlingTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersErrorThrottlingTest.java @@ -25,7 +25,7 @@ import java.util.*; /** * Tests error and warn messages throttling. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentMultiScannersErrorThrottlingTest extends GridUriDeploymentAbstractSelfTest { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java index b1a6bf2..6fbef2f 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentMultiScannersSelfTest.java @@ -26,7 +26,7 @@ import java.util.*; /** * Test URI deployment with multiple scanners. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentMultiScannersSelfTest extends GridUriDeploymentAbstractSelfTest { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java index 28f9ee3..b54b750 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSimpleSelfTest.java @@ -30,7 +30,7 @@ import java.util.*; /** * */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridUriDeploymentSimpleSelfTest extends GridSpiAbstractTest<UriDeploymentSpi> { /** * @return List of URI to use as deployment source. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java index 7738f51..0498c6f 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentSelfTest.java @@ -26,7 +26,7 @@ import java.util.*; /** * Test file protocol scanner. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridFileDeploymentSelfTest extends GridUriDeploymentAbstractSelfTest { /** * @return List of URI to use as deployment source. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java index 43314fe..4b66f00 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/file/GridFileDeploymentUndeploySelfTest.java @@ -28,7 +28,7 @@ import java.util.*; /** * Tests correct task undeployment after source file removing. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridFileDeploymentUndeploySelfTest extends GridSpiAbstractTest<UriDeploymentSpi> { /** */ private static String tmpDirPath = System.getProperty("java.io.tmpdir") + '/' + UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java index 5b73889..0ffb33f 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/ftp/GridFtpDeploymentTest.java @@ -26,7 +26,7 @@ import java.util.*; /** * Test for FTP deployment. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridFtpDeploymentTest extends GridUriDeploymentAbstractSelfTest { /** * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java index 055ddc9..8bc6727 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/scanners/http/GridHttpDeploymentSelfTest.java @@ -33,7 +33,7 @@ import static org.eclipse.jetty.http.HttpHeader.*; /** * Test http scanner. */ -@GridSpiTest(spi = UriDeploymentSpi.class, group = "Deployment SPI") +@GridSpiTest(spiConfiguration = UriDeploymentSpiConfiguration.class, group = "Deployment SPI") public class GridHttpDeploymentSelfTest extends GridUriDeploymentAbstractSelfTest { /** Jetty. */ private Server srv; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala index cf89e11..260ab64 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommandSpec.scala @@ -20,8 +20,8 @@ package org.apache.ignite.visor.commands.alert import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.DiscoverySpi -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.apache.ignite.spi.discovery.tcp.{TcpDiscoverySpiConfiguration, TcpDiscoverySpi} +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.{TcpDiscoveryVmIpFinderConfiguration} import java.util.regex.Pattern @@ -33,7 +33,7 @@ import org.apache.ignite.visor.commands.alert.VisorAlertCommand._ */ class VisorAlertCommandSpec extends VisorRuntimeBaseSpec(1) { /** */ - val ipFinder = new TcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true) /** */ val out = new java.io.ByteArrayOutputStream @@ -51,11 +51,11 @@ class VisorAlertCommandSpec extends VisorRuntimeBaseSpec(1) { cfg.setLifeCycleEmailNotification(false) cfg.setLocalHost("127.0.0.1") - val discoSpi: TcpDiscoverySpi = new TcpDiscoverySpi() + val discoSpi: TcpDiscoverySpiConfiguration = new TcpDiscoverySpiConfiguration() discoSpi.setIpFinder(ipFinder) - cfg.setDiscoverySpi(discoSpi.asInstanceOf[DiscoverySpi]) + cfg.setDiscoverySpiConfiguration(discoSpi.asInstanceOf[TcpDiscoverySpiConfiguration]) cfg } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala index d0e8b37..7c98cc6 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -25,8 +25,8 @@ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.apache.ignite.spi.discovery.tcp.{TcpDiscoverySpiConfiguration, TcpDiscoverySpi} +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.{TcpDiscoveryVmIpFinderConfiguration, TcpDiscoveryVmIpFinder} import org.jetbrains.annotations.Nullable import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ @@ -38,7 +38,7 @@ import scala.collection.JavaConversions._ */ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) { /** IP finder. */ - val ipFinder = new TcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true) /** * Creates grid configuration for provided grid host. @@ -53,11 +53,11 @@ class VisorCacheClearCommandSpec extends VisorRuntimeBaseSpec(2) { cfg.setLocalHost("127.0.0.1") cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache")) - val discoSpi = new TcpDiscoverySpi() + val discoSpi = new TcpDiscoverySpiConfiguration() discoSpi.setIpFinder(ipFinder) - cfg.setDiscoverySpi(discoSpi) + cfg.setDiscoverySpiConfiguration(discoSpi) cfg } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala index ef7c968..bf121fc 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -24,8 +24,8 @@ import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.apache.ignite.spi.discovery.tcp.{TcpDiscoverySpiConfiguration, TcpDiscoverySpi} +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.{TcpDiscoveryVmIpFinderConfiguration, TcpDiscoveryVmIpFinder} import org.jetbrains.annotations.Nullable import org.apache.ignite.visor.commands.cache.VisorCacheCommand._ @@ -37,7 +37,7 @@ import scala.collection.JavaConversions._ */ class VisorCacheCompactCommandSpec extends VisorRuntimeBaseSpec(2) { /** IP finder. */ - val ipFinder = new TcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true) /** * Creates grid configuration for provided grid host. @@ -52,11 +52,11 @@ class VisorCacheCompactCommandSpec extends VisorRuntimeBaseSpec(2) { cfg.setLocalHost("127.0.0.1") cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache")) - val discoSpi = new TcpDiscoverySpi() + val discoSpi = new TcpDiscoverySpiConfiguration() discoSpi.setIpFinder(ipFinder) - cfg.setDiscoverySpi(discoSpi) + cfg.setDiscoverySpiConfiguration(discoSpi) cfg } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 72b2594..4710950 100644 --- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -22,8 +22,8 @@ import org.apache.ignite.cache.CacheConfiguration import org.apache.ignite.Ignition import org.apache.ignite.cache.CacheMode import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.apache.ignite.spi.discovery.tcp.{TcpDiscoverySpiConfiguration, TcpDiscoverySpi} +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.{TcpDiscoveryVmIpFinderConfiguration, TcpDiscoveryVmIpFinder} import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor} import org.jetbrains.annotations.Nullable @@ -33,7 +33,7 @@ import scala.collection.JavaConversions._ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) { /** IP finder. */ - val ipFinder = new TcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true) /** * Creates grid configuration for provided grid host. @@ -48,11 +48,11 @@ class VisorCacheSwapCommandSpec extends VisorRuntimeBaseSpec(2) { cfg.setLocalHost("127.0.0.1") cfg.setCacheConfiguration(cacheConfig(null), cacheConfig("cache")) - val discoSpi = new TcpDiscoverySpi() + val discoSpi = new TcpDiscoverySpiConfiguration() discoSpi.setIpFinder(ipFinder) - cfg.setDiscoverySpi(discoSpi) + cfg.setDiscoverySpiConfiguration(discoSpi) cfg }
