#ignite-128: Removed deprecated properties from IgniteConfiguration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f51fa2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f51fa2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f51fa2b Branch: refs/heads/ignite-176 Commit: 6f51fa2ba3a380fbdc2d7756fd7d92e58bda5b41 Parents: c4e2bd4 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 4 14:19:45 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 4 14:19:45 2015 +0300 ---------------------------------------------------------------------- .../ClientConnectionConfiguration.java | 2 - .../configuration/IgniteConfiguration.java | 605 +------------------ .../org/apache/ignite/internal/IgnitionEx.java | 22 +- .../router/GridTcpRouterConfiguration.java | 4 +- .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../hadoop/GridHadoopAbstractSelfTest.java | 6 +- 6 files changed, 16 insertions(+), 627 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/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 index bf29ff7..f3fc369 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java @@ -488,7 +488,6 @@ public class ClientConnectionConfiguration { * 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; @@ -498,7 +497,6 @@ public class ClientConnectionConfiguration { * Sets REST executor service shutdown flag. * * @param restSvcShutdown REST executor service shutdown flag. - * @see IgniteConfiguration#getRestExecutorService() */ public void setRestExecutorServiceShutdown(boolean restSvcShutdown) { this.restSvcShutdown = restSvcShutdown; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/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 e43fda6..0778a89 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 @@ -22,7 +22,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.events.*; import org.apache.ignite.fs.*; import org.apache.ignite.hadoop.*; -import org.apache.ignite.internal.client.ssl.*; import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -49,7 +48,6 @@ import org.apache.ignite.streamer.*; import javax.management.*; import java.lang.management.*; -import java.net.*; import java.util.*; import java.util.concurrent.*; @@ -195,18 +193,6 @@ public class IgniteConfiguration { /** 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 marshal local jobs flag. */ public static final boolean DFLT_MARSHAL_LOCAL_JOBS = false; @@ -234,9 +220,6 @@ public class IgniteConfiguration { /** GGFS executor service. */ private ExecutorService ggfsSvc; - /** REST requests executor service. */ - private ExecutorService restExecSvc; - /** Peer class loading executor service shutdown flag. */ private boolean p2pSvcShutdown = true; @@ -252,9 +235,6 @@ public class IgniteConfiguration { /** GGFS executor service shutdown flag. */ private boolean ggfsSvcShutdown = true; - /** REST executor service shutdown flag. */ - private boolean restSvcShutdown = true; - /** Lifecycle email notification. */ private boolean lifeCycleEmailNtf = true; @@ -282,9 +262,6 @@ public class IgniteConfiguration { /** Daemon flag. */ private boolean daemon; - /** Jetty XML configuration path. */ - private String jettyPath; - /** {@code REST} flag. */ private boolean restEnabled = true; @@ -435,9 +412,6 @@ public class IgniteConfiguration { /** Port number range for time server. */ private int timeSrvPortRange = DFLT_TIME_SERVER_PORT_RANGE; - /** REST secret key. */ - private String restSecretKey; - /** Property names to include into node attributes. */ private String[] includeProps; @@ -451,54 +425,9 @@ public class IgniteConfiguration { /** Local event listeners. */ private Map<IgnitePredicate<? extends IgniteEvent>, int[]> lsnrs; - /** 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; - - /** REST TCP receive buffer size. */ - private int restTcpRcvBufSize; - - /** 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; - /** GGFS configuration. */ private IgniteFsConfiguration[] ggfsCfg; - /** Client message interceptor. */ - private ClientMessageInterceptor clientMsgInterceptor; - /** Streamer configuration. */ private StreamerConfiguration[] streamerCfg; @@ -512,7 +441,7 @@ public class IgniteConfiguration { private GridHadoopConfiguration hadoopCfg; /** Client access configuration. */ - private ClientConnectionConfiguration clientCfg; + private ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); /** Portable configuration. */ private PortableConfiguration portableCfg; @@ -564,7 +493,6 @@ public class IgniteConfiguration { cacheCfg = cfg.getCacheConfiguration(); cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled(); clientCfg = cfg.getClientConnectionConfiguration(); - clientMsgInterceptor = cfg.getClientMessageInterceptor(); clockSyncFreq = cfg.getClockSyncFrequency(); clockSyncSamples = cfg.getClockSyncSamples(); deployMode = cfg.getDeploymentMode(); @@ -580,7 +508,6 @@ public class IgniteConfiguration { hadoopCfg = cfg.getHadoopConfiguration(); inclEvtTypes = cfg.getIncludeEventTypes(); includeProps = cfg.getIncludeProperties(); - jettyPath = cfg.getRestJettyPath(); licUrl = cfg.getLicenseUrl(); lifecycleBeans = cfg.getLifecycleBeans(); lifeCycleEmailNtf = cfg.isLifeCycleEmailNotification(); @@ -606,24 +533,7 @@ public class IgniteConfiguration { pluginCfgs = cfg.getPluginConfigurations(); portableCfg = cfg.getPortableConfiguration(); qryCfg = cfg.getQueryConfiguration(); - restAccessibleFolders = cfg.getRestAccessibleFolders(); restEnabled = cfg.isRestEnabled(); - restIdleTimeout = cfg.getRestIdleTimeout(); - restPortRange = cfg.getRestPortRange(); - restSecretKey = cfg.getRestSecretKey(); - restTcpHost = cfg.getRestTcpHost(); - restTcpNoDelay = cfg.isRestTcpNoDelay(); - restTcpDirectBuf = cfg.isRestTcpDirectBuffer(); - restTcpSndBufSize = cfg.getRestTcpSendBufferSize(); - restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize(); - restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit(); - restTcpSelectorCnt = cfg.getRestTcpSelectorCount(); - restTcpPort = cfg.getRestTcpPort(); - restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory(); - restTcpSslEnabled = cfg.isRestTcpSslEnabled(); - restTcpSslClientAuth = cfg.isRestTcpSslClientAuth(); - restExecSvc = cfg.getRestExecutorService(); - restSvcShutdown = cfg.getRestExecutorServiceShutdown(); securityCred = cfg.getSecurityCredentialsProvider(); segChkFreq = cfg.getSegmentCheckFrequency(); segPlc = cfg.getSegmentationPolicy(); @@ -2309,49 +2219,6 @@ public class IgniteConfiguration { } /** - * Sets path, either absolute or relative to {@code IGNITE_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. - * @deprecated Use {@link ClientConnectionConfiguration#setRestJettyPath(String)}. - */ - @Deprecated - public void setRestJettyPath(String jettyPath) { - this.jettyPath = jettyPath; - } - - /** - * Gets path, either absolute or relative to {@code IGNITE_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#IGNITE_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT} - * as host and port respectively. - * - * @return Path to {@code JETTY} XML configuration file. - * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT - * @deprecated Use {@link ClientConnectionConfiguration#getRestJettyPath()}. - */ - @Deprecated - public String getRestJettyPath() { - return jettyPath; - } - - /** - * 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; - } - - /** * Gets flag indicating whether external {@code REST} access is enabled or not. By default, * external {@code REST} access is turned on. * @@ -2366,414 +2233,14 @@ public class IgniteConfiguration { } /** - * 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 #getLocalHost()}. - * <p> - * You can also use {@code 0.0.0.0} value to bind to all - * locally-available IP addresses. - * - * @return TCP host. - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpHost()}. - */ - @Deprecated - public String getRestTcpHost() { - return restTcpHost; - } - - /** - * Sets host for TCP binary protocol server. - * - * @param restTcpHost TCP host. - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpHost(String)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpPort()}. - */ - @Deprecated - public int getRestTcpPort() { - return restTcpPort; - } - - /** - * Sets port for TCP binary protocol server. - * - * @param restTcpPort TCP port. - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpPort(int)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpNoDelay()}. - */ - @Deprecated - 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() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpNoDelay(boolean)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpDirectBuffer()}. - */ - @Deprecated - 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() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}. - */ - @Deprecated - 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). - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendBufferSize()}. - */ - @Deprecated - public int getRestTcpSendBufferSize() { - return restTcpSndBufSize; - } - - /** - * Sets REST TCP server send buffer size. - * - * @param restTcpSndBufSize Send buffer size. - * @see #getRestTcpSendBufferSize() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendBufferSize(int)}. - */ - @Deprecated - 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). - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpReceiveBufferSize()}. - */ - @Deprecated - public int getRestTcpReceiveBufferSize() { - return restTcpRcvBufSize; - } - - /** - * Sets REST TCP server receive buffer size. - * - * @param restTcpRcvBufSize Receive buffer size. - * @see #getRestTcpReceiveBufferSize() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}. - */ - @Deprecated - 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). - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSendQueueLimit()}. - */ - @Deprecated - 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() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSelectorCount()}. - */ - @Deprecated - 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() - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSelectorCount(int)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestIdleTimeout()}. - */ - @Deprecated - public long getRestIdleTimeout() { - return restIdleTimeout; - } - - /** - * Sets idle timeout for REST server. - * - * @param restIdleTimeout Idle timeout in milliseconds. - * @see #getRestIdleTimeout() - * @deprecated Use {@link ClientConnectionConfiguration#setRestIdleTimeout(long)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslEnabled()}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#isRestTcpSslClientAuth()}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}. - */ - @Deprecated - 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 - * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpSslContextFactory()}. - */ - @Deprecated - 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} - * @deprecated Use {@link ClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestPortRange()}. - */ - @Deprecated - public int getRestPortRange() { - return restPortRange; - } - - /** - * Sets number of ports to try if configured one is in use. - * - * @param restPortRange Port range. - * @deprecated Use {@link ClientConnectionConfiguration#setRestPortRange(int)}. - */ - @Deprecated - 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 IGNITE_HOME} folder. If {@code IGNITE_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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestAccessibleFolders()}. - */ - @Deprecated - public String[] getRestAccessibleFolders() { - return restAccessibleFolders; - } - - /** - * Sets array of folders accessible by REST processor for log reading command. - * - * @param restAccessibleFolders Array of folder paths. - * @deprecated Use {@link ClientConnectionConfiguration#setRestAccessibleFolders(String...)}. - */ - @Deprecated - 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. - * @deprecated Use {@link ClientConnectionConfiguration#getRestExecutorService()}. - */ - @Deprecated - 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() - * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorService(ExecutorService)}. - */ - @Deprecated - public void setRestExecutorService(ExecutorService restExecSvc) { - this.restExecSvc = restExecSvc; - } - - /** - * Sets REST executor service shutdown flag. - * - * @param restSvcShutdown REST executor service shutdown flag. - * @see IgniteConfiguration#getRestExecutorService() - * @deprecated Use {@link ClientConnectionConfiguration#setRestExecutorServiceShutdown(boolean)}. - */ - @Deprecated - 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. + * Sets flag indicating whether external {@code REST} access is enabled or not. * - * @return REST executor service shutdown flag. - * @deprecated Use {@link ClientConnectionConfiguration#isRestExecutorServiceShutdown()}. + * @param restEnabled Flag indicating whether external {@code REST} access is enabled or not. + * @deprecated Use {@link ClientConnectionConfiguration}. */ @Deprecated - public boolean getRestExecutorServiceShutdown() { - return restSvcShutdown; + public void setRestEnabled(boolean restEnabled) { + this.restEnabled = restEnabled; } /** @@ -2843,30 +2310,6 @@ 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 ClientConnectionConfiguration#setRestSecretKey(String)}. - */ - @Deprecated - public void setRestSecretKey(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#IGNITE_JETTY_HOST - * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT - * @deprecated Use {@link ClientConnectionConfiguration#getRestSecretKey()}. - */ - @Deprecated - public String getRestSecretKey() { - return restSecretKey; - } - - /** * Gets array of system or environment properties to include into node attributes. * If this array is {@code null}, which is default, then all system and environment * properties will be included. If this array is empty, then none will be included. @@ -2916,42 +2359,6 @@ public class IgniteConfiguration { } /** - * 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 ClientMessageInterceptor - * @return Interceptor. - * @deprecated Use {@link ClientConnectionConfiguration#getClientMessageInterceptor()}. - */ - @Deprecated - public ClientMessageInterceptor 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. - * @deprecated Use {@link ClientConnectionConfiguration#setClientMessageInterceptor(ClientMessageInterceptor)}. - */ - @Deprecated - public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) { - clientMsgInterceptor = interceptor; - } - - /** * Gets GGFS configurations. * * @return GGFS configurations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/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 a45c93d..34b7e5a 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 @@ -1433,28 +1433,8 @@ public class IgnitionEx { if (clientCfg == null) { // If client config is not provided then create config copying values from GridConfiguration. - if (cfg.isRestEnabled()) { + if (cfg.isRestEnabled()) clientCfg = new ClientConnectionConfiguration(); - - clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor()); - clientCfg.setRestExecutorService(cfg.getRestExecutorService()); - clientCfg.setRestExecutorServiceShutdown(cfg.getRestExecutorServiceShutdown()); - clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout()); - clientCfg.setRestJettyPath(cfg.getRestJettyPath()); - clientCfg.setRestPortRange(cfg.getRestPortRange()); - clientCfg.setRestSecretKey(cfg.getRestSecretKey()); - clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer()); - clientCfg.setRestTcpHost(cfg.getRestTcpHost()); - clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay()); - clientCfg.setRestTcpPort(cfg.getRestTcpPort()); - clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize()); - clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount()); - clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize()); - clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit()); - clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth()); - clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory()); - clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled()); - } } else clientCfg = new ClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java index b753146..df86038 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java @@ -68,7 +68,7 @@ public class GridTcpRouterConfiguration { private boolean noDelay = DFLT_TCP_NODELAY; /** Idle timeout. */ - private long idleTimeout = IgniteConfiguration.DFLT_REST_IDLE_TIMEOUT; + private long idleTimeout = ClientConnectionConfiguration.DFLT_REST_IDLE_TIMEOUT; /** Client auth. */ private boolean sslClientAuth; @@ -138,7 +138,7 @@ public class GridTcpRouterConfiguration { * Gets timeout in milliseconds to consider connection idle. If no messages sent by client * within this interval router closes idling connection. * <p/> - * If not specified, default value is {@link org.apache.ignite.configuration.IgniteConfiguration#DFLT_REST_IDLE_TIMEOUT}. + * If not specified, default value is {@link ClientConnectionConfiguration#DFLT_REST_IDLE_TIMEOUT}. * * @return Idle timeout. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 7bf52e1..dea5009 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -113,7 +113,7 @@ public class GridNioServer<T> { private volatile long writeTimeout = DFLT_SES_WRITE_TIMEOUT; /** Idle timeout. */ - private volatile long idleTimeout = IgniteConfiguration.DFLT_REST_IDLE_TIMEOUT; + private volatile long idleTimeout = ClientConnectionConfiguration.DFLT_REST_IDLE_TIMEOUT; /** For test purposes only. */ @SuppressWarnings("UnusedDeclaration") @@ -515,7 +515,7 @@ public class GridNioServer<T> { /** * Gets configurable idle timeout for this session. If not set, default value is - * {@link IgniteConfiguration#DFLT_REST_IDLE_TIMEOUT}. + * {@link ClientConnectionConfiguration#DFLT_REST_IDLE_TIMEOUT}. * * @return Idle timeout in milliseconds. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6f51fa2b/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 ff7b487..d8c3900 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 @@ -103,7 +103,11 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest if (restEnabled()) { cfg.setRestEnabled(true); - cfg.setRestTcpPort(restPort++); + + if (cfg.getClientConnectionConfiguration() == null) + cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); + + cfg.getClientConnectionConfiguration().setRestTcpPort(restPort++); } cfg.setLocalHost("127.0.0.1");
