http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java index 82bc015..7afaaee 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java @@ -299,7 +299,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa } /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { startStopwatch(); assertParameter(probe != null, "loadProbe != null"); @@ -307,7 +307,7 @@ public class AdaptiveLoadBalancingSpi extends IgniteSpiAdapter implements LoadBa if (log.isDebugEnabled()) log.debug(configInfo("loadProbe", probe)); - registerMBean(gridName, this, AdaptiveLoadBalancingSpiMBean.class); + registerMBean(igniteInstanceName, this, AdaptiveLoadBalancingSpiMBean.class); // Ack ok start. if (log.isDebugEnabled())
http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java index b0e2c78..40af99a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java @@ -230,13 +230,13 @@ public class RoundRobinLoadBalancingSpi extends IgniteSpiAdapter implements Load } /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { startStopwatch(); if (log.isDebugEnabled()) log.debug(configInfo("isPerTask", isPerTask)); - registerMBean(gridName, this, RoundRobinLoadBalancingSpiMBean.class); + registerMBean(igniteInstanceName, this, RoundRobinLoadBalancingSpiMBean.class); balancer = new RoundRobinGlobalLoadBalancer(log); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java index 1f69b52..6e67b80 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java @@ -250,7 +250,7 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements } /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { startStopwatch(); assertParameter(nodeWeight > 0, "nodeWeight > 0"); @@ -260,7 +260,7 @@ public class WeightedRandomLoadBalancingSpi extends IgniteSpiAdapter implements log.debug(configInfo("nodeWeight", nodeWeight)); } - registerMBean(gridName, this, WeightedRandomLoadBalancingSpiMBean.class); + registerMBean(igniteInstanceName, this, WeightedRandomLoadBalancingSpiMBean.class); // Ack ok start. if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java index e277868..142b31a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java @@ -270,7 +270,7 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi, } /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { assertParameter(!F.isEmpty(baseDir), "!F.isEmpty(baseDir)"); assertParameter(maxSparsity >= 0 && maxSparsity < 1, "maxSparsity >= 0 && maxSparsity < 1"); assertParameter(readStripesNum == -1 || (readStripesNum & (readStripesNum - 1)) == 0, @@ -294,9 +294,9 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi, startStopwatch(); - registerMBean(gridName, this, FileSwapSpaceSpiMBean.class); + registerMBean(igniteInstanceName, this, FileSwapSpaceSpiMBean.class); - String path = baseDir + File.separator + gridName + File.separator + ignite.configuration().getNodeId(); + String path = baseDir + File.separator + igniteInstanceName + File.separator + ignite.configuration().getNodeId(); try { dir = U.resolveWorkDirectory(ignite.configuration().getWorkDirectory(), path, true); @@ -1521,7 +1521,7 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi, final Object mux = new Object(); - writer = new IgniteSpiThread(gridName, "Swap writer: " + name, log) { + writer = new IgniteSpiThread(igniteInstanceName, "Swap writer: " + name, log) { @Override protected void body() throws InterruptedException { while (!isInterrupted()) { SwapValues vals = que.take(); @@ -1540,7 +1540,7 @@ public class FileSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi, } }; - compactor = new IgniteSpiThread(gridName, "Swap compactor: " + name, log) { + compactor = new IgniteSpiThread(igniteInstanceName, "Swap compactor: " + name, log) { @Override protected void body() throws InterruptedException { SwapFile w = null; SwapFile c = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java index df73eb0..a3649b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/noop/NoopSwapSpaceSpi.java @@ -52,7 +52,7 @@ public class NoopSwapSpaceSpi extends IgniteSpiAdapter implements SwapSpaceSpi { private IgniteLogger log; /** {@inheritDoc} */ - @Override public void spiStart(@Nullable String gridName) throws IgniteSpiException { + @Override public void spiStart(@Nullable String igniteInstanceName) throws IgniteSpiException { U.warn(log, "Swap space is disabled. To enable use FileSwapSpaceSpi."); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 270a5c6..3c54fe4 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -225,7 +225,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> cfg0.setGridLogger(new NullLogger()); - cfg0.setGridName("ignite-warmup-grid-" + i); + cfg0.setIgniteInstanceName("ignite-warmup-grid-" + i); ignites.add(Ignition.start(cfg0)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java index 043d651..9b05071 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java @@ -296,10 +296,10 @@ public final class CommandLineStartup { } // Name of the grid loaded from the command line (unique in JVM). - final String gridName; + final String igniteInstanceName; try { - gridName = G.start(cfg).name(); + igniteInstanceName = G.start(cfg).name(); } catch (Throwable e) { e.printStackTrace(); @@ -323,7 +323,7 @@ public final class CommandLineStartup { G.addListener(new IgnitionListener() { @Override public void onStateChange(String name, IgniteState state) { // Skip all grids except loaded from the command line. - if (!F.eq(gridName, name)) + if (!F.eq(igniteInstanceName, name)) return; if (state == STOPPED || state == STOPPED_ON_SEGMENTATION) http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java b/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java index 69f664f..d2a1d04 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/StreamVisitor.java @@ -28,7 +28,7 @@ import org.apache.ignite.lang.IgniteBiInClosure; * does not update the cache. If the tuple needs to be stored in the cache, * then {@code cache.put(...)} should be called explicitly. */ -public abstract class StreamVisitor<K, V> implements StreamReceiver<K, V>, IgniteBiInClosure<IgniteCache<K, V>, Map.Entry<K, V>> { +public abstract class StreamVisitor<K, V> implements StreamReceiver<K, V>, IgniteBiInClosure<IgniteCache<K, V>, Map.Entry<K, V>> { /** */ private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java index 127778b..f45423b 100644 --- a/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java +++ b/modules/core/src/main/java/org/apache/ignite/stream/socket/SocketStreamer.java @@ -224,10 +224,10 @@ public class SocketStreamer<T, K, V> extends StreamAdapter<T, K, V> { /** * Constructor. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. */ - private DefaultConverter(@Nullable String gridName) { - marsh = MarshallerUtils.jdkMarshaller(gridName); + private DefaultConverter(@Nullable String igniteInstanceName) { + marsh = MarshallerUtils.jdkMarshaller(igniteInstanceName); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java index 9f7c381..3cd7484 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java @@ -42,13 +42,13 @@ public class IgniteStripedThreadPoolExecutor implements ExecutorService { * Create striped thread pool. * * @param concurrentLvl Concurrency level. - * @param gridName Node name. + * @param igniteInstanceName Node name. * @param threadNamePrefix Thread name prefix. */ - public IgniteStripedThreadPoolExecutor(int concurrentLvl, String gridName, String threadNamePrefix) { + public IgniteStripedThreadPoolExecutor(int concurrentLvl, String igniteInstanceName, String threadNamePrefix) { execs = new ExecutorService[concurrentLvl]; - ThreadFactory factory = new IgniteThreadFactory(gridName, threadNamePrefix); + ThreadFactory factory = new IgniteThreadFactory(igniteInstanceName, threadNamePrefix); for (int i = 0; i < concurrentLvl; i++) execs[i] = Executors.newSingleThreadExecutor(factory); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java index 0f987e1..8d88876 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java @@ -43,8 +43,8 @@ public class IgniteThread extends Thread { /** Number of all grid threads in the system. */ private static final AtomicLong cntr = new AtomicLong(); - /** The name of the grid this thread belongs to. */ - protected final String gridName; + /** The name of the Ignite instance this thread belongs to. */ + protected final String igniteInstanceName; /** Group index. */ private final int grpIdx; @@ -58,60 +58,60 @@ public class IgniteThread extends Thread { * @param worker Runnable to create thread with. */ public IgniteThread(GridWorker worker) { - this(DFLT_GRP, worker.gridName(), worker.name(), worker, GRP_IDX_UNASSIGNED); + this(DFLT_GRP, worker.igniteInstanceName(), worker.name(), worker, GRP_IDX_UNASSIGNED); } /** - * Creates grid thread with given name for a given grid. + * Creates grid thread with given name for a given Ignite instance. * - * @param gridName Name of grid this thread is created for. + * @param igniteInstanceName Name of the Ignite instance this thread is created for. * @param threadName Name of thread. * @param r Runnable to execute. */ - public IgniteThread(String gridName, String threadName, Runnable r) { - this(gridName, threadName, r, GRP_IDX_UNASSIGNED); + public IgniteThread(String igniteInstanceName, String threadName, Runnable r) { + this(igniteInstanceName, threadName, r, GRP_IDX_UNASSIGNED); } /** - * Creates grid thread with given name for a given grid. + * Creates grid thread with given name for a given Ignite instance. * - * @param gridName Name of grid this thread is created for. + * @param igniteInstanceName Name of the Ignite instance this thread is created for. * @param threadName Name of thread. * @param r Runnable to execute. * @param grpIdx Index within a group. */ - public IgniteThread(String gridName, String threadName, Runnable r, int grpIdx) { - this(DFLT_GRP, gridName, threadName, r, grpIdx); + public IgniteThread(String igniteInstanceName, String threadName, Runnable r, int grpIdx) { + this(DFLT_GRP, igniteInstanceName, threadName, r, grpIdx); } /** - * Creates grid thread with given name for a given grid with specified + * Creates grid thread with given name for a given Ignite instance with specified * thread group. * * @param grp Thread group. - * @param gridName Name of grid this thread is created for. + * @param igniteInstanceName Name of the Ignite instance this thread is created for. * @param threadName Name of thread. * @param r Runnable to execute. * @param grpIdx Thread index within a group. */ - public IgniteThread(ThreadGroup grp, String gridName, String threadName, Runnable r, int grpIdx) { - super(grp, r, createName(cntr.incrementAndGet(), threadName, gridName)); + public IgniteThread(ThreadGroup grp, String igniteInstanceName, String threadName, Runnable r, int grpIdx) { + super(grp, r, createName(cntr.incrementAndGet(), threadName, igniteInstanceName)); A.ensure(grpIdx >= -1, "grpIdx >= -1"); - this.gridName = gridName; + this.igniteInstanceName = igniteInstanceName; this.grpIdx = compositeRwLockIdx = grpIdx; } /** - * @param gridName Name of grid this thread is created for. + * @param igniteInstanceName Name of the Ignite instance this thread is created for. * @param threadGrp Thread group. * @param threadName Name of thread. */ - protected IgniteThread(String gridName, ThreadGroup threadGrp, String threadName) { + protected IgniteThread(String igniteInstanceName, ThreadGroup threadGrp, String threadName) { super(threadGrp, threadName); - this.gridName = gridName; + this.igniteInstanceName = igniteInstanceName; this.grpIdx = compositeRwLockIdx = GRP_IDX_UNASSIGNED; } @@ -119,9 +119,20 @@ public class IgniteThread extends Thread { * Gets name of the grid this thread belongs to. * * @return Name of the grid this thread belongs to. + * @deprecated use {@link #getIgniteInstanceName()} */ + @Deprecated public String getGridName() { - return gridName; + return getIgniteInstanceName(); + } + + /** + * Gets name of the Ignite instance this thread belongs to. + * + * @return Name of the Ignite instance this thread belongs to. + */ + public String getIgniteInstanceName() { + return igniteInstanceName; } /** @@ -150,11 +161,11 @@ public class IgniteThread extends Thread { * * @param num Thread number. * @param threadName Thread name. - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @return New thread name. */ - protected static String createName(long num, String threadName, String gridName) { - return threadName + "-#" + num + '%' + gridName + '%'; + protected static String createName(long num, String threadName, String igniteInstanceName) { + return threadName + "-#" + num + '%' + igniteInstanceName + '%'; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java index d173594..119ef70 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadFactory.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.NotNull; * for creating grid threads. */ public class IgniteThreadFactory implements ThreadFactory { - /** Grid name. */ - private final String gridName; + /** Ignite instance name. */ + private final String igniteInstanceName; /** Thread name. */ private final String threadName; @@ -41,27 +41,27 @@ public class IgniteThreadFactory implements ThreadFactory { * Constructs new thread factory for given grid. All threads will belong * to the same default thread group. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. */ - public IgniteThreadFactory(String gridName) { - this(gridName, "ignite"); + public IgniteThreadFactory(String igniteInstanceName) { + this(igniteInstanceName, "ignite"); } /** * Constructs new thread factory for given grid. All threads will belong * to the same default thread group. * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param threadName Thread name. */ - public IgniteThreadFactory(String gridName, String threadName) { - this.gridName = gridName; + public IgniteThreadFactory(String igniteInstanceName, String threadName) { + this.igniteInstanceName = igniteInstanceName; this.threadName = threadName; } /** {@inheritDoc} */ @Override public Thread newThread(@NotNull Runnable r) { - return new IgniteThread(gridName, threadName, r, idxGen.incrementAndGet()); + return new IgniteThread(igniteInstanceName, threadName, r, idxGen.incrementAndGet()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java index 940e1a3..8002aaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThreadPoolExecutor.java @@ -150,15 +150,15 @@ public class IgniteThreadPoolExecutor extends ThreadPoolExecutor { * </tr> * </table> * - * @param gridName Name of the grid. + * @param igniteInstanceName Name of the grid. */ - public IgniteThreadPoolExecutor(String gridName) { + public IgniteThreadPoolExecutor(String igniteInstanceName) { this( DFLT_CORE_POOL_SIZE, DFLT_CORE_POOL_SIZE, 0, new LinkedBlockingDeque<Runnable>(), - new IgniteThreadFactory(gridName), + new IgniteThreadFactory(igniteInstanceName), null ); } @@ -167,7 +167,7 @@ public class IgniteThreadPoolExecutor extends ThreadPoolExecutor { * Creates a new service with the given initial parameters. * * @param threadNamePrefix Will be added at the beginning of all created threads. - * @param gridName Must be the name of the grid. + * @param igniteInstanceName Must be the name of the grid. * @param corePoolSize The number of threads to keep in the pool, even if they are idle. * @param maxPoolSize The maximum number of threads to allow in the pool. * @param keepAliveTime When the number of threads is greater than the core, this is the maximum time @@ -177,7 +177,7 @@ public class IgniteThreadPoolExecutor extends ThreadPoolExecutor { */ public IgniteThreadPoolExecutor( String threadNamePrefix, - String gridName, + String igniteInstanceName, int corePoolSize, int maxPoolSize, long keepAliveTime, @@ -188,7 +188,7 @@ public class IgniteThreadPoolExecutor extends ThreadPoolExecutor { keepAliveTime, TimeUnit.MILLISECONDS, workQ, - new IgniteThreadFactory(gridName, threadNamePrefix) + new IgniteThreadFactory(igniteInstanceName, threadNamePrefix) ); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/default-spring-url-testing.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/default-spring-url-testing.xml b/modules/core/src/test/config/default-spring-url-testing.xml index 5d63b7f..0d3efbd 100644 --- a/modules/core/src/test/config/default-spring-url-testing.xml +++ b/modules/core/src/test/config/default-spring-url-testing.xml @@ -36,7 +36,7 @@ <!-- Specify grid instance name. --> - <property name="gridName" value="grid_with_url_config"/> + <property name="igniteInstanceName" value="grid_with_url_config"/> <property name="connectorConfiguration"><null/></property> </bean> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index 4b11875..c57b5e0 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -28,7 +28,7 @@ </description> <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="gridName" value="dsi"/> + <property name="igniteInstanceName" value="dsi"/> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml index 69bdc03..af4792a 100644 --- a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml +++ b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml @@ -29,7 +29,7 @@ Grid configuration. --> <bean id="grid.cfg.1" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> - <property name="gridName" value="grid-factory-test-1"/> + <property name="igniteInstanceName" value="grid-factory-test-1"/> <property name="connectorConfiguration"><null/></property> @@ -46,7 +46,7 @@ </bean> <bean id="grid.cfg.2" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> - <property name="gridName" value="grid-factory-test-2"/> + <property name="igniteInstanceName" value="grid-factory-test-2"/> <property name="connectorConfiguration"><null/></property> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/loaders/grid-cfg.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/loaders/grid-cfg.xml b/modules/core/src/test/config/loaders/grid-cfg.xml index 627755d..3966baf 100644 --- a/modules/core/src/test/config/loaders/grid-cfg.xml +++ b/modules/core/src/test/config/loaders/grid-cfg.xml @@ -46,7 +46,7 @@ </bean> <bean id="grid.cfg.2" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> - <property name="gridName" value="gridName2"/> + <property name="igniteInstanceName" value="gridName2"/> <property name="connectorConfiguration"><null/></property> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/websession/example-cache-client.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache-client.xml b/modules/core/src/test/config/websession/example-cache-client.xml index 9272e14..5ec9b5b 100644 --- a/modules/core/src/test/config/websession/example-cache-client.xml +++ b/modules/core/src/test/config/websession/example-cache-client.xml @@ -27,7 +27,7 @@ <bean parent="ignite.cfg"> <property name="clientMode" value="true"/> - <property name="gridName" value="client"/> + <property name="igniteInstanceName" value="client"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/websession/example-cache2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache2.xml b/modules/core/src/test/config/websession/example-cache2.xml index 59a244f..f6ec921 100644 --- a/modules/core/src/test/config/websession/example-cache2.xml +++ b/modules/core/src/test/config/websession/example-cache2.xml @@ -25,7 +25,7 @@ <import resource="example-cache-base.xml"/> <bean parent="ignite.cfg"> - <property name="gridName" value="grid2"/> + <property name="igniteInstanceName" value="grid2"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml index 0cebc76..9d049fa 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -23,7 +23,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="gridName" value="grid-1"/> + <property name="igniteInstanceName" value="grid-1"/> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml index 0dc4855..7545ec7 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -23,7 +23,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="gridName" value="grid-2"/> + <property name="igniteInstanceName" value="grid-2"/> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml index 40674e8..a0fb189 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -23,7 +23,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="gridName" value="grid-3"/> + <property name="igniteInstanceName" value="grid-3"/> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java index 3b4f033..ada9477 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java @@ -48,8 +48,8 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { private int nodesCnt = 5; /** {@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(ipFinder); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java index 5b08f62..26dc2dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java @@ -56,8 +56,8 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { } /** {@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 cache0 = cacheConfiguration(null); @@ -69,7 +69,7 @@ public class IgniteCacheAffinitySelfTest extends IgniteCacheAbstractTest { cache2.setName(CACHE2); cache2.setAffinity(new RendezvousAffinityFunction()); - if (gridName.contains("0")) + if (igniteInstanceName.contains("0")) cfg.setCacheConfiguration(cache0); else cfg.setCacheConfiguration(cache0, cache1, cache2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java index c9671fd..4c3c1ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java @@ -38,8 +38,8 @@ public class IgniteWarmupClosureSelfTest 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 disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java index fc50541..0a3f96c 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java @@ -61,8 +61,8 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest { private static final String CACHE5 = "cache5"; /** {@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(ipFinder); @@ -97,7 +97,7 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest { ccfg5.setBackups(1); ccfg5.setName(CACHE5); - if (gridName.equals(getTestGridName(NODE_CNT - 1))) { + if (igniteInstanceName.equals(getTestIgniteInstanceName(NODE_CNT - 1))) { cfg.setClientMode(true); cfg.setCacheConfiguration(ccfg5); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java index f01f5d9..af969e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionBackupFilterAbstractSelfTest.java @@ -115,7 +115,7 @@ public abstract class AffinityFunctionBackupFilterAbstractSelfTest extends GridC } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); @@ -133,7 +133,7 @@ public abstract class AffinityFunctionBackupFilterAbstractSelfTest extends GridC TcpDiscoverySpi spi = new TcpDiscoverySpi(); spi.setIpFinder(IP_FINDER); - IgniteConfiguration cfg = super.getConfiguration(gridName); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); cfg.setCacheConfiguration(cacheCfg); cfg.setDiscoverySpi(spi); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java index 10cb5a5..29576b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityFunctionExcludeNeighborsAbstractSelfTest.java @@ -55,8 +55,8 @@ public abstract class AffinityFunctionExcludeNeighborsAbstractSelfTest extends G private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); + @Override protected IgniteConfiguration getConfiguration(final String igniteInstanceName) throws Exception { + IgniteConfiguration c = super.getConfiguration(igniteInstanceName); // Override node attributes in discovery spi. TcpDiscoverySpi spi = new TcpDiscoverySpi() { http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java index 87d1e5b..06964e0 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityHistoryCleanupTest.java @@ -52,8 +52,8 @@ public class AffinityHistoryCleanupTest extends GridCommonAbstractTest { private boolean lateAffAssignment; /** {@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(ipFinder); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java index 4299935..65f08c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityDynamicCacheSelfTest.java @@ -38,8 +38,8 @@ public class FairAffinityDynamicCacheSelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = 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); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunctionNodesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunctionNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunctionNodesSelfTest.java index f910dee..95bf30c 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunctionNodesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunctionNodesSelfTest.java @@ -78,8 +78,8 @@ public class FairAffinityFunctionNodesSelfTest 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 = cacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java index abd15ea..b2847ea 100755 --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java @@ -40,8 +40,8 @@ public class LocalAffinityFunctionTest extends GridCommonAbstractTest { /** */ private static final String CACHE1 = "cache1"; - @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(ipFinder); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java index 010f1da..790f24a 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java @@ -69,8 +69,8 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm protected static final AtomicBoolean fail = new AtomicBoolean(); /** {@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 disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java index e661a2f..5327e19 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerLifecycleSelfTest.java @@ -50,8 +50,8 @@ public class CacheStoreSessionListenerLifecycleSelfTest extends GridCommonAbstra private static final Queue<String> evts = new ConcurrentLinkedDeque<>(); /** {@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.setCacheStoreSessionListenerFactories( new SessionListenerFactory("Shared 1"), http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java index 461f562..2a1e23a 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheLoadOnlyStoreAdapterSelfTest.java @@ -64,8 +64,8 @@ public class GridCacheLoadOnlyStoreAdapterSelfTest extends GridCacheAbstractSelf /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName); assertNotNull(store); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java index 4bf0785..4d94400 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java @@ -63,8 +63,8 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName); cfg.setCacheStoreFactory(singletonFactory(new TestStore())); cfg.setReadThrough(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java index 207cbfb..0c4ea7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/StoreResourceInjectionSelfTest.java @@ -37,8 +37,8 @@ public class StoreResourceInjectionSelfTest extends GridCommonAbstractTest { private CacheConfiguration<Integer, String> cacheCfg = new CacheConfiguration<>(); /** {@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); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java index e890109..59462fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreAbstractSelfTest.java @@ -131,8 +131,8 @@ public abstract class CacheJdbcPojoStoreAbstractSelfTest extends GridCommonAbstr } /** {@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 disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java index f1a321b..89841f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcStoreAbstractMultithreadedSelfTest.java @@ -125,8 +125,8 @@ public abstract class CacheJdbcStoreAbstractMultithreadedSelfTest<T extends Cach protected abstract T store() throws Exception; /** {@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); TcpDiscoverySpi disco = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index cceb55f..ea6b0c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -87,8 +87,8 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration c = super.getConfiguration(gridName); + @Override protected final 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/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java index ea2be11..3bbb3f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java @@ -103,24 +103,25 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - return getConfiguration(gridName, getIgfsConfiguration()); + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + return getConfiguration(igniteInstanceName, getIgfsConfiguration()); } /** - * The same as getConfiguration(String gridName) but it sets custom IGFS configuration + * The same as getConfiguration(String igniteInstanceName) but it sets custom IGFS configuration * - * @param gridName Grid name. + * @param igniteInstanceName Ignite instance name. * @param igfsCfg IGFS configuration. * @return Grid configuration. * @throws Exception If failed. */ - protected IgniteConfiguration getConfiguration(String gridName, FileSystemConfiguration igfsCfg) throws Exception { + protected IgniteConfiguration getConfiguration(String igniteInstanceName, FileSystemConfiguration igfsCfg) + throws Exception { IgniteConfiguration cfg = IgnitionEx.loadConfiguration("config/hadoop/default-config.xml").get1(); assert cfg != null; - cfg.setGridName(gridName); + cfg.setIgniteInstanceName(igniteInstanceName); cfg.setIncludeEventTypes(concat(EVTS_IGFS, EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java index 6536267..91d5d5c 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java @@ -52,8 +52,8 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest { protected static final int IGFS_GROUP_SIZE = 32; /** {@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 discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java index dedc9c7..6fdaeb0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupAbstractTest.java @@ -119,8 +119,8 @@ public abstract class ClusterGroupAbstractTest extends GridCommonAbstractTest im } /** {@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.setDiscoverySpi(new TcpDiscoverySpi().setForceServerMode(true).setIpFinder(ipFinder)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java index d025192..2328c84 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java @@ -45,10 +45,10 @@ public class ClusterGroupHostsSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { Collection<String> hostNames = Arrays.asList("h_1", "h_2", "h_3"); - IgniteConfiguration cfg = super.getConfiguration(gridName); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); TcpDiscoverySpi disco = (TcpDiscoverySpi)cfg.getDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java index 7c5d201..d379400 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java @@ -61,8 +61,8 @@ public class ClusterMetricsSelfTest 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.setCacheConfiguration(); cfg.setIncludeProperties(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java index 77359ab..4b4ca7f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java @@ -79,8 +79,8 @@ public class ClusterNodeMetricsSelfTest 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 spi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java index 7d9e69d..bf23bdf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ComputeJobCancelWithServiceSelfTest.java @@ -46,8 +46,8 @@ public class ComputeJobCancelWithServiceSelfTest extends GridCommonAbstractTest private static final TcpDiscoveryIpFinder IP_FINDER = 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); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java index 099afd1..f6f641b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java @@ -50,18 +50,18 @@ public class GridAffinityMappedTest 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 disco = new TcpDiscoverySpi(); disco.setMaxMissedHeartbeats(Integer.MAX_VALUE); disco.setIpFinder(ipFinder); cfg.setDiscoverySpi(disco); - if (gridName.endsWith("1")) + if (igniteInstanceName.endsWith("1")) cfg.setCacheConfiguration(); // Empty cache configuration. else { - assert gridName.endsWith("2") || gridName.endsWith("3"); + assert igniteInstanceName.endsWith("2") || igniteInstanceName.endsWith("3"); CacheConfiguration cacheCfg = defaultCacheConfiguration(); @@ -70,7 +70,8 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest { cacheCfg.setAffinityMapper(new MockCacheAffinityKeyMapper()); cfg.setCacheConfiguration(cacheCfg); - cfg.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, gridName.endsWith("2") ? 0 : 1)); + cfg.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, + igniteInstanceName.endsWith("2") ? 0 : 1)); } return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java index e42c4fb..4e4586f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java @@ -80,8 +80,8 @@ public class GridAffinityP2PSelfTest 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(); @@ -92,10 +92,10 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest { c.setDeploymentMode(depMode); - if (gridName.endsWith("1")) + if (igniteInstanceName.endsWith("1")) c.setCacheConfiguration(); // Empty cache configuration. else { - assert gridName.endsWith("2") || gridName.endsWith("3"); + assert igniteInstanceName.endsWith("2") || igniteInstanceName.endsWith("3"); CacheConfiguration cc = defaultCacheConfiguration(); @@ -108,7 +108,8 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest { .newInstance()); c.setCacheConfiguration(cc); - c.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, gridName.endsWith("2") ? 0 : 1)); + c.setUserAttributes(F.asMap(GridCacheModuloAffinityFunction.IDX_ATTR, + igniteInstanceName.endsWith("2") ? 0 : 1)); } return c; http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java index 2d7eca4..d2df1be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java @@ -44,8 +44,8 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { private static final TcpDiscoveryIpFinder IP_FINDER = 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); TcpDiscoverySpi disco = new TcpDiscoverySpi(); @@ -54,10 +54,10 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - if (gridName.endsWith("1")) + if (igniteInstanceName.endsWith("1")) cfg.setClientMode(true); else { - assert gridName.endsWith("2"); + assert igniteInstanceName.endsWith("2"); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java index 64fb988..c62c840 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAlwaysFailoverSpiFailSelfTest.java @@ -66,7 +66,7 @@ public class GridAlwaysFailoverSpiFailSelfTest extends GridCommonAbstractTest { public void testFailoverTask() throws Exception { isFailoverCalled = false; - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTestFailoverTask.class, GridTestFailoverTask.class.getClassLoader()); @@ -90,7 +90,7 @@ public class GridAlwaysFailoverSpiFailSelfTest extends GridCommonAbstractTest { public void testNoneFailoverTask() throws Exception { isFailoverCalled = false; - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridTestFailoverTask.class, GridTestFailoverTask.class.getClassLoader()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridCacheRecreateLockTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCacheRecreateLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCacheRecreateLockTest.java index 24bb1c9..cb1052c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCacheRecreateLockTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCacheRecreateLockTest.java @@ -55,7 +55,7 @@ public class GridCacheRecreateLockTest extends GridCommonAbstractTest { private Ignite startNodeAndLock(String name) { try { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setGridName(name); + cfg.setIgniteInstanceName(name); Ignite ignite = Ignition.start(cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java index 7b5568b..917f1f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java @@ -71,8 +71,8 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest { } /** {@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); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); @@ -90,7 +90,7 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("unchecked") public void testCancel() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); ignite.compute().localDeployTask(GridCancelTestTask.class, U.detectClassLoader(GridCancelTestTask.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java index 8b27b79..79b6505 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelledJobsMetricsSelfTest.java @@ -83,7 +83,7 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testCancelledJobs() throws Exception { - final Ignite ignite = G.ignite(getTestGridName()); + final Ignite ignite = G.ignite(getTestIgniteInstanceName()); Collection<ComputeTaskFuture<?>> futs = new ArrayList<>(); @@ -199,7 +199,7 @@ public class GridCancelledJobsMetricsSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void spiStart(String gridName) throws IgniteSpiException { + @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException { // Start SPI start stopwatch. startStopwatch(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java index 9e03333..a18e7e7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionJobsContextSelfTest.java @@ -47,14 +47,14 @@ public class GridCollisionJobsContextSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - Ignite ignite = G.ignite(getTestGridName()); + Ignite ignite = G.ignite(getTestIgniteInstanceName()); assert ignite != null; } /** {@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.setCollisionSpi(new TestCollisionSpi()); @@ -65,7 +65,7 @@ public class GridCollisionJobsContextSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ public void testCollisionJobContext() throws Exception { - G.ignite(getTestGridName()).compute().execute(new GridTestTask(), "some-arg"); + G.ignite(getTestIgniteInstanceName()).compute().execute(new GridTestTask(), "some-arg"); } /** */ @@ -97,7 +97,7 @@ public class GridCollisionJobsContextSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void spiStart(String gridName) throws IgniteSpiException { + @Override public void spiStart(String igniteInstanceName) throws IgniteSpiException { // Start SPI start stopwatch. startStopwatch(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java index 100ed2a..57a108b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCommunicationSelfTest.java @@ -43,7 +43,7 @@ public class GridCommunicationSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - ignite = G.ignite(getTestGridName()); + ignite = G.ignite(getTestIgniteInstanceName()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java index 96f0277..a0e49b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridComputationBinarylizableClosuresSelfTest.java @@ -39,8 +39,8 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; */ public class GridComputationBinarylizableClosuresSelfTest 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.setMarshaller(new BinaryMarshaller()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java index dc4592e..55ba0fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridContinuousJobAnnotationSelfTest.java @@ -59,8 +59,8 @@ public class GridContinuousJobAnnotationSelfTest extends GridCommonAbstractTest private static final AtomicReference<Exception> err = new AtomicReference<>(); /** {@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.setMarshalLocalJobs(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java index 7eb23fc..9bd6fa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDeploymentSelfTest.java @@ -67,8 +67,8 @@ public class GridDeploymentSelfTest 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.setDeploymentSpi(depSpi = new TestDeploymentSpi()); cfg.setPeerClassLoadingEnabled(p2pEnabled); @@ -111,7 +111,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testDeploy() throws Exception { - Ignite ignite = startGrid(getTestGridName()); + Ignite ignite = startGrid(getTestIgniteInstanceName()); try { ignite.compute().localDeployTask(GridDeploymentTestTask.class, GridDeploymentTestTask.class.getClassLoader()); @@ -141,7 +141,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { // is configured, SPI should be ignored. p2pEnabled = false; - Ignite ignite = startGrid(getTestGridName()); + Ignite ignite = startGrid(getTestIgniteInstanceName()); try { ignite.compute().localDeployTask(GridDeploymentTestTask.class, GridDeploymentTestTask.class.getClassLoader()); @@ -163,7 +163,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRedeploy() throws Exception { - Ignite ignite = startGrid(getTestGridName()); + Ignite ignite = startGrid(getTestIgniteInstanceName()); try { // Added to work with P2P. @@ -258,8 +258,8 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings({"BusyWait"}) public void testDeployOnTwoNodes() throws Exception { - Ignite ignite1 = startGrid(getTestGridName() + '1'); - Ignite ignite2 = startGrid(getTestGridName() + '2'); + Ignite ignite1 = startGrid(getTestIgniteInstanceName() + '1'); + Ignite ignite2 = startGrid(getTestIgniteInstanceName() + '2'); try { assert !ignite1.cluster().forRemotes().nodes().isEmpty() : ignite1.cluster().forRemotes(); @@ -300,7 +300,7 @@ public class GridDeploymentSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testDeployEvents() throws Exception { - Ignite ignite = startGrid(getTestGridName()); + Ignite ignite = startGrid(getTestIgniteInstanceName()); try { DeploymentEventListener evtLsnr = new DeploymentEventListener(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f59f46d3/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java index ef2ecea..2ab4b3d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java @@ -75,8 +75,8 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { }; /** {@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.setDaemon(daemon);
