# ignite-128: Removed "restEnabled" flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2909f50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2909f50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2909f50 Branch: refs/heads/ignite-128 Commit: f2909f5048fa7e07ab24b3417c4c1b54383736e2 Parents: 0c424bb Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Feb 5 10:57:28 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Feb 5 10:57:28 2015 +0300 ---------------------------------------------------------------------- .../HibernateL2CacheExampleNodeStartup.java | 2 +- .../internal/TaskEventSubjectIdSelfTest.java | 2 +- .../rest/RestProcessorMultiStartSelfTest.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 2 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 2 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 2 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 2 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 2 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 2 +- .../configuration/IgniteConfiguration.java | 40 +------------------- .../org/apache/ignite/internal/IgnitionEx.java | 40 ++++++++------------ .../internal/GridDiscoveryEventSelfTest.java | 2 +- .../ignite/internal/GridStartStopSelfTest.java | 6 +-- .../GridCacheDaemonNodeAbstractSelfTest.java | 2 +- .../cache/GridCacheDeploymentSelfTest.java | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java | 2 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 +- ...dCacheMultithreadedFailoverAbstractTest.java | 2 +- .../GridCachePreloadLifecycleAbstractTest.java | 2 +- .../GridCacheNearReaderPreloadSelfTest.java | 2 +- .../dataload/GridDataLoaderPerformanceTest.java | 2 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../processors/fs/GridGgfsAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 2 +- .../spi/GridTcpSpiForwardingSelfTest.java | 2 +- .../discovery/tcp/GridTcpDiscoverySelfTest.java | 2 +- .../GridTcpDiscoverySnapshotHistoryTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 2 +- .../client/hadoop/GridHadoopClientProtocol.java | 3 +- .../fs/GridGgfsHadoopDualAbstractSelfTest.java | 2 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 2 +- .../hadoop/GridHadoopAbstractSelfTest.java | 5 +-- .../log4j/GridLog4jCorrectFileNameTest.java | 2 +- .../ignite/internal/GridFactorySelfTest.java | 10 ++--- .../GridSpringBeanSerializationSelfTest.java | 2 +- 39 files changed, 63 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index 8ebba72..322b417 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -54,7 +54,7 @@ public class HibernateL2CacheExampleNodeStartup { cfg.setGridName("hibernate-grid"); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java index b691e1c..0fe04ea 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java @@ -53,7 +53,7 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java index 92d625d..aaa61c5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorMultiStartSelfTest.java @@ -31,7 +31,7 @@ public class RestProcessorMultiStartSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index e01143e..035044d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@ -68,7 +68,7 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java index daac5f8..f0d1ddb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java @@ -64,7 +64,7 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java index 244133f..2e26752 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java @@ -69,7 +69,7 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java index 82a5a54..9b15dc3 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java @@ -63,7 +63,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java index 5850f5a..3ea72fe 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java @@ -69,7 +69,7 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java index 9155742..aed9bfd 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java @@ -76,7 +76,7 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java index 082f980..32e665a 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java @@ -69,7 +69,7 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index c4d9ae3..a46be60 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -21,20 +21,14 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; -import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.managers.eventstorage.*; +import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.managed.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.*; -import org.apache.ignite.portables.*; -import org.apache.ignite.spi.authentication.*; -import org.apache.ignite.spi.indexing.*; -import org.apache.ignite.streamer.*; -import org.apache.ignite.client.ssl.*; -import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.plugin.segmentation.*; import org.apache.ignite.portables.*; @@ -50,7 +44,6 @@ import org.apache.ignite.spi.indexing.*; import org.apache.ignite.spi.loadbalancing.*; import org.apache.ignite.spi.securesession.*; import org.apache.ignite.spi.swapspace.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.streamer.*; import javax.management.*; @@ -257,9 +250,6 @@ public class IgniteConfiguration { /** Daemon flag. */ private boolean daemon; - /** {@code REST} flag. */ - private boolean restEnabled = true; - /** Whether or not peer class loading is enabled. */ private boolean p2pEnabled = DFLT_P2P_ENABLED; @@ -436,7 +426,7 @@ public class IgniteConfiguration { private GridHadoopConfiguration hadoopCfg; /** Client access configuration. */ - private ClientConnectionConfiguration clientCfg; + private ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); /** Portable configuration. */ private PortableConfiguration portableCfg; @@ -528,7 +518,6 @@ public class IgniteConfiguration { pluginCfgs = cfg.getPluginConfigurations(); portableCfg = cfg.getPortableConfiguration(); qryCfg = cfg.getQueryConfiguration(); - restEnabled = cfg.isRestEnabled(); securityCred = cfg.getSecurityCredentialsProvider(); segChkFreq = cfg.getSegmentCheckFrequency(); segPlc = cfg.getSegmentationPolicy(); @@ -2214,31 +2203,6 @@ public class IgniteConfiguration { } /** - * Gets flag indicating whether external {@code REST} access is enabled or not. By default, - * external {@code REST} access is turned on. - * - * @return Flag indicating whether external {@code REST} access is enabled or not. - * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT - * @deprecated Use {@link ClientConnectionConfiguration}. - */ - @Deprecated - public boolean isRestEnabled() { - return restEnabled; - } - - /** - * Sets flag indicating whether external {@code REST} access is enabled or not. - * - * @param restEnabled Flag indicating whether external {@code REST} access is enabled or not. - * @deprecated Use {@link ClientConnectionConfiguration}. - */ - @Deprecated - public void setRestEnabled(boolean restEnabled) { - this.restEnabled = restEnabled; - } - - /** * Sets system-wide local address or host for all GridGain components to bind to. If provided it will * override all default local bind settings within GridGain or any of its SPIs. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 6d109af..96dfd28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1432,15 +1432,9 @@ public class IgnitionEx { ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); - if (clientCfg == null) { - // If client config is not provided then create config copying values from GridConfiguration. - if (cfg.isRestEnabled()) - clientCfg = new ClientConnectionConfiguration(); - } - else + if (clientCfg != null) clientCfg = new ClientConnectionConfiguration(clientCfg); - String ntfStr = IgniteSystemProperties.getString(IGNITE_LIFECYCLE_EMAIL_NOTIFY); if (ntfStr != null) @@ -1582,24 +1576,22 @@ public class IgnitionEx { new LinkedBlockingQueue<Runnable>()); } - restExecSvc = clientCfg != null ? clientCfg.getExecutorService() : null; + if (clientCfg != null) { + restExecSvc = clientCfg.getExecutorService(); - if (restExecSvc != null && !cfg.isRestEnabled()) { - U.warn(log, "REST executor service is configured, but REST is disabled in configuration " + - "(safely ignoring)."); - } - else if (restExecSvc == null && clientCfg != null) { - isAutoRestSvc = true; - - restExecSvc = new IgniteThreadPoolExecutor( - "rest-" + cfg.getGridName(), - DFLT_CORE_THREAD_CNT, - DFLT_MAX_THREAD_CNT, - DFLT_KEEP_ALIVE_TIME, - new LinkedBlockingQueue<Runnable>(DFLT_THREADPOOL_QUEUE_CAP) - ); - - clientCfg.setExecutorService(restExecSvc); + if (restExecSvc == null) { + isAutoRestSvc = true; + + restExecSvc = new IgniteThreadPoolExecutor( + "rest-" + cfg.getGridName(), + DFLT_CORE_THREAD_CNT, + DFLT_MAX_THREAD_CNT, + DFLT_KEEP_ALIVE_TIME, + new LinkedBlockingQueue<Runnable>(DFLT_THREADPOOL_QUEUE_CAP) + ); + + clientCfg.setExecutorService(restExecSvc); + } } utilityCacheExecSvc = new IgniteThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/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 cc230d0..a9eaa40 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,7 +75,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setRestEnabled(false); + c.setClientConnectionConfiguration(null); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java index 0601cc4..e7b26a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java @@ -53,7 +53,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void testStartStop() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); info("Grid start-stop test count: " + COUNT); @@ -75,7 +75,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void _testStopWhileInUse() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setGridName(getTestGridName(0)); @@ -137,7 +137,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void testStoppedState() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); Ignite ignite = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index 2aad0d7..fa2047c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -64,7 +64,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst c.setDiscoverySpi(disco); - c.setRestEnabled(false); + c.setClientConnectionConfiguration(null); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java index c413403..f5a6fd2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java @@ -91,7 +91,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java index 63922a0..dacc05e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java @@ -63,7 +63,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); cfg.setIncludeEventTypes(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 84eee83..6deac12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -110,7 +110,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon spi.setIpFinder(ipFinder); cfg.setDiscoverySpi(spi); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index 023d576..c8a8253 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -234,7 +234,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra cfg.setDiscoverySpi(discoSpi); cfg.setLocalHost("127.0.0.1"); cfg.setCacheConfiguration(ccfg); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index b6a9e21..f383762 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -81,7 +81,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb c.setIncludeProperties(); c.setDeploymentMode(IgniteDeploymentMode.SHARED); c.setNetworkTimeout(10000); - c.setRestEnabled(false); + c.setClientConnectionConfiguration(null); c.setMarshaller(new IgniteOptimizedMarshaller(false)); // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java index 352faea..2deaf89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java @@ -139,7 +139,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); cfg.setCacheConfiguration(ccfg); cfg.setIncludeProperties(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java index 603f592..a145806 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java @@ -72,7 +72,7 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest { cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 340bb4d..79b145b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -133,7 +133,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); Ignite g = G.start(cfg); @@ -191,7 +191,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); Ignite g = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java index efe6d17..bbf7004 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java @@ -228,7 +228,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return G.start(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java index 503f1f2..20c38d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java @@ -131,7 +131,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); grid = (IgniteEx)G.start(cfg); @@ -188,7 +188,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); ggfsSecondary = (GridGgfsImpl)G.start(cfg).fileSystem("ggfs-secondary"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index 2a55227..1f10cce 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -62,7 +62,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(); cfg.setLocalHost("localhost"); - cfg.setRestEnabled(true); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); cfg.setDiscoverySpi(disco); cfg.setCacheConfiguration(cacheCfg); // Add 'null' cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java index 36769db..a6df1bc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java @@ -90,7 +90,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { // Default console logger is used cfg.setGridLogger(log); cfg.setDiscoverySpi(disc); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); try (Ignite g = G.start(cfg)) { assert g != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 07449bb..ecfba0e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -97,7 +97,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { spi.setLocalPortRange(1); cfg.setDiscoverySpi(spi); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); TcpCommunicationSpi commSpi = new TcpCommunicationSpi() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java index 8b6f59a..f89ea4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java @@ -109,7 +109,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { spi.setHeartbeatFrequency(40000); } - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); if (nodeId != null) cfg.setNodeId(nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java index f0f4ded..ed8d623 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java @@ -41,7 +41,7 @@ public class GridTcpDiscoverySnapshotHistoryTest extends GridCommonAbstractTest cfg.setDiscoverySpi(new TcpDiscoverySpi()); cfg.setCacheConfiguration(); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 4c9285c..2ccdf3b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1109,7 +1109,7 @@ public abstract class GridAbstractTest extends TestCase { cfg.setCheckpointSpi(cpSpi); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setIncludeEventTypes(IgniteEventType.EVTS_ALL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java index 3038794..729d76d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java @@ -31,9 +31,8 @@ import org.apache.hadoop.security.*; import org.apache.hadoop.security.authorize.*; import org.apache.hadoop.security.token.*; import org.apache.ignite.*; -import org.apache.ignite.internal.client.*; import org.apache.ignite.client.hadoop.counter.*; -import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.client.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.proto.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java index 9a325ce..c9959c0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java @@ -169,7 +169,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return G.start(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 45b3872..dc257bb 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -192,7 +192,7 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs IgniteConfiguration cfg = super.getConfiguration(dfltGridName ? null : GRID_NAME); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index ecada0c..258500d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -119,7 +119,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); Ignite g = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java index 15da51b..406b2f8 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -101,10 +101,7 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest } if (restEnabled()) { - cfg.setRestEnabled(true); - - if (cfg.getClientConnectionConfiguration() == null) - cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); cfg.getClientConnectionConfiguration().setPort(restPort++); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/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 7f33f90..9f15b28 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 @@ -105,7 +105,7 @@ public class GridLog4jCorrectFileNameTest extends TestCase { cfg.setGridName(gridName); cfg.setGridLogger(new IgniteLog4jLogger()); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/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 c4ccf59..9db12cf 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 @@ -152,7 +152,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { cfg.setLifecycleBeans(bean1, bean2); cfg.setGridName(gridName); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); try (Ignite g = IgniteSpring.start(cfg, new GenericApplicationContext())) { bean1.checkState(gridName, true); @@ -268,7 +268,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { try { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); G.start(cfg); } @@ -306,7 +306,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName("TEST_NAME"); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); G.start(cfg); } @@ -431,7 +431,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { @Nullable @Override public Object call() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void spiStart(String gridName) throws IgniteSpiException { @@ -749,7 +749,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { public void testStopCancel() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); Ignite ignite = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2909f50/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 17c29c9..1bf7f87 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 @@ -66,7 +66,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest cfg.setUserAttributes(F.asMap(ATTR_KEY, true)); - cfg.setRestEnabled(false); + cfg.setClientConnectionConfiguration(null); return cfg; }
