#IGNITE-160 Fixed tests compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/965dc67d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/965dc67d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/965dc67d Branch: refs/heads/ignite-160 Commit: 965dc67db19023a108ea9c9e1769aee3251b6005 Parents: 007fdb9 Author: nikolay_tikhonov <[email protected]> Authored: Thu Feb 5 19:43:55 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Thu Feb 5 19:43:55 2015 +0300 ---------------------------------------------------------------------- .../test/java/org/apache/ignite/gridify/AbstractAopTest.java | 2 +- .../loadtests/direct/singlesplit/SingleSplitsLoadTest.java | 4 ++-- .../apache/loadtests/gridify/GridifySingleSplitLoadTest.java | 8 ++++---- .../java/org/test/gridify/ExternalNonSpringAopSelfTest.java | 2 +- .../spi/checkpoint/s3/S3CheckpointManagerSelfTest.java | 4 ++-- .../spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java | 4 ++-- .../ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java | 2 +- .../apache/ignite/client/ClientTopologyCacheSelfTest.java | 6 +++--- .../client/integration/ClientPreferDirectSelfTest.java | 6 +++--- .../ignite/client/router/ClientFailedInitSelfTest.java | 6 +++--- .../apache/ignite/client/router/RouterFactorySelfTest.java | 6 +++--- .../processors/rest/AbstractRestProcessorSelfTest.java | 6 +++--- .../internal/processors/rest/RestBinaryProtocolSelfTest.java | 6 +++--- .../processors/rest/RestMemcacheProtocolSelfTest.java | 6 +++--- .../ignite/internal/processors/rest/RestProcessorTest.java | 6 +++--- .../internal/processors/rest/TaskCommandHandlerSelfTest.java | 6 +++--- .../org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java | 6 +++--- .../apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java | 6 +++--- .../java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java | 6 +++--- .../processors/cache/IgniteCachePeekAbstractTest.java | 2 +- .../cache/datastructures/IgniteAtomicsAbstractTest.java | 6 +++--- .../cache/datastructures/IgniteCollectionAbstractTest.java | 6 +++--- 28 files changed, 72 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java index 6c2e85b..4a12c0e 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/AbstractAopTest.java @@ -679,7 +679,7 @@ public abstract class AbstractAopTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setDeploymentSpi(new LocalDeploymentSpi()); + cfg.setDeploymentSpiConfiguration(new LocalDeploymentSpiConfiguration()); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java index a2b207e..5f64128 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java @@ -47,8 +47,8 @@ public class SingleSplitsLoadTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - cfg.setCommunicationSpi(new TcpCommunicationSpi()); - cfg.setDiscoverySpi(new TcpDiscoverySpi()); + cfg.setCommunicationSpiConfiguration(new TcpCommunicationSpiConfiguration()); + cfg.setDiscoverySpiConfiguration(new TcpDiscoverySpiConfiguration()); IgniteLog4jLogger log = (IgniteLog4jLogger)cfg.getGridLogger().getLogger(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java index 5413932..ac1ab8c 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java +++ b/modules/aop/src/test/java/org/apache/loadtests/gridify/GridifySingleSplitLoadTest.java @@ -59,13 +59,13 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(); /* Uncomment following code if you start it manually. */ - 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); /* */ @SuppressWarnings("TypeMayBeWeakened") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java index 8ff16d5..8929361 100644 --- a/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/test/gridify/ExternalNonSpringAopSelfTest.java @@ -519,7 +519,7 @@ public class ExternalNonSpringAopSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - cfg.setDeploymentSpi(new LocalDeploymentSpi()); + cfg.setDeploymentSpiConfiguration(new LocalDeploymentSpiConfiguration()); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setHeartbeatFrequency(500); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java index e6a4eec..3057ceb 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java @@ -32,7 +32,7 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe IgniteConfiguration cfg = super.getConfiguration(gridName); - S3CheckpointSpi spi = new S3CheckpointSpi(); + S3CheckpointSpiConfiguration spi = new S3CheckpointSpiConfiguration(); AWSCredentials cred = new BasicAWSCredentials(IgniteS3TestSuite.getAccessKey(), IgniteS3TestSuite.getSecretKey()); @@ -41,7 +41,7 @@ public class S3CheckpointManagerSelfTest extends GridCheckpointManagerAbstractSe spi.setBucketNameSuffix("test"); - cfg.setCheckpointSpi(spi); + cfg.setCheckpointSpiConfiguration(spi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java index c942d63..e01992d 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiConfigSelfTest.java @@ -22,12 +22,12 @@ import org.apache.ignite.testframework.junits.spi.*; /** * Grid S3 checkpoint SPI config self test. */ -@GridSpiTest(spi = S3CheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = S3CheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class S3CheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<S3CheckpointSpi> { /** * @throws Exception If failed. */ public void testNegativeConfig() throws Exception { - checkNegativeSpiProperty(new S3CheckpointSpi(), "awsCredentials", null); + checkNegativeSpiProperty(new S3CheckpointSpi(new S3CheckpointSpiConfiguration()), "awsCredentials", null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java index 9010f62..b8c235c 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.testsuites.*; /** * Grid S3 checkpoint SPI self test. */ -@GridSpiTest(spi = S3CheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = S3CheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest<S3CheckpointSpi> { /** */ private static final int CHECK_POINT_COUNT = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java index ceaf64f..97cd17b 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiStartStopSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.testsuites.*; /** * Grid S3 checkpoint SPI start stop self test. */ -@GridSpiTest(spi = S3CheckpointSpi.class, group = "Checkpoint SPI") +@GridSpiTest(spiConfiguration = S3CheckpointSpiConfiguration.class, group = "Checkpoint SPI") public class S3CheckpointSpiStartStopSelfTest extends GridSpiStartStopAbstractTest<S3CheckpointSpi> { /** {@inheritDoc} */ @Override protected void spiConfigure(S3CheckpointSpi spi) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java index df61aec..ac3e27f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java @@ -49,7 +49,7 @@ public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME = "cache"; /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -265,7 +265,7 @@ public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest { cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setSwapEnabled(false); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); @@ -282,7 +282,7 @@ public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); cfg.setCacheConfiguration(cacheCfg); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java index 027088d..3a8ab4f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.client.integration.ClientAbstractMultiNodeSelfTe */ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int NODES_CNT = 6; @@ -58,11 +58,11 @@ public class ClientPreferDirectSelfTest 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(IP_FINDER); - c.setDiscoverySpi(disco); + c.setDiscoverySpiConfiguration(disco); c.setLocalHost(HOST); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java index 09717c4..94812f2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java @@ -51,7 +51,7 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { private static final int ROUTER_JETTY_PORT = 8081; /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { @@ -75,11 +75,11 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); - 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/965dc67d/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java index 9660a38..62d0b4a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/router/RouterFactorySelfTest.java @@ -32,20 +32,20 @@ import static org.apache.ignite.IgniteSystemProperties.*; */ public class RouterFactorySelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final int GRID_HTTP_PORT = 11087; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setGridName(gridName); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index 35b589d..c144207 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.testframework.junits.common.*; */ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Local host. */ protected static final String LOC_HOST = "127.0.0.1"; @@ -73,11 +73,11 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration ccfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index 3d6ba9c..57309de 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -46,7 +46,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @SuppressWarnings("unchecked") public class RestBinaryProtocolSelfTest 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 = "cache"; @@ -97,11 +97,11 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index 489c7bd..7f62f8c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -38,7 +38,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @SuppressWarnings("unchecked") public class RestMemcacheProtocolSelfTest 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 = "cache"; @@ -89,11 +89,11 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java index e096f1e..4e19df7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java @@ -100,15 +100,15 @@ public class RestProcessorTest extends GridCommonAbstractTest { */ @SuppressWarnings({"unchecked"}) private IgniteConfiguration cacheTestConfiguration(IgniteConfiguration cfg) { - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(); ipFinder.setShared(true); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); assert cfg.getClientConnectionConfiguration() == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index 7a224b3..458d49f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.client.GridClientProtocol.*; */ public class TaskCommandHandlerSelfTest 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 = "cache"; @@ -100,11 +100,11 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { cfg.setClientConnectionConfiguration(clientCfg); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration("replicated"), cacheConfiguration("partitioned"), cacheConfiguration(CACHE_NAME)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index e01143e..de4a089 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -62,11 +62,11 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java index 733714e..677fd7e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java @@ -34,7 +34,7 @@ import java.util.concurrent.*; */ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Custom cache name. */ private static final String CUSTOM_CACHE_NAME = "custom-cache"; @@ -54,11 +54,11 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(CUSTOM_CACHE_NAME)); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); assert cfg.getClientConnectionConfiguration() == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index daac5f8..251af18 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -34,7 +34,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class JdbcEmptyCacheSelfTest 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_NAME = "cache"; @@ -58,11 +58,11 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index 244133f..4b0904d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.jdbc.IgniteJdbcDriver.*; */ public class JdbcLocalCachesSelfTest 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_NAME = "cache"; @@ -63,11 +63,11 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index 82a5a54..11a4064 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -57,11 +57,11 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index 5850f5a..20c9eb7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -63,11 +63,11 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 9155742..5138815 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @SuppressWarnings("FloatingPointEquality") public class JdbcResultSetSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -70,11 +70,11 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index 082f980..b8e4518 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class JdbcStatementSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** URL. */ private static final String URL = "jdbc:gridgain://127.0.0.1/"; @@ -63,11 +63,11 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cache); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setRestEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekAbstractTest.java index 006cb8b..d9bf7db 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekAbstractTest.java @@ -43,7 +43,7 @@ public abstract class IgniteCachePeekAbstractTest extends IgniteCacheAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setSwapSpaceSpi(new GridTestSwapSpaceSpi()); + cfg.setSwapSpaceSpiConfiguration(new GridTestSwapSpaceSpiConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java index ea90578..f308db4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java @@ -29,17 +29,17 @@ import org.apache.ignite.testframework.junits.common.*; */ public abstract class IgniteAtomicsAbstractTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @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); IgniteAtomicConfiguration atomicCfg = atomicConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/965dc67d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java index 8c63bbc..2fed866 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java @@ -37,7 +37,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final String COL_CACHE_NAME = "TEST_COLLECTION_CACHE"; @@ -46,11 +46,11 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes @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); // TODO IGNITE-180: remove cache configuration when dynamic cache start is implemented. TestCollectionConfiguration colCfg = collectionConfiguration();
