You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/21 09:23:53 UTC
[02/71] [abbrv] ignite git commit: ignite-3207 Rename
IgniteConfiguration.gridName -> igniteInstanceName.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.java
index 620c0ad..43065e5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
*/
public class IgniteCacheReplicatedFieldsQueryP2PEnabledSelfTest extends IgniteCacheReplicatedFieldsQuerySelfTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
c.setPeerClassLoadingEnabled(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQueryP2PDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQueryP2PDisabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQueryP2PDisabledSelfTest.java
index eca9660..f68e661 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQueryP2PDisabledSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQueryP2PDisabledSelfTest.java
@@ -24,8 +24,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
*/
public class IgniteCacheReplicatedQueryP2PDisabledSelfTest extends IgniteCacheReplicatedQuerySelfTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
c.setPeerClassLoadingEnabled(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
index 68ecdff..f8e3195 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
@@ -43,8 +43,8 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst
private static final String QUERY = "select a._val, b._val from String a, String b";
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration<Integer, String> ccfg = new CacheConfiguration<>();
ccfg.setIndexedTypes(Integer.class, String.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index ace7d94..8d48e60 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -72,8 +72,8 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest {
private static final long DEFAULT_TIME_TO_LIVE = 2000;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration ccfg = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8eae549..b7d5bab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -62,8 +62,8 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheKeyConfiguration keyCfg = new CacheKeyConfiguration(TestKey.class.getName(), "affKey");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index 07c8c5e..8974116 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -67,8 +67,8 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 225c838..1c2ffd7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -63,8 +63,8 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration c = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
TcpDiscoverySpi disco = new TcpDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
index d1d80f2..91d0c0b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/FetchingQueryCursorStressTest.java
@@ -151,7 +151,7 @@ public class FetchingQueryCursorStressTest {
private static IgniteConfiguration config(int idx, boolean client) {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("grid-" + idx);
+ cfg.setIgniteInstanceName("grid-" + idx);
cfg.setClientMode(client);
CacheConfiguration ccfg = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 582bfe3..cfb56b0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -68,8 +68,8 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
private static CountDownLatch finishLatch;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration cache = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/AbstractCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/AbstractCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/AbstractCacheJtaSelfTest.java
index 96e3258..37af32c 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/AbstractCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/AbstractCacheJtaSelfTest.java
@@ -65,14 +65,14 @@ public abstract class AbstractCacheJtaSelfTest extends GridCacheAbstractSelfTest
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
configureJta(cfg);
- CacheConfiguration cfg1 = cacheConfiguration(gridName);
+ CacheConfiguration cfg1 = cacheConfiguration(igniteInstanceName);
- CacheConfiguration cfg2 = cacheConfiguration(gridName);
+ CacheConfiguration cfg2 = cacheConfiguration(igniteInstanceName);
cfg2.setName("cache-2");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
index 83127d1..b2a9b69 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
@@ -34,8 +34,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
*/
public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration ccfg = new CacheConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java
index 2208b6c..d39e14b 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaFactoryConfigValidationSelfTest.java
@@ -36,8 +36,8 @@ public class GridCacheJtaFactoryConfigValidationSelfTest extends GridCommonAbstr
private Factory factory;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.getTransactionConfiguration().setTxManagerFactory(factory);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java
index 8582b8e..c10d115 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaLifecycleAwareSelfTest.java
@@ -96,8 +96,8 @@ public class GridJtaLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSel
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected final IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setDiscoverySpi(new TcpDiscoverySpi());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
index 9ccb9ef..1c19751 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
@@ -97,14 +97,14 @@ public class GridLog4jCorrectFileNameTest extends TestCase {
/**
* Creates grid configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Grid configuration.
* @throws Exception If error occurred.
*/
- private static IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
cfg.setGridLogger(new Log4JLogger());
cfg.setConnectorConfiguration(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2CorrectFileNameTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2CorrectFileNameTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2CorrectFileNameTest.java
index f572dcc..b56be27 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2CorrectFileNameTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2CorrectFileNameTest.java
@@ -69,16 +69,16 @@ public class GridLog4j2CorrectFileNameTest extends TestCase {
/**
* Creates grid configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Grid configuration.
* @throws Exception If error occurred.
*/
- private static IgniteConfiguration getConfiguration(String gridName)
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName)
throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
// We need of a configuration file passed in
File xml = GridTestUtils
.resolveIgnitePath("modules/core/src/test/config/log4j2-test.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java
index 2be1e03..f04c28c 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/GridLog4j2InitializedTest.java
@@ -45,7 +45,7 @@ public class GridLog4j2InitializedTest extends TestCase {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("grid" + 1);
+ cfg.setIgniteInstanceName("grid" + 1);
cfg.setNodeId(new UUID(1, 1));
// cfg.setIgniteHome("/home/glutters/Documenti/apache-ignite/ignite-master/ignite/");
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
index 30a2420..18fa265 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerSelfTest.java
@@ -153,12 +153,12 @@ public class Log4j2LoggerSelfTest extends TestCase {
/**
* Creates grid configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param logPath Logger configuration path.
* @return Grid configuration.
* @throws Exception If error occurred.
*/
- private static IgniteConfiguration getConfiguration(String gridName, String logPath)
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName, String logPath)
throws Exception {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -167,7 +167,7 @@ public class Log4j2LoggerSelfTest extends TestCase {
}});
return new IgniteConfiguration()
- .setGridName(gridName)
+ .setIgniteInstanceName(igniteInstanceName)
.setGridLogger(new Log4J2Logger(logPath))
.setConnectorConfiguration(null)
.setDiscoverySpi(disco);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
index 0c0d9c4..95c7ea8 100644
--- a/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
+++ b/modules/log4j2/src/test/java/org/apache/ignite/logger/log4j2/Log4j2LoggerVerboseModeSelfTest.java
@@ -95,12 +95,12 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase {
/**
* Creates grid configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param logPath Logger configuration path.
* @return Grid configuration.
* @throws Exception If error occurred.
*/
- private static IgniteConfiguration getConfiguration(String gridName, String logPath)
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName, String logPath)
throws Exception {
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -109,7 +109,7 @@ public class Log4j2LoggerVerboseModeSelfTest extends TestCase {
}});
return new IgniteConfiguration()
- .setGridName(gridName)
+ .setIgniteInstanceName(igniteInstanceName)
.setGridLogger(new Log4J2Logger(logPath))
.setConnectorConfiguration(null)
.setDiscoverySpi(disco);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
index ac76f6e..dc491e9 100644
--- a/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
+++ b/modules/osgi/src/main/java/org/apache/ignite/osgi/IgniteAbstractOsgiContextActivator.java
@@ -226,7 +226,7 @@ public abstract class IgniteAbstractOsgiContextActivator implements BundleActiva
private void exportOsgiService(Ignite ignite) {
Dictionary<String, String> dict = new Hashtable<>();
- // Only add the service property if the grid name != null.
+ // Only add the service property if the Ignite instance name != null.
if (ignite.name() != null)
dict.put(OSGI_SERVICE_PROP_IGNITE_NAME, ignite.name());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
----------------------------------------------------------------------
diff --git a/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java b/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
index c414092..b43a2f6 100644
--- a/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
+++ b/modules/osgi/src/test/java/org/apache/ignite/osgi/activators/BasicIgniteTestActivator.java
@@ -37,7 +37,7 @@ public class BasicIgniteTestActivator extends IgniteAbstractOsgiContextActivator
@Override public IgniteConfiguration igniteConfiguration() {
IgniteConfiguration config = new IgniteConfiguration();
- config.setGridName("testGrid");
+ config.setIgniteInstanceName("testGrid");
return config;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index 998ec28..0101e25 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -302,11 +302,12 @@ object scalar extends ScalarConversions {
/**
* Gets named cache from specified grid.
*
- * @param gridName Name of the grid.
+ * @param igniteInstanceName Name of the Ignite instance.
* @param cacheName Name of the cache to get.
*/
- @inline def cache$[K, V](@Nullable gridName: String, @Nullable cacheName: String): Option[IgniteCache[K, V]] =
- ignite$(gridName) match {
+ @inline def cache$[K, V](@Nullable igniteInstanceName: String,
+ @Nullable cacheName: String): Option[IgniteCache[K, V]] =
+ ignite$(igniteInstanceName) match {
case Some(g) => Option(g.cache(cacheName))
case None => None
}
@@ -339,9 +340,9 @@ object scalar extends ScalarConversions {
def nid8$(node: ClusterNode) = node.id().toString.take(8).toUpperCase
/**
- * Gets named grid.
+ * Gets named Ignite instance.
*
- * @param name Grid name.
+ * @param name Ignite instance name.
*/
@inline def ignite$(@Nullable name: String): Option[Ignite] =
try {
@@ -396,10 +397,10 @@ object scalar extends ScalarConversions {
Ignition.state == IgniteState.STOPPED
/**
- * Stops given grid and specified cancel flag.
- * If specified grid is already stopped - it's no-op.
+ * Stops given Ignite instance and specified cancel flag.
+ * If specified Ignite instance is already stopped - it's no-op.
*
- * @param name Grid name to cancel.
+ * @param name Ignite instance name to cancel.
* @param cancel Whether or not to cancel all currently running jobs.
*/
def stop(@Nullable name: String, cancel: Boolean) =
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/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 0f35c44..766d9fb 100644
--- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
+++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
@@ -29,7 +29,7 @@
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd">
<bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- <property name="gridName" value="partner"/>
+ <property name="igniteInstanceName" value="partner"/>
<!-- Set deployment mode to be able to deploy jobs and tasks on that node. -->
<property name="deploymentMode" value="SHARED"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
index ecb1e5a..479357c 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarProjectionSpec.scala
@@ -55,7 +55,7 @@ class ScalarProjectionSpec extends FunSpec with ShouldMatchers with BeforeAndAft
/**
*
- * @param name Grid name.
+ * @param name Ignite instance name.
* @param shown Shown flag.
*/
private def gridConfig(name: String, shown: Boolean): IgniteConfiguration = {
@@ -63,7 +63,7 @@ class ScalarProjectionSpec extends FunSpec with ShouldMatchers with BeforeAndAft
val cfg = new IgniteConfiguration
- cfg.setGridName(name)
+ cfg.setIgniteInstanceName(name)
cfg.setUserAttributes(attrs)
cfg
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessor.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessor.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessor.java
index b21ba51..2b16fbc 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessor.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/IgniteScheduleProcessor.java
@@ -126,7 +126,7 @@ public class IgniteScheduleProcessor extends IgniteScheduleProcessorAdapter {
/** {@inheritDoc} */
@Override public void printMemoryStats() {
X.println(">>>");
- X.println(">>> Schedule processor memory stats [grid=" + ctx.gridName() + ']');
+ X.println(">>> Schedule processor memory stats [igniteInstanceName=" + ctx.igniteInstanceName() + ']');
X.println(">>> schedFutsSize: " + schedFuts.size());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
index ac23a79..71bbb84 100644
--- a/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/apache/ignite/internal/processors/schedule/ScheduleFutureImpl.java
@@ -609,8 +609,8 @@ class ScheduleFutureImpl<R> implements SchedulerFuture<R> {
fut.onDone(e);
}
catch (RuntimeException | Error e) {
- U.warn(null, "Failed to notify chained future (is grid stopped?) [grid=" + ctx.gridName() +
- ", doneCb=" + doneCb + ", err=" + e.getMessage() + ']');
+ U.warn(null, "Failed to notify chained future (is grid stopped?) [igniteInstanceName=" +
+ ctx.igniteInstanceName() + ", doneCb=" + doneCb + ", err=" + e.getMessage() + ']');
fut.onDone(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
index 842c459..68ada45 100644
--- a/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
+++ b/modules/spark/src/main/scala/org/apache/ignite/spark/IgniteContext.scala
@@ -175,7 +175,7 @@ class IgniteContext(
private def doClose() = {
val igniteCfg = cfgClo()
- Ignition.stop(igniteCfg.getGridName, false)
+ Ignition.stop(igniteCfg.getIgniteInstanceName, false)
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java b/modules/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
index 53aff75..59dbbfa 100644
--- a/modules/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
+++ b/modules/spark/src/test/java/org/apache/ignite/spark/JavaEmbeddedIgniteRDDSelfTest.java
@@ -43,11 +43,11 @@ import scala.Tuple2;
* Tests for {@link JavaIgniteRDD} (embedded mode).
*/
public class JavaEmbeddedIgniteRDDSelfTest extends GridCommonAbstractTest {
- /** For grid names generation */
+ /** For Ignite instance names generation */
private static AtomicInteger cntr = new AtomicInteger(1);
- /** Grid names. */
- private static ThreadLocal<Integer> gridNames = new ThreadLocal<Integer>() {
+ /** Ignite instance names. */
+ private static ThreadLocal<Integer> igniteInstanceNames = new ThreadLocal<Integer>() {
@Override protected Integer initialValue() {
return cntr.getAndIncrement();
}
@@ -276,12 +276,12 @@ public class JavaEmbeddedIgniteRDDSelfTest extends GridCommonAbstractTest {
private static TcpDiscoveryVmIpFinder FINDER = new TcpDiscoveryVmIpFinder(true);
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param client Client.
* @throws Exception If failed.
* @return Confiuration.
*/
- private static IgniteConfiguration getConfiguration(String gridName, boolean client) throws Exception {
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName, boolean client) throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -294,7 +294,7 @@ public class JavaEmbeddedIgniteRDDSelfTest extends GridCommonAbstractTest {
cfg.setClientMode(client);
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
return cfg;
}
@@ -323,7 +323,7 @@ public class JavaEmbeddedIgniteRDDSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override public IgniteConfiguration apply() {
try {
- return getConfiguration("worker-" + gridNames.get(), false);
+ return getConfiguration("worker-" + igniteInstanceNames.get(), false);
}
catch (Exception e) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
index 1075f96..2f6326d 100644
--- a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
+++ b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
@@ -299,10 +299,10 @@ public class JavaStandaloneIgniteRDDSelfTest extends GridCommonAbstractTest {
}
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param client Client.
*/
- private static IgniteConfiguration getConfiguration(String gridName, boolean client) throws Exception {
+ private static IgniteConfiguration getConfiguration(String igniteInstanceName, boolean client) throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -315,7 +315,7 @@ public class JavaStandaloneIgniteRDDSelfTest extends GridCommonAbstractTest {
cfg.setClientMode(client);
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
index 51559ab..649d3e1 100644
--- a/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
+++ b/modules/spark/src/test/scala/org/apache/ignite/spark/IgniteRDDSpec.scala
@@ -359,11 +359,11 @@ object IgniteRDDSpec {
/**
* Gets ignite configuration.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param client Client mode flag.
* @return Ignite configuration.
*/
- def configuration(gridName: String, client: Boolean): IgniteConfiguration = {
+ def configuration(igniteInstanceName: String, client: Boolean): IgniteConfiguration = {
val cfg = new IgniteConfiguration
val discoSpi = new TcpDiscoverySpi
@@ -372,22 +372,22 @@ object IgniteRDDSpec {
cfg.setDiscoverySpi(discoSpi)
- cfg.setCacheConfiguration(cacheConfiguration(gridName))
+ cfg.setCacheConfiguration(cacheConfiguration(igniteInstanceName))
cfg.setClientMode(client)
- cfg.setGridName(gridName)
+ cfg.setIgniteInstanceName(igniteInstanceName)
cfg
}
/**
- * Gets cache configuration for the given grid name.
+ * Gets cache configuration for the given Ignite instance name.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @return Cache configuration.
*/
- def cacheConfiguration(gridName: String): CacheConfiguration[Object, Object] = {
+ def cacheConfiguration(igniteInstanceName: String): CacheConfiguration[Object, Object] = {
val ccfg = new CacheConfiguration[Object, Object]()
ccfg.setBackups(1)
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index 37a4b74..1f790f8 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -57,7 +57,7 @@ import org.springframework.context.ApplicationContextAware;
* <bean id="mySpringBean" class="org.apache.ignite.GridSpringBean">
* <property name="configuration">
* <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
- * <property name="gridName" value="mySpringGrid"/>
+ * <property name="igniteInstanceName" value="mySpringGrid"/>
* </bean>
* </property>
* </bean>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index fbdeb73..2a24b42 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -103,7 +103,7 @@ import org.springframework.context.ApplicationContextAware;
* and results in {@link IllegalArgumentException}.
* <p>
* If you already have Ignite node running within your application,
- * simply provide correct Grid name, like below (if there is no Grid
+ * simply provide correct Ignite instance name, like below (if there is no Grid
* instance with such name, exception will be thrown):
* <pre name="code" class="xml">
* <beans xmlns="http://www.springframework.org/schema/beans"
@@ -112,9 +112,9 @@ import org.springframework.context.ApplicationContextAware;
* xsi:schemaLocation="
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
- * <-- Provide Grid name. -->
+ * <-- Provide Ignite instance name. -->
* <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager">
- * <property name="gridName" value="myGrid"/>
+ * <property name="igniteInstanceName" value="myGrid"/>
* </bean>
*
* <-- Use annotation-driven caching configuration. -->
@@ -127,7 +127,7 @@ import org.springframework.context.ApplicationContextAware;
* <p>
* If neither {@link #setConfigurationPath(String) configurationPath},
* {@link #setConfiguration(IgniteConfiguration) configuration}, nor
- * {@link #setGridName(String) gridName} are provided, cache manager
+ * {@link #setIgniteInstanceName(String) igniteInstanceName} are provided, cache manager
* will try to use default Grid instance (the one with the {@code null}
* name). If it doesn't exist, exception will be thrown.
* <h1>Starting Remote Nodes</h1>
@@ -147,8 +147,8 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli
/** Ignite configuration. */
private IgniteConfiguration cfg;
- /** Grid name. */
- private String gridName;
+ /** Ignite instance name. */
+ private String igniteInstanceName;
/** Dynamic cache configuration template. */
private CacheConfiguration<Object, Object> dynamicCacheCfg;
@@ -207,18 +207,40 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli
* Gets grid name.
*
* @return Grid name.
+ * @deprecated Use {@link #getIgniteInstanceName()}.
*/
+ @Deprecated
public String getGridName() {
- return gridName;
+ return getIgniteInstanceName();
}
/**
* Sets grid name.
*
* @param gridName Grid name.
+ * @deprecated Use {@link #setIgniteInstanceName(String)}.
*/
+ @Deprecated
public void setGridName(String gridName) {
- this.gridName = gridName;
+ setIgniteInstanceName(gridName);
+ }
+
+ /**
+ * Gets Ignite instance name.
+ *
+ * @return Ignite instance name.
+ */
+ public String getIgniteInstanceName() {
+ return igniteInstanceName;
+ }
+
+ /**
+ * Sets Ignite instance name.
+ *
+ * @param igniteInstanceName Ignite instance name.
+ */
+ public void setIgniteInstanceName(String igniteInstanceName) {
+ this.igniteInstanceName = igniteInstanceName;
}
/**
@@ -265,7 +287,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli
throw new IllegalArgumentException("Both 'configurationPath' and 'configuration' are " +
"provided. Set only one of these properties if you need to start a Ignite node inside of " +
"SpringCacheManager. If you already have a node running, omit both of them and set" +
- "'gridName' property.");
+ "'igniteInstanceName' property.");
}
if (cfgPath != null)
@@ -273,7 +295,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean, Appli
else if (cfg != null)
ignite = IgniteSpring.start(cfg, springCtx);
else
- ignite = Ignition.ignite(gridName);
+ ignite = Ignition.ignite(igniteInstanceName);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java b/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
index 32a7b43..d69ca5b 100644
--- a/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/transactions/spring/SpringTransactionManager.java
@@ -109,7 +109,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* and results in {@link IllegalArgumentException}.
*
* If you already have Ignite node running within your application,
- * simply provide correct Grid name, like below (if there is no Grid
+ * simply provide correct Ignite instance name, like below (if there is no Grid
* instance with such name, exception will be thrown):
* <pre name="code" class="xml">
* <beans xmlns="http://www.springframework.org/schema/beans"
@@ -118,9 +118,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* xsi:schemaLocation="
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
- * <-- Provide Grid name. -->
+ * <-- Provide Ignite instance name. -->
* <bean id="transactionManager" class="org.apache.ignite.transactions.spring.SpringTransactionManager">
- * <property name="gridName" value="myGrid"/>
+ * <property name="igniteInstanceName" value="myGrid"/>
* </bean>
*
* <-- Use annotation-driven transaction configuration. -->
@@ -133,7 +133,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
*
* If neither {@link #setConfigurationPath(String) configurationPath},
* {@link #setConfiguration(IgniteConfiguration) configuration}, nor
- * {@link #setGridName(String) gridName} are provided, transaction manager
+ * {@link #setIgniteInstanceName(String) igniteInstanceName} are provided, transaction manager
* will try to use default Grid instance (the one with the {@code null}
* name). If it doesn't exist, exception will be thrown.
*
@@ -147,9 +147,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* xsi:schemaLocation="
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
- * <-- Provide Grid name. -->
+ * <-- Provide Ignite instance name. -->
* <bean id="transactionManager" class="org.apache.ignite.transactions.spring.SpringTransactionManager">
- * <property name="gridName" value="myGrid"/>
+ * <property name="igniteInstanceName" value="myGrid"/>
* <property name="transactionConcurrency" value="OPTIMISTIC"/>
* </bean>
*
@@ -168,12 +168,12 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
* <bean id="optimisticTransactionManager" class="org.apache.ignite.transactions.spring.SpringTransactionManager">
- * <property name="gridName" value="myGrid"/>
+ * <property name="igniteInstanceName" value="myGrid"/>
* <property name="transactionConcurrency" value="OPTIMISTIC"/>
* </bean>
*
* <bean id="pessimisticTransactionManager" class="org.apache.ignite.transactions.spring.SpringTransactionManager">
- * <property name="gridName" value="myGrid"/>
+ * <property name="igniteInstanceName" value="myGrid"/>
* <property name="transactionConcurrency" value="PESSIMISTIC"/>
* </bean>
*
@@ -219,9 +219,9 @@ public class SpringTransactionManager extends AbstractPlatformTransactionManager
private IgniteConfiguration cfg;
/**
- * Grid name.
+ * Ignite instance name.
*/
- private String gridName;
+ private String igniteInstanceName;
/**
* Ignite instance.
@@ -302,18 +302,40 @@ public class SpringTransactionManager extends AbstractPlatformTransactionManager
* Gets grid name.
*
* @return Grid name.
+ * @deprecated Use {@link #getIgniteInstanceName()}.
*/
+ @Deprecated
public String getGridName() {
- return gridName;
+ return getIgniteInstanceName();
}
/**
* Sets grid name.
*
* @param gridName Grid name.
+ * @deprecated Use {@link #setIgniteInstanceName(String)}.
*/
+ @Deprecated
public void setGridName(String gridName) {
- this.gridName = gridName;
+ setIgniteInstanceName(gridName);
+ }
+
+ /**
+ * Gets Ignite instance name.
+ *
+ * @return Ignite instance name.
+ */
+ public String getIgniteInstanceName() {
+ return igniteInstanceName;
+ }
+
+ /**
+ * Sets Ignite instance name.
+ *
+ * @param igniteInstanceName Ignite instance name.
+ */
+ public void setIgniteInstanceName(String igniteInstanceName) {
+ this.igniteInstanceName = igniteInstanceName;
}
/**
@@ -326,7 +348,7 @@ public class SpringTransactionManager extends AbstractPlatformTransactionManager
throw new IllegalArgumentException("Both 'configurationPath' and 'configuration' are " +
"provided. Set only one of these properties if you need to start a Ignite node inside of " +
"SpringCacheManager. If you already have a node running, omit both of them and set" +
- "'gridName' property.");
+ "'igniteInstanceName' property.");
}
if (cfgPath != null)
@@ -334,7 +356,7 @@ public class SpringTransactionManager extends AbstractPlatformTransactionManager
else if (cfg != null)
ignite = IgniteSpring.start(cfg, springCtx);
else
- ignite = Ignition.ignite(gridName);
+ ignite = Ignition.ignite(igniteInstanceName);
if (transactionConcurrency == null)
transactionConcurrency = ignite.configuration().getTransactionConfiguration().getDefaultTxConcurrency();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml b/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml
index bfb109c..b183314 100644
--- a/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml
+++ b/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml
@@ -27,7 +27,7 @@
<bean class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
- <property name="gridName" value="test-cluster"/>
+ <property name="igniteInstanceName" value="test-cluster"/>
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/config/jdbc-pojo-store-obj.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/config/jdbc-pojo-store-obj.xml b/modules/spring/src/test/config/jdbc-pojo-store-obj.xml
index 40a14dc..f06f407 100644
--- a/modules/spring/src/test/config/jdbc-pojo-store-obj.xml
+++ b/modules/spring/src/test/config/jdbc-pojo-store-obj.xml
@@ -27,7 +27,7 @@
<bean class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
- <property name="gridName" value="test-cluster"/>
+ <property name="igniteInstanceName" value="test-cluster"/>
<property name="discoverySpi">
<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/config/node1.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/config/node1.xml b/modules/spring/src/test/config/node1.xml
index 814736a..e5685e2 100644
--- a/modules/spring/src/test/config/node1.xml
+++ b/modules/spring/src/test/config/node1.xml
@@ -27,7 +27,7 @@
<bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
- <property name="gridName" value="ignite1"/>
+ <property name="igniteInstanceName" value="ignite1"/>
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
<property name="discoverySpi">
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/config/store-cache1.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/config/store-cache1.xml b/modules/spring/src/test/config/store-cache1.xml
index 46eef3f..b799550 100644
--- a/modules/spring/src/test/config/store-cache1.xml
+++ b/modules/spring/src/test/config/store-cache1.xml
@@ -28,7 +28,7 @@
<bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1"/>
- <property name="gridName" value="ignite1"/>
+ <property name="igniteInstanceName" value="ignite1"/>
<property name="cacheConfiguration">
<list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/config/ignite-test-config.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/config/ignite-test-config.xml b/modules/spring/src/test/java/config/ignite-test-config.xml
index 145d124..58ee5a3 100644
--- a/modules/spring/src/test/java/config/ignite-test-config.xml
+++ b/modules/spring/src/test/java/config/ignite-test-config.xml
@@ -27,7 +27,7 @@
<bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
<property name="localHost" value="127.0.0.1" />
- <property name="gridName" value="config-in-classpath"/>
+ <property name="igniteInstanceName" value="config-in-classpath"/>
<!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
<property name="discoverySpi">
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/config/spring-transactions.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/config/spring-transactions.xml b/modules/spring/src/test/java/config/spring-transactions.xml
index 392bd84..f40e880 100644
--- a/modules/spring/src/test/java/config/spring-transactions.xml
+++ b/modules/spring/src/test/java/config/spring-transactions.xml
@@ -33,6 +33,6 @@
<bean id="transactionManager" class="org.apache.ignite.transactions.spring.SpringTransactionManager">
<property name="transactionConcurrency" value="OPTIMISTIC"/>
- <property name="gridName" value="testGrid"/>
+ <property name="igniteInstanceName" value="testGrid"/>
</bean>
</beans>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
index 601401c..158f898 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
@@ -63,8 +63,8 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest {
private GridSpringDynamicCacheTestService dynamicSvc;
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
CacheConfiguration cache = new CacheConfiguration();
@@ -82,7 +82,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public String getTestGridName() {
+ @Override public String getTestIgniteInstanceName() {
return "testGrid";
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheManagerContextInjectionTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheManagerContextInjectionTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheManagerContextInjectionTest.java
index 0a898b6..482c837 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheManagerContextInjectionTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheManagerContextInjectionTest.java
@@ -99,7 +99,7 @@ public class SpringCacheManagerContextInjectionTest extends GridCommonAbstractTe
cfg.setLocalHost("127.0.0.1");
- cfg.setGridName("scmt");
+ cfg.setIgniteInstanceName("scmt");
cfg.setLifecycleBeans(bean1(), bean2());
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/cache/spring/spring-caching.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/spring-caching.xml b/modules/spring/src/test/java/org/apache/ignite/cache/spring/spring-caching.xml
index 355f6e0..f232275 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/spring-caching.xml
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/spring-caching.xml
@@ -37,7 +37,7 @@
Cache manager.
-->
<bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager">
- <property name="gridName" value="testGrid"/>
+ <property name="igniteInstanceName" value="testGrid"/>
<property name="dynamicCacheConfiguration">
<bean class="org.apache.ignite.configuration.CacheConfiguration">
<property name="backups" value="2"/>
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CachePojoStoreXmlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CachePojoStoreXmlSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CachePojoStoreXmlSelfTest.java
index 7de0cfe..637fe60 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CachePojoStoreXmlSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/store/jdbc/CachePojoStoreXmlSelfTest.java
@@ -30,7 +30,7 @@ import org.apache.ignite.marshaller.Marshaller;
*/
public class CachePojoStoreXmlSelfTest extends CacheJdbcPojoStoreAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
String path = builtinKeys
? "modules/spring/src/test/config/jdbc-pojo-store-builtin.xml"
: "modules/spring/src/test/config/jdbc-pojo-store-obj.xml";
@@ -46,7 +46,7 @@ public class CachePojoStoreXmlSelfTest extends CacheJdbcPojoStoreAbstractSelfTes
((CacheJdbcPojoStoreFactory)ccfg.getCacheStoreFactory()).setSqlEscapeAll(true);
}
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index bb00661..7764d46 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -114,8 +114,8 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
@@ -167,7 +167,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
*/
public void testStartGridWithConfigUrlString() throws Exception {
GridEmbeddedHttpServer srv = null;
- String gridName = "grid_with_url_config";
+ String igniteInstanceName = "grid_with_url_config";
try {
srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(null,
@@ -175,13 +175,13 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
Ignite ignite = G.start(srv.getBaseUrl());
- assert gridName.equals(ignite.name()) : "Unexpected grid name: " + ignite.name();
+ assert igniteInstanceName.equals(ignite.name()) : "Unexpected Ignite instance name: " + ignite.name();
}
finally {
if (srv != null)
srv.stop(1);
- G.stop(gridName, false);
+ G.stop(igniteInstanceName, false);
}
}
@@ -190,7 +190,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
*/
public void testStartGridWithConfigUrl() throws Exception {
GridEmbeddedHttpServer srv = null;
- String gridName = "grid_with_url_config";
+ String igniteInstanceName = "grid_with_url_config";
try {
srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(null,
@@ -198,13 +198,13 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
Ignite ignite = G.start(new URL(srv.getBaseUrl()));
- assert gridName.equals(ignite.name()) : "Unexpected grid name: " + ignite.name();
+ assert igniteInstanceName.equals(ignite.name()) : "Unexpected Ignite instance name: " + ignite.name();
}
finally {
if (srv != null)
srv.stop(1);
- G.stop(gridName, false);
+ G.stop(igniteInstanceName, false);
}
}
@@ -293,78 +293,78 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testLifecycleBeansNullGridName() throws Exception {
+ public void testLifecycleBeansNullIgniteInstanceName() throws Exception {
checkLifecycleBeans(null);
}
/**
* @throws Exception If failed.
*/
- public void testLifecycleBeansNotNullGridName() throws Exception {
+ public void testLifecycleBeansNotNullIgniteInstanceName() throws Exception {
checkLifecycleBeans("testGrid");
}
/**
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @throws Exception If test failed.
*/
- private void checkLifecycleBeans(@Nullable String gridName) throws Exception {
+ private void checkLifecycleBeans(@Nullable String igniteInstanceName) throws Exception {
TestLifecycleBean bean1 = new TestLifecycleBean();
TestLifecycleBean bean2 = new TestLifecycleBean();
IgniteConfiguration cfg = new IgniteConfiguration();
cfg.setLifecycleBeans(bean1, bean2);
- cfg.setGridName(gridName);
+ cfg.setIgniteInstanceName(igniteInstanceName);
cfg.setConnectorConfiguration(null);
try (Ignite g = IgniteSpring.start(cfg, new GenericApplicationContext())) {
- bean1.checkState(gridName, true);
- bean2.checkState(gridName, true);
+ bean1.checkState(igniteInstanceName, true);
+ bean2.checkState(igniteInstanceName, true);
}
- bean1.checkState(gridName, false);
- bean2.checkState(gridName, false);
+ bean1.checkState(igniteInstanceName, false);
+ bean2.checkState(igniteInstanceName, false);
- checkLifecycleBean(bean1, gridName);
- checkLifecycleBean(bean2, gridName);
+ checkLifecycleBean(bean1, igniteInstanceName);
+ checkLifecycleBean(bean2, igniteInstanceName);
}
/**
* @param bean Bean to check.
- * @param gridName Grid name to check for.
+ * @param igniteInstanceName Ignite instance name to check for.
*/
- private void checkLifecycleBean(TestLifecycleBean bean, String gridName) {
+ private void checkLifecycleBean(TestLifecycleBean bean, String igniteInstanceName) {
bean.checkErrors();
List<LifecycleEventType> evts = bean.getLifecycleEvents();
- List<String> gridNames = bean.getGridNames();
+ List<String> igniteInstanceNames = bean.getIgniteInstanceNames();
assert evts.get(0) == LifecycleEventType.BEFORE_NODE_START : "Invalid lifecycle event: " + evts.get(0);
assert evts.get(1) == LifecycleEventType.AFTER_NODE_START : "Invalid lifecycle event: " + evts.get(1);
assert evts.get(2) == LifecycleEventType.BEFORE_NODE_STOP : "Invalid lifecycle event: " + evts.get(2);
assert evts.get(3) == LifecycleEventType.AFTER_NODE_STOP : "Invalid lifecycle event: " + evts.get(3);
- checkGridNameEquals(gridNames.get(0), gridName);
- checkGridNameEquals(gridNames.get(1), gridName);
- checkGridNameEquals(gridNames.get(2), gridName);
- checkGridNameEquals(gridNames.get(3), gridName);
+ checkIgniteInstanceNameEquals(igniteInstanceNames.get(0), igniteInstanceName);
+ checkIgniteInstanceNameEquals(igniteInstanceNames.get(1), igniteInstanceName);
+ checkIgniteInstanceNameEquals(igniteInstanceNames.get(2), igniteInstanceName);
+ checkIgniteInstanceNameEquals(igniteInstanceNames.get(3), igniteInstanceName);
}
/**
* @param n1 First name.
* @param n2 Second name.
*/
- private void checkGridNameEquals(String n1, String n2) {
+ private void checkIgniteInstanceNameEquals(String n1, String n2) {
if (n1 == null) {
assert n2 == null;
return;
}
- assert n1.equals(n2) : "Invalid grid names [name1=" + n1 + ", name2=" + n2 + ']';
+ assert n1.equals(n2) : "Invalid Ignite instance names [name1=" + n1 + ", name2=" + n2 + ']';
}
/**
@@ -470,7 +470,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
try {
IgniteConfiguration cfg = new IgniteConfiguration();
- cfg.setGridName("TEST_NAME");
+ cfg.setIgniteInstanceName("TEST_NAME");
cfg.setConnectorConfiguration(null);
G.start(cfg);
@@ -512,17 +512,17 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/**
- * @param gridName Grid name ({@code null} for default grid).
+ * @param igniteInstanceName Ignite instance name ({@code null} for default grid).
* @throws Exception If failed.
*/
- private void checkConcurrentStartStop(@Nullable final String gridName) throws Exception {
+ private void checkConcurrentStartStop(@Nullable final String igniteInstanceName) throws Exception {
final AtomicInteger startedCnt = new AtomicInteger();
final AtomicInteger stoppedCnt = new AtomicInteger();
IgnitionListener lsnr = new IgnitionListener() {
@SuppressWarnings("StringEquality")
@Override public void onStateChange(@Nullable String name, IgniteState state) {
- assert name == gridName;
+ assert name == igniteInstanceName;
info("On state change fired: " + state);
@@ -546,7 +546,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
@Nullable @Override public Object call() throws Exception {
for (int i = 0; i < iterCnt; i++) {
try {
- IgniteConfiguration cfg = getConfiguration(gridName);
+ IgniteConfiguration cfg = getConfiguration(igniteInstanceName);
G.start(cfg);
}
@@ -561,7 +561,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
throw e; // Unexpected exception.
}
finally {
- stopGrid(gridName);
+ stopGrid(igniteInstanceName);
}
}
@@ -599,7 +599,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
cfg.setConnectorConfiguration(null);
cfg.setDiscoverySpi(new TcpDiscoverySpi() {
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
throw new IgniteSpiException("This SPI will never start.");
}
});
@@ -628,38 +628,38 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
G.start(cfg1);
- assert G.state(cfg1.getGridName()) == STARTED;
- assert G.state(getTestGridName() + '1') == STOPPED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STARTED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STOPPED;
- G.stop(cfg1.getGridName(), false);
+ G.stop(cfg1.getIgniteInstanceName(), false);
- assert G.state(cfg1.getGridName()) == STOPPED;
- assert G.state(getTestGridName() + '1') == STOPPED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STOPPED;
- cfg2.setGridName(getTestGridName() + '1');
+ cfg2.setIgniteInstanceName(getTestIgniteInstanceName() + '1');
G.start(cfg2);
- assert G.state(cfg1.getGridName()) == STOPPED;
- assert G.state(getTestGridName() + '1') == STARTED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STARTED;
- G.stop(getTestGridName() + '1', false);
+ G.stop(getTestIgniteInstanceName() + '1', false);
- assert G.state(cfg1.getGridName()) == STOPPED;
- assert G.state(getTestGridName() + '1') == STOPPED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STOPPED;
- cfg2.setGridName(getTestGridName() + '1');
+ cfg2.setIgniteInstanceName(getTestIgniteInstanceName() + '1');
G.start(cfg2);
- assert G.state(getTestGridName() + '1') == STARTED;
- assert G.state(getTestGridName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STARTED;
+ assert G.state(getTestIgniteInstanceName()) == STOPPED;
- G.stop(getTestGridName() + '1', false);
- G.stop(getTestGridName(), false);
+ G.stop(getTestIgniteInstanceName() + '1', false);
+ G.stop(getTestIgniteInstanceName(), false);
- assert G.state(getTestGridName() + '1') == STOPPED;
- assert G.state(getTestGridName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STOPPED;
+ assert G.state(getTestIgniteInstanceName()) == STOPPED;
}
/**
@@ -674,27 +674,27 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
cfg2.setCollisionSpi(new TestMultipleInstancesCollisionSpi());
cfg3.setCollisionSpi(new TestMultipleInstancesCollisionSpi());
- cfg2.setGridName(getTestGridName() + '1');
+ cfg2.setIgniteInstanceName(getTestIgniteInstanceName() + '1');
G.start(cfg2);
G.start(cfg1);
- cfg3.setGridName(getTestGridName() + '2');
+ cfg3.setIgniteInstanceName(getTestIgniteInstanceName() + '2');
G.start(cfg3);
- assert G.state(cfg1.getGridName()) == STARTED;
- assert G.state(getTestGridName() + '1') == STARTED;
- assert G.state(getTestGridName() + '2') == STARTED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STARTED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STARTED;
+ assert G.state(getTestIgniteInstanceName() + '2') == STARTED;
- G.stop(getTestGridName() + '2', false);
- G.stop(cfg1.getGridName(), false);
- G.stop(getTestGridName() + '1', false);
+ G.stop(getTestIgniteInstanceName() + '2', false);
+ G.stop(cfg1.getIgniteInstanceName(), false);
+ G.stop(getTestIgniteInstanceName() + '1', false);
- assert G.state(cfg1.getGridName()) == STOPPED;
- assert G.state(getTestGridName() + '1') == STOPPED;
- assert G.state(getTestGridName() + '2') == STOPPED;
+ assert G.state(cfg1.getIgniteInstanceName()) == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '1') == STOPPED;
+ assert G.state(getTestIgniteInstanceName() + '2') == STOPPED;
}
/**
@@ -741,7 +741,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
@@ -779,7 +779,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void spiStart(String gridName) throws IgniteSpiException {
+ @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException {
// Start SPI start stopwatch.
startStopwatch();
@@ -820,8 +820,8 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
/** Lifecycle events. */
private final List<LifecycleEventType> evts = new ArrayList<>();
- /** Grid names. */
- private final List<String> gridNames = new ArrayList<>();
+ /** Ignite instance names. */
+ private final List<String> igniteInstanceNames = new ArrayList<>();
/** */
private final AtomicReference<Throwable> err = new AtomicReference<>();
@@ -830,7 +830,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
@Override public void onLifecycleEvent(LifecycleEventType evt) {
evts.add(evt);
- gridNames.add(ignite.name());
+ igniteInstanceNames.add(ignite.name());
try {
checkState(ignite.name(),
@@ -846,18 +846,18 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
/**
* Checks state of the bean.
*
- * @param gridName Grid name.
+ * @param igniteInstanceName Ignite instance name.
* @param exec Try to execute something on the grid.
*/
- void checkState(String gridName, boolean exec) {
+ void checkState(String igniteInstanceName, boolean exec) {
assert log != null;
assert appCtx != null;
- assert F.eq(gridName, ignite.name());
+ assert F.eq(igniteInstanceName, ignite.name());
if (exec)
// Execute any grid method.
- G.ignite(gridName).events().localQuery(F.<Event>alwaysTrue());
+ G.ignite(igniteInstanceName).events().localQuery(F.<Event>alwaysTrue());
}
/**
@@ -870,12 +870,12 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/**
- * Gets ordered list of grid names.
+ * Gets ordered list of Ignite instance names.
*
- * @return Ordered list of grid names.
+ * @return Ordered list of Ignite instance names.
*/
- List<String> getGridNames() {
- return gridNames;
+ List<String> getIgniteInstanceNames() {
+ return igniteInstanceNames;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
index cbe35bd..390a528 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
@@ -71,7 +71,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest
cfg.setConnectorConfiguration(null);
- cfg.setGridName(getTestGridName());
+ cfg.setIgniteInstanceName(getTestIgniteInstanceName());
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
index 6131193..ff23dc8 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
@@ -69,8 +69,8 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest {
/**
* {@inheritDoc}
*/
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setUserAttributes(F.asMap(TEST_ATTRIBUTE_NAME, testAttribute));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
index b989ac8..e70b49e 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
@@ -88,7 +88,7 @@ public class GridSpringResourceInjectionSelfTest extends GridCommonAbstractTest
*/
public void testClosureFieldByResourceClassWithMultipleBeans() throws Exception {
IgniteConfiguration anotherCfg = new IgniteConfiguration();
- anotherCfg.setGridName("anotherGrid");
+ anotherCfg.setIgniteInstanceName("anotherGrid");
Ignite anotherGrid = IgniteSpring.start(anotherCfg, new ClassPathXmlApplicationContext(
"/org/apache/ignite/internal/processors/resource/spring-resource-with-duplicate-beans.xml"));
@@ -226,7 +226,7 @@ public class GridSpringResourceInjectionSelfTest extends GridCommonAbstractTest
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
public void testClosureMethodWithResourceClassWithMultipleBeans() throws Exception {
IgniteConfiguration anotherCfg = new IgniteConfiguration();
- anotherCfg.setGridName("anotherGrid");
+ anotherCfg.setIgniteInstanceName("anotherGrid");
Ignite anotherGrid = IgniteSpring.start(anotherCfg, new ClassPathXmlApplicationContext(
"/org/apache/ignite/internal/processors/resource/spring-resource-with-duplicate-beans.xml"));
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridTransformSpringInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridTransformSpringInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridTransformSpringInjectionSelfTest.java
index cc61514..09ff15c 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridTransformSpringInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridTransformSpringInjectionSelfTest.java
@@ -53,7 +53,7 @@ public class GridTransformSpringInjectionSelfTest extends GridCacheAbstractSelfT
/** {@inheritDoc} */
@Override public void beforeTestsStarted() throws Exception {
- IgniteSpring.start(getConfiguration(getTestGridName(0)),
+ IgniteSpring.start(getConfiguration(getTestIgniteInstanceName(0)),
new ClassPathXmlApplicationContext("/org/apache/ignite/internal/processors/resource/spring-resource.xml"));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
index 0b32b04..dbc5b25 100644
--- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
@@ -89,8 +89,8 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
cfg.setDeploymentMode(depMode);
cfg.setNetworkTimeout(10000);
@@ -101,7 +101,7 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
cfg.setDiscoverySpi(discoSpi);
- if (gridName.contains("testCacheRedeployVersionChangeContinuousMode")) {
+ if (igniteInstanceName.contains("testCacheRedeployVersionChangeContinuousMode")) {
CacheConfiguration cacheCfg = new CacheConfiguration();
cacheCfg.setCacheMode(CacheMode.REPLICATED);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml b/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml
index 7401986..14072ff 100644
--- a/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml
+++ b/modules/spring/src/test/java/org/apache/ignite/spring-injection-test.xml
@@ -38,6 +38,6 @@
<property name="localHost" value="127.0.0.1"/>
- <property name="gridName" value="springInjectionTest"/>
+ <property name="igniteInstanceName" value="springInjectionTest"/>
</bean>
</beans>