http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java index 9b6a3f0..b00c8f2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -39,7 +39,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs public static final String CACHE_NAME = "testServiceCache"; /** IP finder. */ - private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** Random generator. */ private static final Random RAND = new Random();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java index b00be46..fb49cb6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java @@ -31,7 +31,7 @@ import static java.util.concurrent.TimeUnit.*; */ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Number of events used in test. */ private static final int EVENTS_COUNT = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java index 046a685..ab1c047 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerFailoverSelfTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.*; */ public class GridStreamerFailoverSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Event router. */ private TestRandomRouter router; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java index 83b98ce..fdd8642 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerSelfTest.java @@ -42,7 +42,7 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; */ public class GridStreamerSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private boolean atLeastOnce = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java index 1200d26..e26912a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/lang/GridFuncSelfTest.java @@ -2843,7 +2843,7 @@ public class GridFuncSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(disco); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java index 4e606b9..448e421 100644 --- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java @@ -53,7 +53,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest { public static final String EXT_RESOURCE_CLS_NAME = "org.gridgain.grid.tests.p2p.GridTestUserResource"; /** Shared IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** * A test message topic. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java index a079441..7d517a4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -27,7 +27,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Number of grids cache. */ private static final int GRID_CNT = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java index 6f7e5ea..4532ece 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PDoubleDeploymentSelfTest.java @@ -30,7 +30,7 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { private IgniteDeploymentMode depMode; /** IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 52084a5..f9dc135 100644 --- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -48,7 +48,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe private int missedRsrcCacheSize; /** */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java index bcb7279..6e53d39 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -62,7 +62,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java index 110ca10..1428b1f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -61,7 +61,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java index a70e956..2ab9a64 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -61,7 +61,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java index 448a2d2..079ff97 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -48,7 +48,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java index d20a0cd..50d7f4d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeSelfTest.java @@ -54,7 +54,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index e4cad13..93a3e0f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -54,7 +54,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java index 2a1121f..28babfd 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeSelfTest.java @@ -48,7 +48,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index ca54c0f..4592f6e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -48,7 +48,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java index 6f8df63..f52759a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionWaitAttributeSelfTest.java @@ -72,7 +72,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java index 01a57bf..97d5c1d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java @@ -57,7 +57,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); ipFinder.setAddresses(Arrays.asList("127.0.0.1:" + extPort1, "127.0.0.1:" + extPort2)); TcpDiscoverySpi spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java index 9a4f3d5..6d696e2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java @@ -36,7 +36,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final AtomicInteger srvIdx = new AtomicInteger(); @@ -90,7 +90,7 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { else if (gridName.startsWith("client")) { TcpClientDiscoverySpi disco = new TcpClientDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); String addr = new ArrayList<>(IP_FINDER.getRegisteredAddresses()). get((clientIdx.get() - 1) / clientsPerSrv).toString(); @@ -471,7 +471,7 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { TcpClientDiscoverySpi disco = (TcpClientDiscoverySpi)G.grid("client-" + idx).configuration().getDiscoverySpi(); - GridTcpDiscoveryVmIpFinder ipFinder = (GridTcpDiscoveryVmIpFinder)disco.getIpFinder(); + TcpDiscoveryVmIpFinder ipFinder = (TcpDiscoveryVmIpFinder)disco.getIpFinder(); String addr = IP_FINDER.getRegisteredAddresses().iterator().next().toString(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java index 0bea36a..1048160 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryConcurrentStartTest.java @@ -24,7 +24,7 @@ public class GridTcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest private static final int TOP_SIZE = 1; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private static volatile boolean client; @@ -34,7 +34,7 @@ public class GridTcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest IgniteConfiguration cfg = super.getConfiguration(gridName); if (client) { - GridTcpDiscoveryVmIpFinder clientIpFinder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder clientIpFinder = new TcpDiscoveryVmIpFinder(); String addr = new ArrayList<>(ipFinder.getRegisteredAddresses()).iterator().next().toString(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java index 8bec834..b3991c2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java @@ -29,7 +29,7 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT private static boolean flag; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java index 6c72568..6f046a7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java @@ -49,7 +49,7 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { } /** */ - private TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** * @throws Exception If fails. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySelfTest.java index fbf60b7..eefb52b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySelfTest.java @@ -43,7 +43,7 @@ import static org.apache.ignite.spi.IgnitePortProtocol.*; */ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { /** */ - private GridTcpDiscoveryVmIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private Map<String, TcpDiscoverySpi> discoMap = new HashMap<>(); @@ -108,7 +108,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { cfg.setNodeId(nodeId); if (gridName.contains("NonSharedIpFinder")) { - GridTcpDiscoveryVmIpFinder finder = new GridTcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); finder.setAddresses(Arrays.asList("127.0.0.1:47501")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java index 09e9397..275c7c8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiRandomStartStopTest.java @@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.spi.*; public class GridTcpDiscoverySpiRandomStartStopTest extends GridAbstractDiscoveryRandomStartStopTest<TcpDiscoverySpi> { /** */ - private TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected int getMaxInterval() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java index cdfc477..3aaa8e9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiSelfTest.java @@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.spi.*; @GridSpiTest(spi = TcpDiscoverySpi.class, group = "Discovery SPI") public class GridTcpDiscoverySpiSelfTest extends GridAbstractDiscoverySelfTest<TcpDiscoverySpi> { /** */ - private TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected DiscoverySpi getSpi(int idx) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java index a503395..cb198de 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiStartStopSelfTest.java @@ -30,7 +30,7 @@ public class GridTcpDiscoverySpiStartStopSelfTest extends GridSpiStartStopAbstra */ @GridSpiTestConfig public TcpDiscoveryIpFinder getIpFinder() { - return new GridTcpDiscoveryVmIpFinder(true); + return new TcpDiscoveryVmIpFinder(true); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java index 1b8a998..bd40d7f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiWildcardSelfTest.java @@ -19,7 +19,7 @@ import org.gridgain.testframework.junits.common.*; */ public class GridTcpDiscoverySpiWildcardSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int NODES = 5; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java index 038093d..76dded6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java @@ -18,7 +18,7 @@ import java.util.*; * GridTcpDiscoveryVmIpFinder test. */ public class GridTcpDiscoveryVmIpFinderSelfTest - extends GridTcpDiscoveryIpFinderAbstractSelfTest<GridTcpDiscoveryVmIpFinder> { + extends GridTcpDiscoveryIpFinderAbstractSelfTest<TcpDiscoveryVmIpFinder> { /** * Constructor. * @@ -29,8 +29,8 @@ public class GridTcpDiscoveryVmIpFinderSelfTest } /** {@inheritDoc} */ - @Override protected GridTcpDiscoveryVmIpFinder ipFinder() { - GridTcpDiscoveryVmIpFinder finder = new GridTcpDiscoveryVmIpFinder(); + @Override protected TcpDiscoveryVmIpFinder ipFinder() { + TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); assert !finder.isShared() : "Ip finder should NOT be shared by default."; @@ -41,7 +41,7 @@ public class GridTcpDiscoveryVmIpFinderSelfTest * @throws Exception If any error occurs. */ public void testAddressesInitialization() throws Exception { - GridTcpDiscoveryVmIpFinder finder = ipFinder(); + TcpDiscoveryVmIpFinder finder = ipFinder(); try { finder.setAddresses(Arrays.asList("127.0.0.1:475000001")); @@ -110,7 +110,7 @@ public class GridTcpDiscoveryVmIpFinderSelfTest * @throws Exception If any error occurs. */ public void testIpV6AddressesInitialization() throws Exception { - GridTcpDiscoveryVmIpFinder finder = ipFinder(); + TcpDiscoveryVmIpFinder finder = ipFinder(); try { finder.setAddresses(Arrays.asList("[::1]:475000001")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java index 1e5c323..4105847 100644 --- a/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java @@ -26,7 +26,7 @@ public class GridNoopSwapSpaceSpiSelfTest extends GridCommonAbstractTest { TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(disco); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java index 4e31cd3..739085b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithSpecifiedWorkDirectorySelfTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.util.GridUtils.*; */ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int GRID_COUNT = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java index e66fd55..03d68b3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridStartupWithUndefinedGridGainHomeSelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.util.GridUtils.*; */ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int GRID_COUNT = 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java index d0094e7..12eb861 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/GridTopologyHeapSizeSelfTest.java @@ -29,7 +29,7 @@ import static org.gridgain.grid.kernal.GridNodeAttributes.*; */ public class GridTopologyHeapSizeSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java index 4f383a7..e53c3a1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java @@ -39,7 +39,7 @@ public class GridIpcSharedMemoryNodeStartup { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java index a089320..4f0663e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/GridCacheMultiNodeLoadTest.java @@ -37,7 +37,7 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest { private static Ignite ignite1; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java index 95d2b30..7e6c260 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheAffinityTransactionsOffHeapTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final int NODE_CNT = 4; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java index fc2cf53..4f4e261 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -104,7 +104,7 @@ public class GridCacheSingleNodeLoadTest { TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(disco); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java index 5ee7b64..57b62a6 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java @@ -92,7 +92,7 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest { TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(disco); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml index 2729b5c..57538ad 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml @@ -90,7 +90,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index 9c4fb4c..83087cd 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -161,7 +161,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java index b18afcc..16bb1df 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/communication/GridIoManagerBenchmark0.java @@ -47,7 +47,7 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest { private static final long TEST_TIMEOUT = 3 * 60 * 1000; /** */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index cbc3d05..e069208 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -35,7 +35,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe private static final long DURATION = 8 * 60 * 60 * 1000; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private static final AtomicInteger idx = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java index 3229b75..85f3e3d 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -247,7 +247,7 @@ public class GridSwapEvictAllBenchmark { TcpDiscoverySpi disco = new TcpDiscoverySpi(); - TcpDiscoveryIpFinder finder = new GridTcpDiscoveryVmIpFinder(true); + TcpDiscoveryIpFinder finder = new TcpDiscoveryVmIpFinder(true); disco.setIpFinder(finder); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java index 00f96eb..f2596ee 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java @@ -302,7 +302,7 @@ public abstract class GridSpiAbstractTest<T extends IgniteSpi> extends GridAbstr if (discoSpi instanceof TcpDiscoverySpi) { TcpDiscoverySpi tcpDisco = (TcpDiscoverySpi)discoSpi; - tcpDisco.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + tcpDisco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); } getTestData().setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index c2e8aa5..57d0a96 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -285,7 +285,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index 16a87c4..4a77163 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -55,7 +55,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf private static final int THREAD_CNT = 8; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Barrier for multithreaded tests. */ private static CyclicBarrier barrier; @@ -172,7 +172,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java index 887baaa..b77e386 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java @@ -147,7 +147,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java index 023a411..d58c7a1 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -80,7 +80,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC private static final int THREAD_CNT = 8; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Barrier for multithreaded tests. */ private static CyclicBarrier barrier; @@ -197,7 +197,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java index 12a5842..e11bc13 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -57,7 +57,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra IgniteConfiguration cfg = super.getConfiguration(gridName); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 3ce2c8a..8d0b646 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -41,7 +41,7 @@ import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint */ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Grid name. */ private static final String GRID_NAME = "grid"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index 0d7d922..d984d55 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Path to test hadoop configuration. */ private static final String HADOOP_FS_CFG = "modules/core/src/test/config/hadoop/core-site.xml"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index 12c2756..e5b6890 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -102,7 +102,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index d51fec2..d4f0603 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -116,7 +116,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); @@ -175,7 +175,7 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java index 4d113e2..5b7d74f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -45,7 +45,7 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { public static final int GRP_SIZE = 128; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Node count. */ private int cnt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java index d9506f6..e98103e 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java @@ -79,7 +79,7 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); cfg.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java index f17594c..51f1565 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java @@ -43,7 +43,7 @@ import static org.hibernate.cfg.Environment.*; */ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ public static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index 0dfae87..3966b70 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -39,7 +39,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*; */ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Cache name. */ private static final String CACHE = "cache"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java index ad19fc4..6db5615 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -55,7 +55,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT private static TestStore store = new TestStore(); /** */ - private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private static final UUID subjId = UUID.fromString("8EB3B06D-0885-4B4A-9A54-02C93EF09B65"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 4cb2617..20c6146 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*; */ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private Ignite ignite; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 906b960..c74556e 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -97,7 +97,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { }; /** */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java index 1f45579..9654fb6 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -35,7 +35,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Puts count. */ private static final int PUT_CNT = 10; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java index 6d4307d..9410c94 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { private static final GridCacheMode CACHE_MODE = REPLICATED; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java index 8291dee..01dc06a 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java @@ -48,7 +48,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest private static final int GRID_CNT = 2; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private static AtomicInteger idxSwapCnt = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java index d2ee128..6db0a1c 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java @@ -44,7 +44,7 @@ public class GridCacheQueryUserResourceSelfTest extends GridCommonAbstractTest { private static final int RUN_CNT = 2; /** VM ip finder for TCP discovery. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** External class loader. */ private static final ClassLoader extClsLdr; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index a596f15..935045d 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -32,7 +32,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java index 8531c13..1f71618 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java @@ -52,7 +52,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { private final Map<Integer, Object> versions = new HashMap<>(); /** */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private boolean swapEnabled = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 6640ea5..a39813b 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*; */ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ protected Ignite ignite; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 21c6c38..48a50b4 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -37,7 +37,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac private static final int CNT = 2000; /** IP Finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java index b9e341c..7cee23d 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java @@ -42,7 +42,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest private static final int KEY_CNT = 1000; /** */ - private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected int gridCount() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java index b370cb8..8dd50b9 100644 --- a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java +++ b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java @@ -98,7 +98,7 @@ public class GridH2IndexingSpiLoadTest { TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new GridTcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); c.setDiscoverySpi(discoSpi); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/scalar/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-cache.xml b/modules/scalar/src/test/resources/spring-cache.xml index c626e45..8b28caa 100644 --- a/modules/scalar/src/test/resources/spring-cache.xml +++ b/modules/scalar/src/test/resources/spring-cache.xml @@ -32,7 +32,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/scalar/src/test/resources/spring-ping-pong-partner.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml index b8bb95d..062871e 100644 --- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml +++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml @@ -77,7 +77,7 @@ <property name="discoverySpi"> <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java index 66946da..15009f1 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/cache/spring/GridSpringCacheManagerSelfTest.java @@ -23,7 +23,7 @@ import org.springframework.context.support.*; */ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** */ private static final String CACHE_NAME = "testCache"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java index 996b297..64dedb9 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java @@ -24,7 +24,7 @@ import org.gridgain.testframework.junits.common.*; */ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); /** Marshaller. */ private static final IgniteMarshaller MARSHALLER = new IgniteOptimizedMarshaller(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java index 5215551..e2de3b7 100644 --- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java +++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PUserVersionChangeSelfTest.java @@ -52,7 +52,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest { private static final String TEST_RCRS_NAME = "org.gridgain.grid.tests.p2p.GridTestUserResource"; /** IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ public GridP2PUserVersionChangeSelfTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/717180b3/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala index 0b0da66..b514735 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala @@ -17,7 +17,7 @@ import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.spi.discovery.DiscoverySpi import org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder +import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.gridgain.visor._ import org.gridgain.visor.commands.alert.VisorAlertCommand._ @@ -26,7 +26,7 @@ import org.gridgain.visor.commands.alert.VisorAlertCommand._ */ class VisorAlertCommandSpec extends VisorRuntimeBaseSpec(1) { /** */ - val ipFinder = new GridTcpDiscoveryVmIpFinder(true) + val ipFinder = new TcpDiscoveryVmIpFinder(true) /** */ val out = new java.io.ByteArrayOutputStream
