http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index c32b7db..6d7db2b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -75,7 +75,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac private int backups; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected void afterTest() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java index 1a3eef3..d0bcbde 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationValidationSelfTest.java @@ -51,7 +51,7 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract private static final String DUP_DFLT_CACHES_GRID_NAME = "duplicateDefaultCachesCheckFails"; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index 90b879c..7f828b6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Daemon flag. */ protected boolean daemon; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java index 18d8b0b..a896fb3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java @@ -39,7 +39,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Name for grid without cache. */ private static final String GRID_NAME = "grid-no-cache"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 9304778..7a7a64c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -35,7 +35,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; */ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Null reference size (optimized marshaller writes one byte for null reference). */ private static final int NULL_REF_SIZE = 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java index 5337c2f..5aef743 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryVersionSelfTest.java @@ -31,7 +31,7 @@ import static org.gridgain.grid.kernal.processors.cache.GridCacheVersionManager. */ public class GridCacheEntryVersionSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Atomicity mode. */ private GridCacheAtomicityMode atomicityMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java index 8daffba..938f9b3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEventAbstractTest.java @@ -29,7 +29,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public abstract class GridCacheEvictionEventAbstractTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java index 80f8cf8..91ff27d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFieldsQueryNoDataSelfTest.java @@ -27,7 +27,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java index 7638c8c..ae78756 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Cache store. */ private static final GridCacheTestStore store = new GridCacheTestStore(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java index c6e7ae7..17b5536 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGlobalClearAllSelfTest.java @@ -41,7 +41,7 @@ public class GridCacheGlobalClearAllSelfTest extends GridCommonAbstractTest { private static final String CACHE_NAME_OTHER = "cache_name_other"; /** VM IP finder for TCP discovery SPI. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Cache name which will be passed to grid configuration. */ private GridCacheMode cacheMode = PARTITIONED; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index 13bb9e9..6b81c33 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -43,7 +43,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Event wait timeout. */ private static final int WAIT_TIMEOUT = 3000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java index 3591f62..6b2aad7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockFailoverSelfTest.java @@ -38,7 +38,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheGroupLockFailoverSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Size of the test map. */ private static final int TEST_MAP_SIZE = 200000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java index 8fa9f60..c8fd4f8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIncrementTransformTest.java @@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheIncrementTransformTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Number of nodes to test on. */ private static final int GRID_CNT = 4; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java index 072d514..14fe0e9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheIteratorPerformanceTest.java @@ -25,7 +25,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCacheIteratorPerformanceTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Large entry count. */ private static final int LARGE_ENTRY_CNT = 100000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java index a37468c..bb1183b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheKeyCheckSelfTest.java @@ -25,7 +25,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheKeyCheckSelfTest extends GridCacheAbstractSelfTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Atomicity mode. */ private GridCacheAtomicityMode atomicityMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java index 9fa2135..59fe3ff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLeakTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheLeakTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Cache name. */ private static final String CACHE_NAME = "ggfs-data"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java index 54a28f3..eb6551b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -35,7 +35,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java index 4a37e71..4a6f7c9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java @@ -48,7 +48,7 @@ public abstract class GridCacheMarshallerTxAbstractTest extends GridCommonAbstra } /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs a test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java index 394eb0a..03c481f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java @@ -34,7 +34,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; @SuppressWarnings("deprecation") public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest { /** */ - private GridTcpDiscoveryIpFinder ipFinder; + private TcpDiscoveryIpFinder ipFinder; /** */ private boolean swapEnabled; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index f165a0f..d4389b4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -37,7 +37,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Near enabled flag. */ private boolean nearEnabled; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java index bfd8fc2..f5304f1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -26,7 +26,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Cache mode. */ private GridCacheMode mode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java index 8cd71c6..45b9f11 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccPartitionedSelfTest.java @@ -31,7 +31,7 @@ public class GridCacheMvccPartitionedSelfTest extends GridCommonAbstractTest { private GridKernal grid; /** VM ip finder for TCP discovery. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java index a77721f..9cc86bc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java @@ -30,7 +30,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { private GridKernal grid; /** VM ip finder for TCP discovery. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java index 011a486..23a25f6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Counter key. */ private static final String CNTR_KEY = "CNTR_KEY"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java index 5aa9893..bcbbcf4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -34,7 +34,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { /** VM ip finder for TCP discovery. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Cache mode for test. */ private GridCacheMode cacheMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java index 69cffd9..86bc12e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java @@ -52,7 +52,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { private final Map<Integer, Object> versions = new HashMap<>(); /** */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java index 7469b56..0d9841e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTest.java @@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheOffHeapTest extends GridCommonAbstractTest { /** */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private GridCacheMode mode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java index 458a044..1bb2d71 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOrderedPreloadingSelfTest.java @@ -27,7 +27,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*; */ public class GridCacheOrderedPreloadingSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Number of grids in test. */ private static final int GRID_CNT = 4; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java index 6329e4a..a0ba093 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -43,7 +43,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest { private static final long OFFHEAP = 0;// 4 * 1024 * 1024; /** */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private final AtomicInteger idxGen = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java index 89fc935..9da2277 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedGetSelfTest.java @@ -35,7 +35,7 @@ import static org.gridgain.grid.kernal.GridTopic.*; */ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final int GRID_CNT = 3; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java index 000af30..3d06931 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedProjectionAffinitySelfTest.java @@ -37,7 +37,7 @@ public class GridCachePartitionedProjectionAffinitySelfTest extends GridCommonAb private static final int GRIDS = 3; /** */ - private GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 1e7358c..63730ef 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -44,7 +44,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest private static final String VALUE = createValue(); /** */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private final AtomicInteger idxGen = new AtomicInteger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java index 2f4a817..d7274f3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePutAllFailoverSelfTest.java @@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Size of the test map. */ private static final int TEST_MAP_SIZE = 100000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java index ba2aa77..2888ade 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -34,7 +34,7 @@ import static org.gridgain.testframework.GridTestUtils.*; */ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Cache mode for the current test. */ private GridCacheMode mode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java index 1111896..c11600c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java @@ -30,7 +30,7 @@ import static java.util.concurrent.TimeUnit.*; */ public abstract class GridCacheRefreshAheadAbstractSelfTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private final TestStore store = new TestStore(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java index 9072070..eeaa64d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReplicatedSynchronousCommitTest.java @@ -46,7 +46,7 @@ public class GridCacheReplicatedSynchronousCommitTest extends GridCommonAbstract private final Collection<TestCommunicationSpi> commSpis = new ConcurrentLinkedDeque8<>(); /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java index 5d10438..09bdfef 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSlowTxWarnTest.java @@ -27,7 +27,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java index 50f21ce..a38660d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java @@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** */ private static AtomicInteger loads; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java index eb139f0..6978ce6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -29,7 +29,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { private boolean storeValBytes; /** VM ip finder for TCP discovery. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java index 8ee97fc..d9d6a82 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapPreloadSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheSwapPreloadSelfTest extends GridCommonAbstractTest { private static final int ENTRY_CNT = 15000; /** */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private GridCacheMode cacheMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java index b13b31c..7e2103a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapReloadSelfTest.java @@ -39,7 +39,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridCacheSwapReloadSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java index 1439cf1..3198dfc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTtlManagerSelfTest.java @@ -28,7 +28,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; */ public class GridCacheTtlManagerSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Test cache mode. */ protected GridCacheMode cacheMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAbstractTest.java index 7343ae2..8a3929d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAbstractTest.java @@ -41,7 +41,7 @@ abstract class GridCacheTxAbstractTest extends GridCommonAbstractTest { private static final AtomicInteger cntr = new AtomicInteger(); /** */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Start grid by default. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxConcurrentGetAbstractTest.java index 1c7d48d..0d771ad 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxConcurrentGetAbstractTest.java @@ -34,7 +34,7 @@ public abstract class GridCacheTxConcurrentGetAbstractTest extends GridCommonAbs private static final boolean DEBUG = false; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final int THREAD_NUM = 20; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java index fde3ae3..4b49361 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxMultiNodeAbstractTest.java @@ -50,7 +50,7 @@ public abstract class GridCacheTxMultiNodeAbstractTest extends GridCommonAbstrac protected static final int GRID_CNT = 4; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ protected static final int RETRIES = 300; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxReentryAbstractSelfTest.java index 4f0dd29..acc6ae8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxReentryAbstractSelfTest.java @@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public abstract class GridCacheTxReentryAbstractSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** @return Cache mode. */ protected abstract GridCacheMode cacheMode(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java index 213eba1..f909704 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -34,7 +34,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { private static final Random RAND = new Random(); /** */ - private GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Constructs test. */ public GridCacheVariableTopologySelfTest() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index ea31ee7..2bb3540 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -33,7 +33,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC private static final int GRID_CNT = 5; /** Ip finder. */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Flush frequency. */ public static final int WRITE_BEHIND_FLUSH_FREQ = 1000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java index 9e634b7..0694ba8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongApiSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheAtomicLongApiSelfTest extends GridCommonAbstractTest { private static final Random RND = new Random(); /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java index 74fb6a1..bdf3956 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceApiSelfAbstractTest.java @@ -30,7 +30,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; */ public abstract class GridCacheAtomicReferenceApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs a test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java index e4bfbe7..76e1242 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceMultiNodeAbstractTest.java @@ -30,7 +30,7 @@ public abstract class GridCacheAtomicReferenceMultiNodeAbstractTest extends Grid protected static final int GRID_CNT = 4; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java index 92f0e7b..8089f91 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedApiSelfAbstractTest.java @@ -24,7 +24,7 @@ import java.util.*; */ public abstract class GridCacheAtomicStampedApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs a test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java index 5a12ef2..05e67e6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java @@ -46,7 +46,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl private static final int THREADS_CNT = 5; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final Random RND = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java index ee44849..b45f353 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueApiSelfAbstractTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.*; */ public abstract class GridCacheQueueApiSelfAbstractTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final int QUEUE_CAPACITY = 3; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java index 47466b7..235dd7f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java @@ -35,7 +35,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo protected static final int GRID_CNT = 3; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ protected static final int ITEMS_CNT = 300; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 6b65cae..522550e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -39,7 +39,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon private static final int GRID_CNT = 4; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final int RETRIES = 20; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java index 9a77a2d..60c1787 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueMultiNodeConsistencySelfTest.java @@ -34,7 +34,7 @@ public class GridCacheQueueMultiNodeConsistencySelfTest extends GridCommonAbstra protected static final int GRID_CNT = 3; /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** */ protected static final int RETRIES = 20; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java index 3abb5f2..ec0a7fa 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueRotativeMultiNodeAbstractTest.java @@ -35,7 +35,7 @@ public abstract class GridCacheQueueRotativeMultiNodeAbstractTest extends GridCo protected static final int GRID_CNT = 4; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ protected static final int RETRIES = 133; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index 0927679..97929ad 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -53,7 +53,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends GridCommonAbs private static GridCacheAtomicSequence[] seqArr = new GridCacheAtomicSequence[SEQ_NUM]; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructor. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java index 4533858..9e7c38b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSequenceMultiNodeAbstractSelfTest.java @@ -37,7 +37,7 @@ public abstract class GridCacheSequenceMultiNodeAbstractSelfTest extends GridCom protected static final int BATCH_SIZE = 33; /** */ - protected static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + protected static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ protected static final int RETRIES = 1111; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java index 0963194..e2ba3db 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedAtomicSequenceMultiThreadedTest.java @@ -31,7 +31,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*; */ public class GridCachePartitionedAtomicSequenceMultiThreadedTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Number of threads for multithreaded test. */ private static final int THREAD_NUM = 30; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java index 10aef03..cb018d5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartSelfTest.java @@ -26,7 +26,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCachePartitionedNodeRestartSelfTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * Constructs a test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java index f2c57d7..b3cb278 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedNodeRestartTxSelfTest.java @@ -33,7 +33,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCachePartitionedNodeRestartTxSelfTest extends GridCommonAbstractTest { /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** */ private static final int INIT_GRID_NUM = 3; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 71344f1..dc7b7c7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -36,7 +36,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; */ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 5c4fd4b..e3513a8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -37,7 +37,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*; */ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** Queue capacity. */ private static final int QUEUE_CAP = 5; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index c080974..454ccbc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -34,7 +34,7 @@ import static org.gridgain.grid.cache.GridCacheTxIsolation.*; */ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstractTest { /** */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Job counter. */ private static final AtomicInteger cntr = new AtomicInteger(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java index 5861595..0af42d7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java @@ -84,7 +84,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs private int retries = DFLT_RETRIES; /** */ - private static final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java index 50df3a1..0d19161 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java @@ -31,7 +31,7 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs private static final int GRID_CNT = 3; /** IP_FINDER. */ - private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index eb94580..8ed5b37 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -42,7 +42,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes private static Ignite ignite3; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java index acba96a..ac0a43e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -47,7 +47,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { private static GridCache<Integer, String> cache2; /** Ip-finder. */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index e5cf087..5b6f1ea 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -51,7 +51,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT private static GridCache<Integer, String> cache3; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Listeners. */ private static Collection<CacheEventListener> lsnrs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index d03c281..09e1880 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -42,7 +42,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr private static Ignite ignite2; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Listeners. */ private static Collection<IgnitePredicate<IgniteEvent>> lsnrs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index d2ee664..3c1ff8c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -56,7 +56,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra private final Condition putCond = lock.newCondition(); /** Shared IP finder. */ - private final GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Caches comparison start latch. */ private CountDownLatch cmpLatch; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/805377cc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index f7a6bf3..f0b75c5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -47,7 +47,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac private static final String VALUE = "test"; /** */ - private static GridTcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new GridTcpDiscoveryVmIpFinder(true); /** Grid instances. */ private static final List<Ignite> IGNITEs = new ArrayList<>();
