You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 10:29:50 UTC
[08/11] incubator-ignite git commit: # Renaming
# Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a9e7c21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a9e7c21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a9e7c21
Branch: refs/heads/master
Commit: 1a9e7c21a867b1feed7ce3b0dae65e0f351119d8
Parents: 4f92f24
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 12:22:10 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 12:22:10 2014 +0300
----------------------------------------------------------------------
.../ClientConnectionConfiguration.java | 570 +++++++++++++++++++
.../GridClientConnectionConfiguration.java | 570 -------------------
.../configuration/IgniteConfiguration.java | 86 +--
.../org/gridgain/grid/kernal/GridGainEx.java | 6 +-
.../org/gridgain/grid/kernal/GridKernal.java | 2 +-
.../processors/rest/GridRestProcessor.java | 6 +-
.../rest/protocols/GridRestProtocolAdapter.java | 2 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 4 +-
.../node/VisorExecutorServiceConfiguration.java | 2 +-
.../visor/node/VisorRestConfiguration.java | 2 +-
.../grid/kernal/GridLifecycleAwareSelfTest.java | 2 +-
11 files changed, 626 insertions(+), 626 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
new file mode 100644
index 0000000..59c1ae4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java
@@ -0,0 +1,570 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.client.ssl.*;
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+import java.net.*;
+import java.util.concurrent.*;
+
+/**
+ * REST access configuration.
+ */
+public class ClientConnectionConfiguration {
+ /** Default TCP server port. */
+ public static final int DFLT_TCP_PORT = 11211;
+
+ /** Default TCP_NODELAY flag. */
+ public static final boolean DFLT_TCP_NODELAY = true;
+
+ /** Default TCP direct buffer flag. */
+ public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
+
+ /** Default REST idle timeout. */
+ public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
+
+ /** Default rest port range. */
+ public static final int DFLT_REST_PORT_RANGE = 100;
+
+ /** Default size of REST thread pool. */
+ public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max size of REST thread pool. */
+ public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+ /** Default max queue capacity of REST thread pool. */
+ public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
+
+ /** Default socket send and receive buffer size. */
+ public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
+
+ /** Jetty XML configuration path. */
+ private String jettyPath;
+
+ /** REST secret key. */
+ private String restSecretKey;
+
+ /** TCP host. */
+ private String restTcpHost;
+
+ /** TCP port. */
+ private int restTcpPort = DFLT_TCP_PORT;
+
+ /** TCP no delay flag. */
+ private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
+
+ /** REST TCP direct buffer flag. */
+ private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
+
+ /** REST TCP send buffer size. */
+ private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP receive buffer size. */
+ private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
+
+ /** REST TCP send queue limit. */
+ private int restTcpSndQueueLimit;
+
+ /** REST TCP selector count. */
+ private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
+
+ /** Idle timeout. */
+ private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
+
+ /** SSL enable flag, default is disabled. */
+ private boolean restTcpSslEnabled;
+
+ /** SSL need client auth flag. */
+ private boolean restTcpSslClientAuth;
+
+ /** SSL context factory for rest binary server. */
+ private GridSslContextFactory restTcpSslCtxFactory;
+
+ /** Port range */
+ private int restPortRange = DFLT_REST_PORT_RANGE;
+
+ /** Folders accessible by REST. */
+ private String[] restAccessibleFolders;
+
+ /** REST requests executor service. */
+ private ExecutorService restExecSvc;
+
+ /** REST executor service shutdown flag. */
+ private boolean restSvcShutdown = true;
+
+ /** Client message interceptor. */
+ private GridClientMessageInterceptor clientMsgInterceptor;
+
+ /**
+ * Creates client connection configuration with all default values.
+ */
+ public ClientConnectionConfiguration() {
+ // No-op.
+ }
+
+ /**
+ * Creates client connection configuration by copying all properties from
+ * given configuration.
+ *
+ * @param cfg Client configuration.
+ */
+ public ClientConnectionConfiguration(ClientConnectionConfiguration cfg) {
+ assert cfg != null;
+
+ clientMsgInterceptor = cfg.getClientMessageInterceptor();
+ restAccessibleFolders = cfg.getRestAccessibleFolders();
+ restExecSvc = cfg.getRestExecutorService();
+ restSvcShutdown = cfg.isRestExecutorServiceShutdown();
+ restIdleTimeout = cfg.getRestIdleTimeout();
+ jettyPath = cfg.getRestJettyPath();
+ restPortRange = cfg.getRestPortRange();
+ restSecretKey = cfg.getRestSecretKey();
+ restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
+ restTcpHost = cfg.getRestTcpHost();
+ restTcpNoDelay = cfg.isRestTcpNoDelay();
+ restTcpPort = cfg.getRestTcpPort();
+ restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
+ restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
+ restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
+ restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
+ restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
+ restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
+ restTcpSslEnabled = cfg.isRestTcpSslEnabled();
+ }
+
+ /**
+ * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
+ * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
+ * accessing GridGain APIs remotely.
+ *
+ * @param jettyPath Path to {@code JETTY} XML configuration file.
+ */
+ public void setRestJettyPath(String jettyPath) {
+ this.jettyPath = jettyPath;
+ }
+
+ /**
+ * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
+ * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
+ * accessing GridGain APIs remotely.
+ * <p>
+ * If not provided, Jetty instance with default configuration will be started picking
+ * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
+ * as host and port respectively.
+ *
+ * @return Path to {@code JETTY} XML configuration file.
+ * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+ * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
+ */
+ public String getRestJettyPath() {
+ return jettyPath;
+ }
+
+ /**
+ * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+ *
+ * @param restSecretKey REST secret key.
+ */
+ public void setRestSecretKey(@Nullable String restSecretKey) {
+ this.restSecretKey = restSecretKey;
+ }
+
+ /**
+ * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+ *
+ * @return Secret key.
+ * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+ * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
+ */
+ @Nullable public String getRestSecretKey() {
+ return restSecretKey;
+ }
+
+ /**
+ * Gets host for TCP binary protocol server. This can be either an
+ * IP address or a domain name.
+ * <p>
+ * If not defined, system-wide local address will be used
+ * (see {@link IgniteConfiguration#getLocalHost()}.
+ * <p>
+ * You can also use {@code 0.0.0.0} value to bind to all
+ * locally-available IP addresses.
+ *
+ * @return TCP host.
+ */
+ public String getRestTcpHost() {
+ return restTcpHost;
+ }
+
+ /**
+ * Sets host for TCP binary protocol server.
+ *
+ * @param restTcpHost TCP host.
+ */
+ public void setRestTcpHost(String restTcpHost) {
+ this.restTcpHost = restTcpHost;
+ }
+
+ /**
+ * Gets port for TCP binary protocol server.
+ * <p>
+ * Default is {@link #DFLT_TCP_PORT}.
+ *
+ * @return TCP port.
+ */
+ public int getRestTcpPort() {
+ return restTcpPort;
+ }
+
+ /**
+ * Sets port for TCP binary protocol server.
+ *
+ * @param restTcpPort TCP port.
+ */
+ public void setRestTcpPort(int restTcpPort) {
+ this.restTcpPort = restTcpPort;
+ }
+
+ /**
+ * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
+ * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
+ * For more information, see {@link Socket#setTcpNoDelay(boolean)}
+ * <p/>
+ * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
+ *
+ * @return Whether {@code TCP_NODELAY} option should be enabled.
+ */
+ public boolean isRestTcpNoDelay() {
+ return restTcpNoDelay;
+ }
+
+ /**
+ * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
+ *
+ * @param restTcpNoDelay {@code True} if option should be enabled.
+ * @see #isRestTcpNoDelay()
+ */
+ public void setRestTcpNoDelay(boolean restTcpNoDelay) {
+ this.restTcpNoDelay = restTcpNoDelay;
+ }
+
+ /**
+ * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
+ * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
+ * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
+ * size).
+ *
+ * @return Whether direct buffer should be used.
+ */
+ public boolean isRestTcpDirectBuffer() {
+ return restTcpDirectBuf;
+ }
+
+ /**
+ * Sets whether to use direct buffer for REST TCP server.
+ *
+ * @param restTcpDirectBuf {@code True} if option should be enabled.
+ * @see #isRestTcpDirectBuffer()
+ */
+ public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
+ this.restTcpDirectBuf = restTcpDirectBuf;
+ }
+
+ /**
+ * Gets REST TCP server send buffer size.
+ *
+ * @return REST TCP server send buffer size (0 for default).
+ */
+ public int getRestTcpSendBufferSize() {
+ return restTcpSndBufSize;
+ }
+
+ /**
+ * Sets REST TCP server send buffer size.
+ *
+ * @param restTcpSndBufSize Send buffer size.
+ * @see #getRestTcpSendBufferSize()
+ */
+ public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
+ this.restTcpSndBufSize = restTcpSndBufSize;
+ }
+
+ /**
+ * Gets REST TCP server receive buffer size.
+ *
+ * @return REST TCP server receive buffer size (0 for default).
+ */
+ public int getRestTcpReceiveBufferSize() {
+ return restTcpRcvBufSize;
+ }
+
+ /**
+ * Sets REST TCP server receive buffer size.
+ *
+ * @param restTcpRcvBufSize Receive buffer size.
+ * @see #getRestTcpReceiveBufferSize()
+ */
+ public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
+ this.restTcpRcvBufSize = restTcpRcvBufSize;
+ }
+
+ /**
+ * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
+ * block until the queue has enough capacity.
+ *
+ * @return REST TCP server send queue limit (0 for unlimited).
+ */
+ public int getRestTcpSendQueueLimit() {
+ return restTcpSndQueueLimit;
+ }
+
+ /**
+ * Sets REST TCP server send queue limit.
+ *
+ * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
+ * @see #getRestTcpSendQueueLimit()
+ */
+ public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
+ this.restTcpSndQueueLimit = restTcpSndQueueLimit;
+ }
+
+ /**
+ * Gets number of selector threads in REST TCP server. Higher value for this parameter
+ * may increase throughput, but also increases context switching.
+ *
+ * @return Number of selector threads for REST TCP server.
+ */
+ public int getRestTcpSelectorCount() {
+ return restTcpSelectorCnt;
+ }
+
+ /**
+ * Sets number of selector threads for REST TCP server.
+ *
+ * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
+ * @see #getRestTcpSelectorCount()
+ */
+ public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
+ this.restTcpSelectorCnt = restTcpSelectorCnt;
+ }
+
+ /**
+ * Gets idle timeout for REST server.
+ * <p>
+ * This setting is used to reject half-opened sockets. If no packets
+ * come within idle timeout, the connection is closed.
+ *
+ * @return Idle timeout in milliseconds.
+ */
+ public long getRestIdleTimeout() {
+ return restIdleTimeout;
+ }
+
+ /**
+ * Sets idle timeout for REST server.
+ *
+ * @param restIdleTimeout Idle timeout in milliseconds.
+ * @see #getRestIdleTimeout()
+ */
+ public void setRestIdleTimeout(long restIdleTimeout) {
+ this.restIdleTimeout = restIdleTimeout;
+ }
+
+ /**
+ * Whether secure socket layer should be enabled on binary rest server.
+ * <p>
+ * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
+ * should be provided, otherwise binary rest protocol will fail to start.
+ *
+ * @return {@code True} if SSL should be enabled.
+ */
+ public boolean isRestTcpSslEnabled() {
+ return restTcpSslEnabled;
+ }
+
+ /**
+ * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
+ * <p/>
+ * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
+ * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+ *
+ * @param restTcpSslEnabled {@code True} if SSL should be enabled.
+ */
+ public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
+ this.restTcpSslEnabled = restTcpSslEnabled;
+ }
+
+ /**
+ * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
+ * validity will be verified with trust manager.
+ *
+ * @return Whether or not client authentication is required.
+ */
+ public boolean isRestTcpSslClientAuth() {
+ return restTcpSslClientAuth;
+ }
+
+ /**
+ * Sets flag indicating whether or not SSL client authentication is required.
+ *
+ * @param needClientAuth Whether or not client authentication is required.
+ */
+ public void setRestTcpSslClientAuth(boolean needClientAuth) {
+ restTcpSslClientAuth = needClientAuth;
+ }
+
+ /**
+ * Gets context factory that will be used for creating a secure socket layer of rest binary server.
+ *
+ * @return SslContextFactory instance.
+ * @see GridSslContextFactory
+ */
+ public GridSslContextFactory getRestTcpSslContextFactory() {
+ return restTcpSslCtxFactory;
+ }
+
+ /**
+ * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
+ * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
+ * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
+ *
+ * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
+ */
+ public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
+ this.restTcpSslCtxFactory = restTcpSslCtxFactory;
+ }
+
+ /**
+ * Gets number of ports to try if configured port is already in use.
+ *
+ * @return Number of ports to try.
+ */
+ public int getRestPortRange() {
+ return restPortRange;
+ }
+
+ /**
+ * Sets number of ports to try if configured one is in use.
+ *
+ * @param restPortRange Port range.
+ */
+ public void setRestPortRange(int restPortRange) {
+ this.restPortRange = restPortRange;
+ }
+
+ /**
+ * Gets list of folders that are accessible for log reading command. When remote client requests
+ * a log file, file path is checked against this list. If requested file is not located in any
+ * sub-folder of these folders, request is not processed.
+ * <p>
+ * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
+ * could not be detected and property is not specified, no restrictions applied.
+ *
+ * @return Array of folders that are allowed be read by remote clients.
+ */
+ public String[] getRestAccessibleFolders() {
+ return restAccessibleFolders;
+ }
+
+ /**
+ * Sets array of folders accessible by REST processor for log reading command.
+ *
+ * @param restAccessibleFolders Array of folder paths.
+ */
+ public void setRestAccessibleFolders(String... restAccessibleFolders) {
+ this.restAccessibleFolders = restAccessibleFolders;
+ }
+
+ /**
+ * Should return an instance of fully configured thread pool to be used for
+ * processing of client messages (REST requests).
+ * <p>
+ * If not provided, new executor service will be created using the following
+ * configuration:
+ * <ul>
+ * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
+ * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
+ * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
+ * </ul>
+ *
+ * @return Thread pool implementation to be used for processing of client
+ * messages.
+ */
+ public ExecutorService getRestExecutorService() {
+ return restExecSvc;
+ }
+
+ /**
+ * Sets thread pool to use for processing of client messages (REST requests).
+ *
+ * @param restExecSvc Thread pool to use for processing of client messages.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorService(ExecutorService restExecSvc) {
+ this.restExecSvc = restExecSvc;
+ }
+
+ /**
+ * Sets REST executor service shutdown flag.
+ *
+ * @param restSvcShutdown REST executor service shutdown flag.
+ * @see IgniteConfiguration#getRestExecutorService()
+ */
+ public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
+ this.restSvcShutdown = restSvcShutdown;
+ }
+
+ /**
+ * Shutdown flag for REST executor service.
+ * <p>
+ * If not provided, default value {@code true} will be used which will shutdown
+ * executor service when GridGain stops regardless whether it was started before GridGain
+ * or by GridGain.
+ *
+ * @return REST executor service shutdown flag.
+ */
+ public boolean isRestExecutorServiceShutdown() {
+ return restSvcShutdown;
+ }
+
+ /**
+ * Gets interceptor for objects, moving to and from remote clients.
+ * If this method returns {@code null} then no interception will be applied.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ * <p>
+ * Default value is {@code null}.
+ *
+ * @see GridClientMessageInterceptor
+ * @return Interceptor.
+ */
+ @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+ return clientMsgInterceptor;
+ }
+
+ /**
+ * Sets client message interceptor.
+ * <p>
+ * Setting interceptor allows to transform all objects exchanged via REST protocol.
+ * For example if you use custom serialisation on client you can write interceptor
+ * to transform binary representations received from client to Java objects and later
+ * access them from java code directly.
+ *
+ * @param interceptor Interceptor.
+ */
+ public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+ clientMsgInterceptor = interceptor;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
deleted file mode 100644
index b17d3a3..0000000
--- a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.configuration;
-
-import org.gridgain.client.ssl.*;
-import org.gridgain.grid.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.concurrent.*;
-
-/**
- * REST access configuration.
- */
-public class GridClientConnectionConfiguration {
- /** Default TCP server port. */
- public static final int DFLT_TCP_PORT = 11211;
-
- /** Default TCP_NODELAY flag. */
- public static final boolean DFLT_TCP_NODELAY = true;
-
- /** Default TCP direct buffer flag. */
- public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
-
- /** Default REST idle timeout. */
- public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
-
- /** Default rest port range. */
- public static final int DFLT_REST_PORT_RANGE = 100;
-
- /** Default size of REST thread pool. */
- public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max size of REST thread pool. */
- public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
- /** Default max queue capacity of REST thread pool. */
- public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
-
- /** Default socket send and receive buffer size. */
- public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
-
- /** Jetty XML configuration path. */
- private String jettyPath;
-
- /** REST secret key. */
- private String restSecretKey;
-
- /** TCP host. */
- private String restTcpHost;
-
- /** TCP port. */
- private int restTcpPort = DFLT_TCP_PORT;
-
- /** TCP no delay flag. */
- private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
-
- /** REST TCP direct buffer flag. */
- private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
-
- /** REST TCP send buffer size. */
- private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP receive buffer size. */
- private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
-
- /** REST TCP send queue limit. */
- private int restTcpSndQueueLimit;
-
- /** REST TCP selector count. */
- private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
-
- /** Idle timeout. */
- private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
-
- /** SSL enable flag, default is disabled. */
- private boolean restTcpSslEnabled;
-
- /** SSL need client auth flag. */
- private boolean restTcpSslClientAuth;
-
- /** SSL context factory for rest binary server. */
- private GridSslContextFactory restTcpSslCtxFactory;
-
- /** Port range */
- private int restPortRange = DFLT_REST_PORT_RANGE;
-
- /** Folders accessible by REST. */
- private String[] restAccessibleFolders;
-
- /** REST requests executor service. */
- private ExecutorService restExecSvc;
-
- /** REST executor service shutdown flag. */
- private boolean restSvcShutdown = true;
-
- /** Client message interceptor. */
- private GridClientMessageInterceptor clientMsgInterceptor;
-
- /**
- * Creates client connection configuration with all default values.
- */
- public GridClientConnectionConfiguration() {
- // No-op.
- }
-
- /**
- * Creates client connection configuration by copying all properties from
- * given configuration.
- *
- * @param cfg Client configuration.
- */
- public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
- assert cfg != null;
-
- clientMsgInterceptor = cfg.getClientMessageInterceptor();
- restAccessibleFolders = cfg.getRestAccessibleFolders();
- restExecSvc = cfg.getRestExecutorService();
- restSvcShutdown = cfg.isRestExecutorServiceShutdown();
- restIdleTimeout = cfg.getRestIdleTimeout();
- jettyPath = cfg.getRestJettyPath();
- restPortRange = cfg.getRestPortRange();
- restSecretKey = cfg.getRestSecretKey();
- restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
- restTcpHost = cfg.getRestTcpHost();
- restTcpNoDelay = cfg.isRestTcpNoDelay();
- restTcpPort = cfg.getRestTcpPort();
- restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
- restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
- restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
- restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
- restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
- restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
- restTcpSslEnabled = cfg.isRestTcpSslEnabled();
- }
-
- /**
- * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
- * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
- * accessing GridGain APIs remotely.
- *
- * @param jettyPath Path to {@code JETTY} XML configuration file.
- */
- public void setRestJettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
- * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
- * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
- * accessing GridGain APIs remotely.
- * <p>
- * If not provided, Jetty instance with default configuration will be started picking
- * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
- * as host and port respectively.
- *
- * @return Path to {@code JETTY} XML configuration file.
- * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
- * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- */
- public String getRestJettyPath() {
- return jettyPath;
- }
-
- /**
- * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
- *
- * @param restSecretKey REST secret key.
- */
- public void setRestSecretKey(@Nullable String restSecretKey) {
- this.restSecretKey = restSecretKey;
- }
-
- /**
- * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
- *
- * @return Secret key.
- * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
- * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- */
- @Nullable public String getRestSecretKey() {
- return restSecretKey;
- }
-
- /**
- * Gets host for TCP binary protocol server. This can be either an
- * IP address or a domain name.
- * <p>
- * If not defined, system-wide local address will be used
- * (see {@link IgniteConfiguration#getLocalHost()}.
- * <p>
- * You can also use {@code 0.0.0.0} value to bind to all
- * locally-available IP addresses.
- *
- * @return TCP host.
- */
- public String getRestTcpHost() {
- return restTcpHost;
- }
-
- /**
- * Sets host for TCP binary protocol server.
- *
- * @param restTcpHost TCP host.
- */
- public void setRestTcpHost(String restTcpHost) {
- this.restTcpHost = restTcpHost;
- }
-
- /**
- * Gets port for TCP binary protocol server.
- * <p>
- * Default is {@link #DFLT_TCP_PORT}.
- *
- * @return TCP port.
- */
- public int getRestTcpPort() {
- return restTcpPort;
- }
-
- /**
- * Sets port for TCP binary protocol server.
- *
- * @param restTcpPort TCP port.
- */
- public void setRestTcpPort(int restTcpPort) {
- this.restTcpPort = restTcpPort;
- }
-
- /**
- * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
- * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
- * For more information, see {@link Socket#setTcpNoDelay(boolean)}
- * <p/>
- * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
- *
- * @return Whether {@code TCP_NODELAY} option should be enabled.
- */
- public boolean isRestTcpNoDelay() {
- return restTcpNoDelay;
- }
-
- /**
- * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
- *
- * @param restTcpNoDelay {@code True} if option should be enabled.
- * @see #isRestTcpNoDelay()
- */
- public void setRestTcpNoDelay(boolean restTcpNoDelay) {
- this.restTcpNoDelay = restTcpNoDelay;
- }
-
- /**
- * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
- * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
- * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
- * size).
- *
- * @return Whether direct buffer should be used.
- */
- public boolean isRestTcpDirectBuffer() {
- return restTcpDirectBuf;
- }
-
- /**
- * Sets whether to use direct buffer for REST TCP server.
- *
- * @param restTcpDirectBuf {@code True} if option should be enabled.
- * @see #isRestTcpDirectBuffer()
- */
- public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
- this.restTcpDirectBuf = restTcpDirectBuf;
- }
-
- /**
- * Gets REST TCP server send buffer size.
- *
- * @return REST TCP server send buffer size (0 for default).
- */
- public int getRestTcpSendBufferSize() {
- return restTcpSndBufSize;
- }
-
- /**
- * Sets REST TCP server send buffer size.
- *
- * @param restTcpSndBufSize Send buffer size.
- * @see #getRestTcpSendBufferSize()
- */
- public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
- this.restTcpSndBufSize = restTcpSndBufSize;
- }
-
- /**
- * Gets REST TCP server receive buffer size.
- *
- * @return REST TCP server receive buffer size (0 for default).
- */
- public int getRestTcpReceiveBufferSize() {
- return restTcpRcvBufSize;
- }
-
- /**
- * Sets REST TCP server receive buffer size.
- *
- * @param restTcpRcvBufSize Receive buffer size.
- * @see #getRestTcpReceiveBufferSize()
- */
- public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
- this.restTcpRcvBufSize = restTcpRcvBufSize;
- }
-
- /**
- * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
- * block until the queue has enough capacity.
- *
- * @return REST TCP server send queue limit (0 for unlimited).
- */
- public int getRestTcpSendQueueLimit() {
- return restTcpSndQueueLimit;
- }
-
- /**
- * Sets REST TCP server send queue limit.
- *
- * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
- * @see #getRestTcpSendQueueLimit()
- */
- public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
- this.restTcpSndQueueLimit = restTcpSndQueueLimit;
- }
-
- /**
- * Gets number of selector threads in REST TCP server. Higher value for this parameter
- * may increase throughput, but also increases context switching.
- *
- * @return Number of selector threads for REST TCP server.
- */
- public int getRestTcpSelectorCount() {
- return restTcpSelectorCnt;
- }
-
- /**
- * Sets number of selector threads for REST TCP server.
- *
- * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
- * @see #getRestTcpSelectorCount()
- */
- public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
- this.restTcpSelectorCnt = restTcpSelectorCnt;
- }
-
- /**
- * Gets idle timeout for REST server.
- * <p>
- * This setting is used to reject half-opened sockets. If no packets
- * come within idle timeout, the connection is closed.
- *
- * @return Idle timeout in milliseconds.
- */
- public long getRestIdleTimeout() {
- return restIdleTimeout;
- }
-
- /**
- * Sets idle timeout for REST server.
- *
- * @param restIdleTimeout Idle timeout in milliseconds.
- * @see #getRestIdleTimeout()
- */
- public void setRestIdleTimeout(long restIdleTimeout) {
- this.restIdleTimeout = restIdleTimeout;
- }
-
- /**
- * Whether secure socket layer should be enabled on binary rest server.
- * <p>
- * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
- * should be provided, otherwise binary rest protocol will fail to start.
- *
- * @return {@code True} if SSL should be enabled.
- */
- public boolean isRestTcpSslEnabled() {
- return restTcpSslEnabled;
- }
-
- /**
- * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
- * <p/>
- * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
- * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
- *
- * @param restTcpSslEnabled {@code True} if SSL should be enabled.
- */
- public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
- this.restTcpSslEnabled = restTcpSslEnabled;
- }
-
- /**
- * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
- * validity will be verified with trust manager.
- *
- * @return Whether or not client authentication is required.
- */
- public boolean isRestTcpSslClientAuth() {
- return restTcpSslClientAuth;
- }
-
- /**
- * Sets flag indicating whether or not SSL client authentication is required.
- *
- * @param needClientAuth Whether or not client authentication is required.
- */
- public void setRestTcpSslClientAuth(boolean needClientAuth) {
- restTcpSslClientAuth = needClientAuth;
- }
-
- /**
- * Gets context factory that will be used for creating a secure socket layer of rest binary server.
- *
- * @return SslContextFactory instance.
- * @see GridSslContextFactory
- */
- public GridSslContextFactory getRestTcpSslContextFactory() {
- return restTcpSslCtxFactory;
- }
-
- /**
- * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
- * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
- * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
- *
- * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- */
- public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
- this.restTcpSslCtxFactory = restTcpSslCtxFactory;
- }
-
- /**
- * Gets number of ports to try if configured port is already in use.
- *
- * @return Number of ports to try.
- */
- public int getRestPortRange() {
- return restPortRange;
- }
-
- /**
- * Sets number of ports to try if configured one is in use.
- *
- * @param restPortRange Port range.
- */
- public void setRestPortRange(int restPortRange) {
- this.restPortRange = restPortRange;
- }
-
- /**
- * Gets list of folders that are accessible for log reading command. When remote client requests
- * a log file, file path is checked against this list. If requested file is not located in any
- * sub-folder of these folders, request is not processed.
- * <p>
- * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
- * could not be detected and property is not specified, no restrictions applied.
- *
- * @return Array of folders that are allowed be read by remote clients.
- */
- public String[] getRestAccessibleFolders() {
- return restAccessibleFolders;
- }
-
- /**
- * Sets array of folders accessible by REST processor for log reading command.
- *
- * @param restAccessibleFolders Array of folder paths.
- */
- public void setRestAccessibleFolders(String... restAccessibleFolders) {
- this.restAccessibleFolders = restAccessibleFolders;
- }
-
- /**
- * Should return an instance of fully configured thread pool to be used for
- * processing of client messages (REST requests).
- * <p>
- * If not provided, new executor service will be created using the following
- * configuration:
- * <ul>
- * <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
- * <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
- * <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
- * </ul>
- *
- * @return Thread pool implementation to be used for processing of client
- * messages.
- */
- public ExecutorService getRestExecutorService() {
- return restExecSvc;
- }
-
- /**
- * Sets thread pool to use for processing of client messages (REST requests).
- *
- * @param restExecSvc Thread pool to use for processing of client messages.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorService(ExecutorService restExecSvc) {
- this.restExecSvc = restExecSvc;
- }
-
- /**
- * Sets REST executor service shutdown flag.
- *
- * @param restSvcShutdown REST executor service shutdown flag.
- * @see IgniteConfiguration#getRestExecutorService()
- */
- public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
- this.restSvcShutdown = restSvcShutdown;
- }
-
- /**
- * Shutdown flag for REST executor service.
- * <p>
- * If not provided, default value {@code true} will be used which will shutdown
- * executor service when GridGain stops regardless whether it was started before GridGain
- * or by GridGain.
- *
- * @return REST executor service shutdown flag.
- */
- public boolean isRestExecutorServiceShutdown() {
- return restSvcShutdown;
- }
-
- /**
- * Gets interceptor for objects, moving to and from remote clients.
- * If this method returns {@code null} then no interception will be applied.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- * <p>
- * Default value is {@code null}.
- *
- * @see GridClientMessageInterceptor
- * @return Interceptor.
- */
- @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
- return clientMsgInterceptor;
- }
-
- /**
- * Sets client message interceptor.
- * <p>
- * Setting interceptor allows to transform all objects exchanged via REST protocol.
- * For example if you use custom serialisation on client you can write interceptor
- * to transform binary representations received from client to Java objects and later
- * access them from java code directly.
- *
- * @param interceptor Interceptor.
- */
- public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
- clientMsgInterceptor = interceptor;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/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 75dbb5c..7f5fab0 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
@@ -532,7 +532,7 @@ public class IgniteConfiguration {
private GridHadoopConfiguration hadoopCfg;
/** Client access configuration. */
- private GridClientConnectionConfiguration clientCfg;
+ private ClientConnectionConfiguration clientCfg;
/** Portable configuration. */
private PortableConfiguration portableCfg;
@@ -2341,7 +2341,7 @@ public class IgniteConfiguration {
* accessing GridGain APIs remotely.
*
* @param jettyPath Path to {@code JETTY} XML configuration file.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestJettyPath(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestJettyPath(String)}.
*/
@Deprecated
public void setRestJettyPath(String jettyPath) {
@@ -2360,7 +2360,7 @@ public class IgniteConfiguration {
* @return Path to {@code JETTY} XML configuration file.
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestJettyPath()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestJettyPath()}.
*/
@Deprecated
public String getRestJettyPath() {
@@ -2371,7 +2371,7 @@ public class IgniteConfiguration {
* 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 GridClientConnectionConfiguration}.
+ * @deprecated Use {@link ClientConnectionConfiguration}.
*/
@Deprecated
public void setRestEnabled(boolean restEnabled) {
@@ -2385,7 +2385,7 @@ public class IgniteConfiguration {
* @return Flag indicating whether external {@code REST} access is enabled or not.
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- * @deprecated Use {@link GridClientConnectionConfiguration}.
+ * @deprecated Use {@link ClientConnectionConfiguration}.
*/
@Deprecated
public boolean isRestEnabled() {
@@ -2403,7 +2403,7 @@ public class IgniteConfiguration {
* locally-available IP addresses.
*
* @return TCP host.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpHost()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpHost()}.
*/
@Deprecated
public String getRestTcpHost() {
@@ -2414,7 +2414,7 @@ public class IgniteConfiguration {
* Sets host for TCP binary protocol server.
*
* @param restTcpHost TCP host.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpHost(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpHost(String)}.
*/
@Deprecated
public void setRestTcpHost(String restTcpHost) {
@@ -2427,7 +2427,7 @@ public class IgniteConfiguration {
* Default is {@link #DFLT_TCP_PORT}.
*
* @return TCP port.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpPort()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpPort()}.
*/
@Deprecated
public int getRestTcpPort() {
@@ -2438,7 +2438,7 @@ public class IgniteConfiguration {
* Sets port for TCP binary protocol server.
*
* @param restTcpPort TCP port.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpPort(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpPort(int)}.
*/
@Deprecated
public void setRestTcpPort(int restTcpPort) {
@@ -2453,7 +2453,7 @@ public class IgniteConfiguration {
* If not specified, default value is {@link #DFLT_TCP_NODELAY}.
*
* @return Whether {@code TCP_NODELAY} option should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpNoDelay()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpNoDelay()}.
*/
@Deprecated
public boolean isRestTcpNoDelay() {
@@ -2465,7 +2465,7 @@ public class IgniteConfiguration {
*
* @param restTcpNoDelay {@code True} if option should be enabled.
* @see #isRestTcpNoDelay()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpNoDelay(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpNoDelay(boolean)}.
*/
@Deprecated
public void setRestTcpNoDelay(boolean restTcpNoDelay) {
@@ -2479,7 +2479,7 @@ public class IgniteConfiguration {
* size).
*
* @return Whether direct buffer should be used.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpDirectBuffer()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpDirectBuffer()}.
*/
@Deprecated
public boolean isRestTcpDirectBuffer() {
@@ -2491,7 +2491,7 @@ public class IgniteConfiguration {
*
* @param restTcpDirectBuf {@code True} if option should be enabled.
* @see #isRestTcpDirectBuffer()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}.
*/
@Deprecated
public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
@@ -2502,7 +2502,7 @@ public class IgniteConfiguration {
* Gets REST TCP server send buffer size.
*
* @return REST TCP server send buffer size (0 for default).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSendBufferSize()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendBufferSize()}.
*/
@Deprecated
public int getRestTcpSendBufferSize() {
@@ -2514,7 +2514,7 @@ public class IgniteConfiguration {
*
* @param restTcpSndBufSize Send buffer size.
* @see #getRestTcpSendBufferSize()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSendBufferSize(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendBufferSize(int)}.
*/
@Deprecated
public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
@@ -2525,7 +2525,7 @@ public class IgniteConfiguration {
* Gets REST TCP server receive buffer size.
*
* @return REST TCP server receive buffer size (0 for default).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpReceiveBufferSize()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpReceiveBufferSize()}.
*/
@Deprecated
public int getRestTcpReceiveBufferSize() {
@@ -2537,7 +2537,7 @@ public class IgniteConfiguration {
*
* @param restTcpRcvBufSize Receive buffer size.
* @see #getRestTcpReceiveBufferSize()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}.
*/
@Deprecated
public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
@@ -2549,7 +2549,7 @@ public class IgniteConfiguration {
* block until the queue has enough capacity.
*
* @return REST TCP server send queue limit (0 for unlimited).
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSendQueueLimit()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendQueueLimit()}.
*/
@Deprecated
public int getRestTcpSendQueueLimit() {
@@ -2561,7 +2561,7 @@ public class IgniteConfiguration {
*
* @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
* @see #getRestTcpSendQueueLimit()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}.
*/
@Deprecated
public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
@@ -2573,7 +2573,7 @@ public class IgniteConfiguration {
* may increase throughput, but also increases context switching.
*
* @return Number of selector threads for REST TCP server.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSelectorCount()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSelectorCount()}.
*/
@Deprecated
public int getRestTcpSelectorCount() {
@@ -2585,7 +2585,7 @@ public class IgniteConfiguration {
*
* @param restTcpSelectorCnt Number of selector threads for REST TCP server.
* @see #getRestTcpSelectorCount()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSelectorCount(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSelectorCount(int)}.
*/
@Deprecated
public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
@@ -2599,7 +2599,7 @@ public class IgniteConfiguration {
* come within idle timeout, the connection is closed.
*
* @return Idle timeout in milliseconds.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestIdleTimeout()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestIdleTimeout()}.
*/
@Deprecated
public long getRestIdleTimeout() {
@@ -2611,7 +2611,7 @@ public class IgniteConfiguration {
*
* @param restIdleTimeout Idle timeout in milliseconds.
* @see #getRestIdleTimeout()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestIdleTimeout(long)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestIdleTimeout(long)}.
*/
@Deprecated
public void setRestIdleTimeout(long restIdleTimeout) {
@@ -2625,7 +2625,7 @@ public class IgniteConfiguration {
* should be provided, otherwise binary rest protocol will fail to start.
*
* @return {@code True} if SSL should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpSslEnabled()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslEnabled()}.
*/
@Deprecated
public boolean isRestTcpSslEnabled() {
@@ -2639,7 +2639,7 @@ public class IgniteConfiguration {
* should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
*
* @param restTcpSslEnabled {@code True} if SSL should be enabled.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}.
*/
@Deprecated
public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
@@ -2651,7 +2651,7 @@ public class IgniteConfiguration {
* validity will be verified with trust manager.
*
* @return Whether or not client authentication is required.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestTcpSslClientAuth()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslClientAuth()}.
*/
@Deprecated
public boolean isRestTcpSslClientAuth() {
@@ -2662,7 +2662,7 @@ public class IgniteConfiguration {
* Sets flag indicating whether or not SSL client authentication is required.
*
* @param needClientAuth Whether or not client authentication is required.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}.
*/
@Deprecated
public void setRestTcpSslClientAuth(boolean needClientAuth) {
@@ -2674,7 +2674,7 @@ public class IgniteConfiguration {
*
* @return SslContextFactory instance.
* @see GridSslContextFactory
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestTcpSslContextFactory()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSslContextFactory()}.
*/
@Deprecated
public GridSslContextFactory getRestTcpSslContextFactory() {
@@ -2687,7 +2687,7 @@ public class IgniteConfiguration {
* {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
*
* @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}.
*/
@Deprecated
public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
@@ -2698,7 +2698,7 @@ public class IgniteConfiguration {
* Gets number of ports to try if configured port is already in use.
*
* @return Number of ports to try.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestPortRange()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestPortRange()}.
*/
@Deprecated
public int getRestPortRange() {
@@ -2709,7 +2709,7 @@ public class IgniteConfiguration {
* Sets number of ports to try if configured one is in use.
*
* @param restPortRange Port range.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestPortRange(int)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestPortRange(int)}.
*/
@Deprecated
public void setRestPortRange(int restPortRange) {
@@ -2725,7 +2725,7 @@ public class IgniteConfiguration {
* could not be detected and property is not specified, no restrictions applied.
*
* @return Array of folders that are allowed be read by remote clients.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestAccessibleFolders()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestAccessibleFolders()}.
*/
@Deprecated
public String[] getRestAccessibleFolders() {
@@ -2736,7 +2736,7 @@ public class IgniteConfiguration {
* Sets array of folders accessible by REST processor for log reading command.
*
* @param restAccessibleFolders Array of folder paths.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestAccessibleFolders(String...)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestAccessibleFolders(String...)}.
*/
@Deprecated
public void setRestAccessibleFolders(String... restAccessibleFolders) {
@@ -2757,7 +2757,7 @@ public class IgniteConfiguration {
*
* @return Thread pool implementation to be used for processing of client
* messages.
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestExecutorService()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestExecutorService()}.
*/
@Deprecated
public ExecutorService getRestExecutorService() {
@@ -2769,7 +2769,7 @@ public class IgniteConfiguration {
*
* @param restExecSvc Thread pool to use for processing of client messages.
* @see IgniteConfiguration#getRestExecutorService()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestExecutorService(ExecutorService)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorService(ExecutorService)}.
*/
@Deprecated
public void setRestExecutorService(ExecutorService restExecSvc) {
@@ -2781,7 +2781,7 @@ public class IgniteConfiguration {
*
* @param restSvcShutdown REST executor service shutdown flag.
* @see IgniteConfiguration#getRestExecutorService()
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestExecutorServiceShutdown(boolean)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorServiceShutdown(boolean)}.
*/
@Deprecated
public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
@@ -2796,7 +2796,7 @@ public class IgniteConfiguration {
* or by GridGain.
*
* @return REST executor service shutdown flag.
- * @deprecated Use {@link GridClientConnectionConfiguration#isRestExecutorServiceShutdown()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#isRestExecutorServiceShutdown()}.
*/
@Deprecated
public boolean getRestExecutorServiceShutdown() {
@@ -2873,7 +2873,7 @@ public class IgniteConfiguration {
* Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
*
* @param restSecretKey REST secret key.
- * @deprecated Use {@link GridClientConnectionConfiguration#setRestSecretKey(String)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setRestSecretKey(String)}.
*/
@Deprecated
public void setRestSecretKey(String restSecretKey) {
@@ -2886,7 +2886,7 @@ public class IgniteConfiguration {
* @return Secret key.
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
* @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
- * @deprecated Use {@link GridClientConnectionConfiguration#getRestSecretKey()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getRestSecretKey()}.
*/
@Deprecated
public String getRestSecretKey() {
@@ -2955,7 +2955,7 @@ public class IgniteConfiguration {
*
* @see GridClientMessageInterceptor
* @return Interceptor.
- * @deprecated Use {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}.
+ * @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}.
*/
@Deprecated
public GridClientMessageInterceptor getClientMessageInterceptor() {
@@ -2971,7 +2971,7 @@ public class IgniteConfiguration {
* access them from java code directly.
*
* @param interceptor Interceptor.
- * @deprecated Use {@link GridClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
+ * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(GridClientMessageInterceptor)}.
*/
@Deprecated
public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
@@ -3113,14 +3113,14 @@ public class IgniteConfiguration {
/**
* @return Client connection configuration.
*/
- public GridClientConnectionConfiguration getClientConnectionConfiguration() {
+ public ClientConnectionConfiguration getClientConnectionConfiguration() {
return clientCfg;
}
/**
* @param clientCfg Client connection configuration.
*/
- public void setClientConnectionConfiguration(GridClientConnectionConfiguration clientCfg) {
+ public void setClientConnectionConfiguration(ClientConnectionConfiguration clientCfg) {
this.clientCfg = clientCfg;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 632cd10..3401187 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -1383,12 +1383,12 @@ public class GridGainEx {
myCfg.setPluginConfigurations(cfg.getPluginConfigurations());
myCfg.setTransactionsConfiguration(new GridTransactionsConfiguration(cfg.getTransactionsConfiguration()));
- GridClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
+ 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 GridClientConnectionConfiguration();
+ clientCfg = new ClientConnectionConfiguration();
clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor());
clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders());
@@ -1412,7 +1412,7 @@ public class GridGainEx {
}
}
else
- clientCfg = new GridClientConnectionConfiguration(clientCfg);
+ clientCfg = new ClientConnectionConfiguration(clientCfg);
String ntfStr = IgniteSystemProperties.getString(GG_LIFECYCLE_EMAIL_NOTIFY);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 6a76027..274e589 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -1463,7 +1463,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
mgmtExecSvcMBean = registerExecutorMBean(cfg.getManagementExecutorService(), "GridManagementExecutor");
p2PExecSvcMBean = registerExecutorMBean(cfg.getPeerClassLoadingExecutorService(), "GridClassLoadingExecutor");
- GridClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
+ ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration();
if (clientCfg != null) {
restExecSvcMBean = clientCfg.getRestExecutorService() != null ?
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index f3d5c69..d024d0a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -322,7 +322,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor}
- * from {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user parameters in the request.
*
* @param req Client request.
@@ -369,7 +369,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* Applies {@link GridClientMessageInterceptor} from
- * {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
+ * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()}
* to all user objects in the response.
*
* @param res Response.
@@ -659,7 +659,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
/**
* @return Client configuration.
*/
- private GridClientConnectionConfiguration config() {
+ private ClientConnectionConfiguration config() {
return ctx.config().getClientConnectionConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
index b2c662c..48ff406 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -137,7 +137,7 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol {
/**
* @return Client configuration.
*/
- protected GridClientConnectionConfiguration config() {
+ protected ClientConnectionConfiguration config() {
return ctx.config().getClientConnectionConfiguration();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 640c4ec..f3365b4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -146,7 +146,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
@Override public void start(final GridRestProtocolHandler hnd) throws GridException {
assert hnd != null;
- GridClientConnectionConfiguration cfg = ctx.config().getClientConnectionConfiguration();
+ ClientConnectionConfiguration cfg = ctx.config().getClientConnectionConfiguration();
assert cfg != null;
@@ -251,7 +251,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
* server was unable to start.
*/
private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerListener<GridClientMessage> lsnr,
- GridNioParser parser, @Nullable SSLContext sslCtx, GridClientConnectionConfiguration cfg) {
+ GridNioParser parser, @Nullable SSLContext sslCtx, ClientConnectionConfiguration cfg) {
try {
GridNioFilter codec = new GridNioCodecFilter(parser, log, true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
index 5a9eb1c..54380bf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
@@ -63,7 +63,7 @@ public class VisorExecutorServiceConfiguration implements Serializable {
cfg.p2pExecutorService(compactClass(c.getPeerClassLoadingExecutorService()));
cfg.p2pExecutorServiceShutdown(c.getSystemExecutorServiceShutdown());
- GridClientConnectionConfiguration cc = c.getClientConnectionConfiguration();
+ ClientConnectionConfiguration cc = c.getClientConnectionConfiguration();
if (cc != null) {
cfg.restExecutorService(compactClass(cc.getRestExecutorService()));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 9f8e460..82237c7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -60,7 +60,7 @@ public class VisorRestConfiguration implements Serializable {
public static VisorRestConfiguration from(IgniteConfiguration c) {
VisorRestConfiguration cfg = new VisorRestConfiguration();
- GridClientConnectionConfiguration clnCfg = c.getClientConnectionConfiguration();
+ ClientConnectionConfiguration clnCfg = c.getClientConnectionConfiguration();
boolean restEnabled = clnCfg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a9e7c21/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index dacdecc..f6d78f0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -145,7 +145,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
TestClientMessageInterceptor interceptor = new TestClientMessageInterceptor();
- GridClientConnectionConfiguration clientCfg = new GridClientConnectionConfiguration();
+ ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration();
clientCfg.setClientMessageInterceptor(interceptor);