#ignite-128: Rename properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/818daa15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/818daa15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/818daa15 Branch: refs/heads/ignite-194 Commit: 818daa157a9bf71499041bc07faeecad215a85bf Parents: 6f51fa2 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 4 14:46:15 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 4 14:46:15 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiThreadedSelfTest.java | 6 +- .../client/ClientDefaultCacheSelfTest.java | 2 +- .../ClientTcpSslAuthenticationSelfTest.java | 10 +- ...skExecutionAfterTopologyRestartSelfTest.java | 2 +- .../client/ClientTopologyCacheSelfTest.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 6 +- .../integration/ClientAbstractSelfTest.java | 14 +- .../integration/ClientPreferDirectSelfTest.java | 2 +- .../ClientTcpConnectivitySelfTest.java | 4 +- .../client/router/ClientFailedInitSelfTest.java | 4 +- .../rest/ClientMemcachedProtocolSelfTest.java | 2 +- .../rest/JettyRestProcessorSignedSelfTest.java | 2 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/RestMemcacheProtocolSelfTest.java | 2 +- .../rest/RestProcessorStartSelfTest.java | 2 +- .../processors/rest/RestProcessorTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- .../ignite/jdbc/JdbcConnectionSelfTest.java | 2 +- .../ClientConnectionConfiguration.java | 279 ++++++++++--------- .../configuration/IgniteConfiguration.java | 12 - .../apache/ignite/internal/IgniteKernal.java | 10 +- .../org/apache/ignite/internal/IgnitionEx.java | 15 +- .../router/GridTcpRouterConfiguration.java | 4 +- .../processors/rest/GridRestProcessor.java | 10 +- .../rest/protocols/GridRestProtocolAdapter.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 28 +- .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../node/VisorExecutorServiceConfiguration.java | 4 +- .../visor/node/VisorRestConfiguration.java | 10 +- .../internal/GridLifecycleAwareSelfTest.java | 4 +- .../GridTcpCommunicationBenchmark.java | 2 +- .../hadoop/GridHadoopAbstractSelfTest.java | 2 +- .../http/jetty/GridJettyRestProtocol.java | 4 +- .../org/apache/ignite/yardstick/IgniteNode.java | 4 +- 34 files changed, 228 insertions(+), 234 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java index c347a43..1b2088d 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java @@ -164,12 +164,12 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); + clientCfg.setPort(REST_TCP_PORT_BASE); if (useSsl()) { - clientCfg.setRestTcpSslEnabled(true); + clientCfg.setSslEnabled(true); - clientCfg.setRestTcpSslContextFactory(sslContextFactory()); + clientCfg.setSslContextFactory(sslContextFactory()); } c.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java index fcd92d0..8833e13 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java @@ -79,7 +79,7 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestJettyPath(REST_JETTY_CFG); + clientCfg.setJettyPath(REST_JETTY_CFG); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java index 1e0f0ce..16f5737 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpSslAuthenticationSelfTest.java @@ -69,17 +69,17 @@ public class ClientTcpSslAuthenticationSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(REST_TCP_PORT); - clientCfg.setRestTcpSslEnabled(true); + clientCfg.setPort(REST_TCP_PORT); + clientCfg.setSslEnabled(true); - clientCfg.setRestTcpSslClientAuth(checkClient); - clientCfg.setRestTcpSslClientAuth(checkClient); + clientCfg.setSslClientAuth(checkClient); + clientCfg.setSslClientAuth(checkClient); GridSslBasicContextFactory factory = (GridSslBasicContextFactory)GridTestUtils.sslContextFactory(); factory.setTrustManagers(srvTrustMgr); - clientCfg.setRestTcpSslContextFactory(factory); + clientCfg.setSslContextFactory(factory); c.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java index 8b437d6..cec28eb 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java @@ -39,7 +39,7 @@ public class ClientTcpTaskExecutionAfterTopologyRestartSelfTest extends GridComm ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(PORT); + clientCfg.setPort(PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java index 54940a2..bf0f560 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientTopologyCacheSelfTest.java @@ -277,7 +277,7 @@ public class ClientTopologyCacheSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(BINARY_PORT); + clientCfg.setPort(BINARY_PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java index af69a08..4fbc7df 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -136,13 +136,13 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract if (restEnabled) { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); + clientCfg.setPort(REST_TCP_PORT_BASE); GridSslContextFactory sslCtxFactory = sslContextFactory(); if (sslCtxFactory != null) { - clientCfg.setRestTcpSslEnabled(true); - clientCfg.setRestTcpSslContextFactory(sslCtxFactory); + clientCfg.setSslEnabled(true); + clientCfg.setSslContextFactory(sslCtxFactory); } c.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 9787948..d5541b7 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -193,12 +193,12 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(BINARY_PORT); + clientCfg.setPort(BINARY_PORT); if (useSsl()) { - clientCfg.setRestTcpSslEnabled(true); + clientCfg.setSslEnabled(true); - clientCfg.setRestTcpSslContextFactory(sslContextFactory()); + clientCfg.setSslContextFactory(sslContextFactory()); } cfg.setClientConnectionConfiguration(clientCfg); @@ -212,8 +212,9 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration("replicated"), cacheConfiguration("partitioned"), cacheConfiguration(CACHE_NAME)); - clientCfg.setClientMessageInterceptor(new ClientMessageInterceptor() { - @Override public Object onReceive(@Nullable Object obj) { + clientCfg.setMessageInterceptor(new ClientMessageInterceptor() { + @Override + public Object onReceive(@Nullable Object obj) { if (obj != null) INTERCEPTED_OBJECTS.put(obj, obj); @@ -221,7 +222,8 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { obj + INTERCEPTED_SUF : obj; } - @Override public Object onSend(Object obj) { + @Override + public Object onSend(Object obj) { if (obj != null) INTERCEPTED_OBJECTS.put(obj, obj); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java index a236e2e..d6461c9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java @@ -70,7 +70,7 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(REST_TCP_PORT_BASE); + clientCfg.setPort(REST_TCP_PORT_BASE); c.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java index 4f18e08..8c23094 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientTcpConnectivitySelfTest.java @@ -38,10 +38,10 @@ public class ClientTcpConnectivitySelfTest extends ClientAbstractConnectivitySel ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); if (addr != null) - clientCfg.setRestTcpHost(addr); + clientCfg.setHost(addr); if (port != null) - clientCfg.setRestTcpPort(port); + clientCfg.setPort(port); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java index 70af313..59e6063 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/ClientFailedInitSelfTest.java @@ -70,8 +70,8 @@ public class ClientFailedInitSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(BINARY_PORT); - clientCfg.setRestJettyPath(REST_JETTY_CFG); + clientCfg.setPort(BINARY_PORT); + clientCfg.setJettyPath(REST_JETTY_CFG); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java index c779eb8..fd6d1f6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ClientMemcachedProtocolSelfTest.java @@ -81,7 +81,7 @@ public class ClientMemcachedProtocolSelfTest extends AbstractRestProcessorSelfTe assert cfg.getClientConnectionConfiguration() != null; if (customPort != null) - cfg.getClientConnectionConfiguration().setRestTcpPort(customPort); + cfg.getClientConnectionConfiguration().setPort(customPort); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java index 6a522e5..636b44e 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorSignedSelfTest.java @@ -37,7 +37,7 @@ public class JettyRestProcessorSignedSelfTest extends JettyRestProcessorAbstract assert cfg.getClientConnectionConfiguration() != null; - cfg.getClientConnectionConfiguration().setRestSecretKey(REST_SECRET_KEY); + cfg.getClientConnectionConfiguration().setSecretKey(REST_SECRET_KEY); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java index b4d100d..b029da9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java @@ -91,7 +91,7 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(PORT); + clientCfg.setPort(PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java index a996352..af65765 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java @@ -85,7 +85,7 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(PORT); + clientCfg.setPort(PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java index 8db093a..f51d237 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java @@ -61,7 +61,7 @@ public class RestProcessorStartSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(TCP_PORT); + clientCfg.setPort(TCP_PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java index e096f1e..102db49 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java @@ -115,7 +115,7 @@ public class RestProcessorTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); // Ensure - no authentication. - clientCfg.setRestSecretKey(null); + clientCfg.setSecretKey(null); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java index f160910..817b8e1 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java @@ -96,7 +96,7 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setRestTcpPort(BINARY_PORT); + clientCfg.setPort(BINARY_PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java index 733714e..3002bf8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java @@ -65,7 +65,7 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest { ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); if (!gridName.endsWith("0")) - clientCfg.setRestTcpPort(CUSTOM_PORT); + clientCfg.setPort(CUSTOM_PORT); cfg.setClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 f3fc369..9c84aa8 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 @@ -35,22 +35,25 @@ public class ClientConnectionConfiguration { public static final boolean DFLT_TCP_NODELAY = true; /** Default TCP direct buffer flag. */ - public static final boolean DFLT_REST_TCP_DIRECT_BUF = false; + public static final boolean DFLT_TCP_DIRECT_BUF = false; /** Default REST idle timeout. */ - public static final int DFLT_REST_IDLE_TIMEOUT = 7000; + public static final int DFLT_IDLE_TIMEOUT = 7000; /** Default rest port range. */ - public static final int DFLT_REST_PORT_RANGE = 100; + public static final int DFLT_PORT_RANGE = 100; /** Default size of REST thread pool. */ - public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT; + public static final int DFLT_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; + public static final int DFLT_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT; + + /** Default keep alive time for REST thread pool. */ + public static final long DFLT_KEEP_ALIVE_TIME = 0; /** Default max queue capacity of REST thread pool. */ - public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE; + public static final int DFLT_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE; /** Default socket send and receive buffer size. */ public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024; @@ -59,55 +62,55 @@ public class ClientConnectionConfiguration { private String jettyPath; /** REST secret key. */ - private String restSecretKey; + private String secretKey; /** TCP host. */ - private String restTcpHost; + private String host; /** TCP port. */ - private int restTcpPort = DFLT_TCP_PORT; + private int port = DFLT_TCP_PORT; /** TCP no delay flag. */ - private boolean restTcpNoDelay = DFLT_TCP_NODELAY; + private boolean noDelay = DFLT_TCP_NODELAY; /** REST TCP direct buffer flag. */ - private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF; + private boolean directBuf = DFLT_TCP_DIRECT_BUF; /** REST TCP send buffer size. */ - private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE; + private int sndBufSize = DFLT_SOCK_BUF_SIZE; /** REST TCP receive buffer size. */ - private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE; + private int rcvBufSize = DFLT_SOCK_BUF_SIZE; /** REST TCP send queue limit. */ - private int restTcpSndQueueLimit; + private int sndQueueLimit; /** REST TCP selector count. */ - private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors()); + private int selectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors()); /** Idle timeout. */ - private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT; + private long idleTimeout = DFLT_IDLE_TIMEOUT; /** SSL enable flag, default is disabled. */ - private boolean restTcpSslEnabled; + private boolean sslEnabled; /** SSL need client auth flag. */ - private boolean restTcpSslClientAuth; + private boolean sslClientAuth; /** SSL context factory for rest binary server. */ - private GridSslContextFactory restTcpSslCtxFactory; + private GridSslContextFactory sslCtxFactory; /** Port range */ - private int restPortRange = DFLT_REST_PORT_RANGE; + private int portRange = DFLT_PORT_RANGE; /** REST requests executor service. */ - private ExecutorService restExecSvc; + private ExecutorService execSvc; /** REST executor service shutdown flag. */ - private boolean restSvcShutdown = true; + private boolean execSvcShutdown = true; /** Client message interceptor. */ - private ClientMessageInterceptor clientMsgInterceptor; + private ClientMessageInterceptor msgInterceptor; /** * Creates client connection configuration with all default values. @@ -125,24 +128,24 @@ public class ClientConnectionConfiguration { public ClientConnectionConfiguration(ClientConnectionConfiguration cfg) { assert cfg != null; - clientMsgInterceptor = cfg.getClientMessageInterceptor(); - 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(); + msgInterceptor = cfg.getMessageInterceptor(); + execSvc = cfg.getExecutorService(); + execSvcShutdown = cfg.isExecutorServiceShutdown(); + idleTimeout = cfg.getIdleTimeout(); + jettyPath = cfg.getJettyPath(); + portRange = cfg.getPortRange(); + secretKey = cfg.getSecretKey(); + directBuf = cfg.isDirectBuffer(); + host = cfg.getHost(); + noDelay = cfg.isNoDelay(); + port = cfg.getPort(); + rcvBufSize = cfg.getReceiveBufferSize(); + selectorCnt = cfg.getSelectorCount(); + sndBufSize = cfg.getSendBufferSize(); + sndQueueLimit = cfg.getSendQueueLimit(); + sslClientAuth = cfg.isSslClientAuth(); + sslCtxFactory = cfg.getSslContextFactory(); + sslEnabled = cfg.isSslEnabled(); } /** @@ -152,7 +155,7 @@ public class ClientConnectionConfiguration { * * @param jettyPath Path to {@code JETTY} XML configuration file. */ - public void setRestJettyPath(String jettyPath) { + public void setJettyPath(String jettyPath) { this.jettyPath = jettyPath; } @@ -169,17 +172,17 @@ public class ClientConnectionConfiguration { * @see IgniteSystemProperties#IGNITE_JETTY_HOST * @see IgniteSystemProperties#IGNITE_JETTY_PORT */ - public String getRestJettyPath() { + public String getJettyPath() { return jettyPath; } /** * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled. * - * @param restSecretKey REST secret key. + * @param secretKey REST secret key. */ - public void setRestSecretKey(@Nullable String restSecretKey) { - this.restSecretKey = restSecretKey; + public void setSecretKey(@Nullable String secretKey) { + this.secretKey = secretKey; } /** @@ -189,8 +192,8 @@ public class ClientConnectionConfiguration { * @see IgniteSystemProperties#IGNITE_JETTY_HOST * @see IgniteSystemProperties#IGNITE_JETTY_PORT */ - @Nullable public String getRestSecretKey() { - return restSecretKey; + @Nullable public String getSecretKey() { + return secretKey; } /** @@ -205,17 +208,17 @@ public class ClientConnectionConfiguration { * * @return TCP host. */ - public String getRestTcpHost() { - return restTcpHost; + public String getHost() { + return host; } /** * Sets host for TCP binary protocol server. * - * @param restTcpHost TCP host. + * @param host TCP host. */ - public void setRestTcpHost(String restTcpHost) { - this.restTcpHost = restTcpHost; + public void setHost(String host) { + this.host = host; } /** @@ -225,17 +228,17 @@ public class ClientConnectionConfiguration { * * @return TCP port. */ - public int getRestTcpPort() { - return restTcpPort; + public int getPort() { + return port; } /** * Sets port for TCP binary protocol server. * - * @param restTcpPort TCP port. + * @param port TCP port. */ - public void setRestTcpPort(int restTcpPort) { - this.restTcpPort = restTcpPort; + public void setPort(int port) { + this.port = port; } /** @@ -247,18 +250,18 @@ public class ClientConnectionConfiguration { * * @return Whether {@code TCP_NODELAY} option should be enabled. */ - public boolean isRestTcpNoDelay() { - return restTcpNoDelay; + public boolean isNoDelay() { + return noDelay; } /** * 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() + * @param noDelay {@code True} if option should be enabled. + * @see #isNoDelay() */ - public void setRestTcpNoDelay(boolean restTcpNoDelay) { - this.restTcpNoDelay = restTcpNoDelay; + public void setNoDelay(boolean noDelay) { + this.noDelay = noDelay; } /** @@ -269,18 +272,18 @@ public class ClientConnectionConfiguration { * * @return Whether direct buffer should be used. */ - public boolean isRestTcpDirectBuffer() { - return restTcpDirectBuf; + public boolean isDirectBuffer() { + return directBuf; } /** * Sets whether to use direct buffer for REST TCP server. * - * @param restTcpDirectBuf {@code True} if option should be enabled. - * @see #isRestTcpDirectBuffer() + * @param directBuf {@code True} if option should be enabled. + * @see #isDirectBuffer() */ - public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) { - this.restTcpDirectBuf = restTcpDirectBuf; + public void setDirectBuffer(boolean directBuf) { + this.directBuf = directBuf; } /** @@ -288,18 +291,18 @@ public class ClientConnectionConfiguration { * * @return REST TCP server send buffer size (0 for default). */ - public int getRestTcpSendBufferSize() { - return restTcpSndBufSize; + public int getSendBufferSize() { + return sndBufSize; } /** * Sets REST TCP server send buffer size. * - * @param restTcpSndBufSize Send buffer size. - * @see #getRestTcpSendBufferSize() + * @param sndBufSize Send buffer size. + * @see #getSendBufferSize() */ - public void setRestTcpSendBufferSize(int restTcpSndBufSize) { - this.restTcpSndBufSize = restTcpSndBufSize; + public void setSendBufferSize(int sndBufSize) { + this.sndBufSize = sndBufSize; } /** @@ -307,18 +310,18 @@ public class ClientConnectionConfiguration { * * @return REST TCP server receive buffer size (0 for default). */ - public int getRestTcpReceiveBufferSize() { - return restTcpRcvBufSize; + public int getReceiveBufferSize() { + return rcvBufSize; } /** * Sets REST TCP server receive buffer size. * - * @param restTcpRcvBufSize Receive buffer size. - * @see #getRestTcpReceiveBufferSize() + * @param rcvBufSize Receive buffer size. + * @see #getReceiveBufferSize() */ - public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) { - this.restTcpRcvBufSize = restTcpRcvBufSize; + public void setReceiveBufferSize(int rcvBufSize) { + this.rcvBufSize = rcvBufSize; } /** @@ -327,18 +330,18 @@ public class ClientConnectionConfiguration { * * @return REST TCP server send queue limit (0 for unlimited). */ - public int getRestTcpSendQueueLimit() { - return restTcpSndQueueLimit; + public int getSendQueueLimit() { + return sndQueueLimit; } /** * Sets REST TCP server send queue limit. * - * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited). - * @see #getRestTcpSendQueueLimit() + * @param sndQueueLimit REST TCP server send queue limit (0 for unlimited). + * @see #getSendQueueLimit() */ - public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) { - this.restTcpSndQueueLimit = restTcpSndQueueLimit; + public void setSendQueueLimit(int sndQueueLimit) { + this.sndQueueLimit = sndQueueLimit; } /** @@ -347,18 +350,18 @@ public class ClientConnectionConfiguration { * * @return Number of selector threads for REST TCP server. */ - public int getRestTcpSelectorCount() { - return restTcpSelectorCnt; + public int getSelectorCount() { + return selectorCnt; } /** * Sets number of selector threads for REST TCP server. * - * @param restTcpSelectorCnt Number of selector threads for REST TCP server. - * @see #getRestTcpSelectorCount() + * @param selectorCnt Number of selector threads for REST TCP server. + * @see #getSelectorCount() */ - public void setRestTcpSelectorCount(int restTcpSelectorCnt) { - this.restTcpSelectorCnt = restTcpSelectorCnt; + public void setSelectorCount(int selectorCnt) { + this.selectorCnt = selectorCnt; } /** @@ -369,18 +372,18 @@ public class ClientConnectionConfiguration { * * @return Idle timeout in milliseconds. */ - public long getRestIdleTimeout() { - return restIdleTimeout; + public long getIdleTimeout() { + return idleTimeout; } /** * Sets idle timeout for REST server. * - * @param restIdleTimeout Idle timeout in milliseconds. - * @see #getRestIdleTimeout() + * @param idleTimeout Idle timeout in milliseconds. + * @see #getIdleTimeout() */ - public void setRestIdleTimeout(long restIdleTimeout) { - this.restIdleTimeout = restIdleTimeout; + public void setIdleTimeout(long idleTimeout) { + this.idleTimeout = idleTimeout; } /** @@ -391,8 +394,8 @@ public class ClientConnectionConfiguration { * * @return {@code True} if SSL should be enabled. */ - public boolean isRestTcpSslEnabled() { - return restTcpSslEnabled; + public boolean isSslEnabled() { + return sslEnabled; } /** @@ -401,10 +404,10 @@ public class ClientConnectionConfiguration { * 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. + * @param sslEnabled {@code True} if SSL should be enabled. */ - public void setRestTcpSslEnabled(boolean restTcpSslEnabled) { - this.restTcpSslEnabled = restTcpSslEnabled; + public void setSslEnabled(boolean sslEnabled) { + this.sslEnabled = sslEnabled; } /** @@ -413,17 +416,17 @@ public class ClientConnectionConfiguration { * * @return Whether or not client authentication is required. */ - public boolean isRestTcpSslClientAuth() { - return restTcpSslClientAuth; + public boolean isSslClientAuth() { + return sslClientAuth; } /** * Sets flag indicating whether or not SSL client authentication is required. * - * @param needClientAuth Whether or not client authentication is required. + * @param sslClientAuth Whether or not client authentication is required. */ - public void setRestTcpSslClientAuth(boolean needClientAuth) { - restTcpSslClientAuth = needClientAuth; + public void setSslClientAuth(boolean sslClientAuth) { + this.sslClientAuth = sslClientAuth; } /** @@ -432,19 +435,19 @@ public class ClientConnectionConfiguration { * @return SslContextFactory instance. * @see GridSslContextFactory */ - public GridSslContextFactory getRestTcpSslContextFactory() { - return restTcpSslCtxFactory; + public GridSslContextFactory getSslContextFactory() { + return sslCtxFactory; } /** * 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}. + * {@link #setSslEnabled(boolean)} is set to {@code true}. * - * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory} + * @param sslCtxFactory Instance of {@link GridSslContextFactory} */ - public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) { - this.restTcpSslCtxFactory = restTcpSslCtxFactory; + public void setSslContextFactory(GridSslContextFactory sslCtxFactory) { + this.sslCtxFactory = sslCtxFactory; } /** @@ -452,17 +455,17 @@ public class ClientConnectionConfiguration { * * @return Number of ports to try. */ - public int getRestPortRange() { - return restPortRange; + public int getPortRange() { + return portRange; } /** * Sets number of ports to try if configured one is in use. * - * @param restPortRange Port range. + * @param portRange Port range. */ - public void setRestPortRange(int restPortRange) { - this.restPortRange = restPortRange; + public void setPortRange(int portRange) { + this.portRange = portRange; } /** @@ -472,34 +475,34 @@ public class ClientConnectionConfiguration { * 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> + * <li>Core pool size - {@link #DFLT_CORE_THREAD_CNT}</li> + * <li>Max pool size - {@link #DFLT_MAX_THREAD_CNT}</li> + * <li>Queue capacity - {@link #DFLT_THREADPOOL_QUEUE_CAP}</li> * </ul> * * @return Thread pool implementation to be used for processing of client * messages. */ - public ExecutorService getRestExecutorService() { - return restExecSvc; + public ExecutorService getExecutorService() { + return execSvc; } /** * Sets thread pool to use for processing of client messages (REST requests). * - * @param restExecSvc Thread pool to use for processing of client messages. + * @param execSvc Thread pool to use for processing of client messages. */ - public void setRestExecutorService(ExecutorService restExecSvc) { - this.restExecSvc = restExecSvc; + public void setExecutorService(ExecutorService execSvc) { + this.execSvc = execSvc; } /** * Sets REST executor service shutdown flag. * - * @param restSvcShutdown REST executor service shutdown flag. + * @param execSvcShutdown REST executor service shutdown flag. */ - public void setRestExecutorServiceShutdown(boolean restSvcShutdown) { - this.restSvcShutdown = restSvcShutdown; + public void setExecutorServiceShutdown(boolean execSvcShutdown) { + this.execSvcShutdown = execSvcShutdown; } /** @@ -511,8 +514,8 @@ public class ClientConnectionConfiguration { * * @return REST executor service shutdown flag. */ - public boolean isRestExecutorServiceShutdown() { - return restSvcShutdown; + public boolean isExecutorServiceShutdown() { + return execSvcShutdown; } /** @@ -529,8 +532,8 @@ public class ClientConnectionConfiguration { * @see ClientMessageInterceptor * @return Interceptor. */ - @Nullable public ClientMessageInterceptor getClientMessageInterceptor() { - return clientMsgInterceptor; + @Nullable public ClientMessageInterceptor getMessageInterceptor() { + return msgInterceptor; } /** @@ -543,7 +546,7 @@ public class ClientConnectionConfiguration { * * @param interceptor Interceptor. */ - public void setClientMessageInterceptor(ClientMessageInterceptor interceptor) { - clientMsgInterceptor = interceptor; + public void setMessageInterceptor(ClientMessageInterceptor interceptor) { + msgInterceptor = interceptor; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 0778a89..5ab3fd4 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 @@ -160,18 +160,6 @@ public class IgniteConfiguration { /** Default size of management thread pool. */ public static final int DFLT_MGMT_THREAD_CNT = 4; - /** Default size of REST thread pool. */ - public static final int DFLT_REST_CORE_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT; - - /** Default max size of REST thread pool. */ - public static final int DFLT_REST_MAX_THREAD_CNT = DFLT_PUBLIC_CORE_THREAD_CNT; - - /** Default keep alive time for REST thread pool. */ - public static final long DFLT_REST_KEEP_ALIVE_TIME = 0; - - /** Default max queue capacity of REST thread pool. */ - public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE; - /** Default segmentation policy. */ public static final GridSegmentationPolicy DFLT_SEG_PLC = STOP; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index c348f51..1b4fd4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1363,7 +1363,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit // Save port range, port numbers will be stored by rest processor at runtime. if (cfg.getClientConnectionConfiguration() != null) - add(attrs, ATTR_REST_PORT_RANGE, cfg.getClientConnectionConfiguration().getRestPortRange()); + add(attrs, ATTR_REST_PORT_RANGE, cfg.getClientConnectionConfiguration().getPortRange()); try { AuthenticationSpi authSpi = cfg.getAuthenticationSpi(); @@ -1485,8 +1485,8 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); if (clientCfg != null) { - restExecSvcMBean = clientCfg.getRestExecutorService() != null ? - registerExecutorMBean(clientCfg.getRestExecutorService(), "GridRestExecutor") : null; + restExecSvcMBean = clientCfg.getExecutorService() != null ? + registerExecutorMBean(clientCfg.getExecutorService(), "GridRestExecutor") : null; } } @@ -2433,8 +2433,8 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit F.copy(objs, cfg.getSegmentationResolvers()); if (cfg.getClientConnectionConfiguration() != null) - F.copy(objs, cfg.getClientConnectionConfiguration().getClientMessageInterceptor(), - cfg.getClientConnectionConfiguration().getRestTcpSslContextFactory()); + F.copy(objs, cfg.getClientConnectionConfiguration().getMessageInterceptor(), + cfg.getClientConnectionConfiguration().getSslContextFactory()); F.copy(objs, cfg.getMarshaller(), cfg.getGridLogger(), cfg.getMBeanServer()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 34b7e5a..6d109af 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 @@ -85,6 +85,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; +import static org.apache.ignite.configuration.ClientConnectionConfiguration.*; import static org.apache.ignite.configuration.IgniteConfiguration.*; import static org.apache.ignite.internal.IgniteComponentType.*; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*; @@ -1581,7 +1582,7 @@ public class IgnitionEx { new LinkedBlockingQueue<Runnable>()); } - restExecSvc = clientCfg != null ? clientCfg.getRestExecutorService() : null; + restExecSvc = clientCfg != null ? clientCfg.getExecutorService() : null; if (restExecSvc != null && !cfg.isRestEnabled()) { U.warn(log, "REST executor service is configured, but REST is disabled in configuration " + @@ -1592,13 +1593,13 @@ public class IgnitionEx { restExecSvc = new IgniteThreadPoolExecutor( "rest-" + cfg.getGridName(), - DFLT_REST_CORE_THREAD_CNT, - DFLT_REST_MAX_THREAD_CNT, - DFLT_REST_KEEP_ALIVE_TIME, - new LinkedBlockingQueue<Runnable>(DFLT_REST_THREADPOOL_QUEUE_CAP) + DFLT_CORE_THREAD_CNT, + DFLT_MAX_THREAD_CNT, + DFLT_KEEP_ALIVE_TIME, + new LinkedBlockingQueue<Runnable>(DFLT_THREADPOOL_QUEUE_CAP) ); - clientCfg.setRestExecutorService(restExecSvc); + clientCfg.setExecutorService(restExecSvc); } utilityCacheExecSvc = new IgniteThreadPoolExecutor( @@ -1613,7 +1614,7 @@ public class IgnitionEx { mgmtSvcShutdown = cfg.getManagementExecutorServiceShutdown(); p2pSvcShutdown = cfg.getPeerClassLoadingExecutorServiceShutdown(); ggfsSvcShutdown = cfg.getGgfsExecutorServiceShutdown(); - restSvcShutdown = clientCfg != null && clientCfg.isRestExecutorServiceShutdown(); + restSvcShutdown = clientCfg != null && clientCfg.isExecutorServiceShutdown(); if (marsh == null) { if (!U.isHotSpot()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 df86038..9e3a544 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 = ClientConnectionConfiguration.DFLT_REST_IDLE_TIMEOUT; + private long idleTimeout = ClientConnectionConfiguration.DFLT_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 ClientConnectionConfiguration#DFLT_REST_IDLE_TIMEOUT}. + * If not specified, default value is {@link ClientConnectionConfiguration#DFLT_IDLE_TIMEOUT}. * * @return Idle timeout. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index 215805f..fd17021 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -128,7 +128,7 @@ public class GridRestProcessor extends GridProcessorAdapter { fut.setWorker(w); try { - config().getRestExecutorService().execute(w); + config().getExecutorService().execute(w); } catch (RejectedExecutionException e) { U.error(log, "Failed to execute worker due to execution rejection " + @@ -328,13 +328,13 @@ public class GridRestProcessor extends GridProcessorAdapter { /** * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} - * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()} + * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getMessageInterceptor()} * to all user parameters in the request. * * @param req Client request. */ private void interceptRequest(GridRestRequest req) { - ClientMessageInterceptor interceptor = config().getClientMessageInterceptor(); + ClientMessageInterceptor interceptor = config().getMessageInterceptor(); if (interceptor == null) return; @@ -375,14 +375,14 @@ public class GridRestProcessor extends GridProcessorAdapter { /** * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} from - * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getClientMessageInterceptor()} + * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getMessageInterceptor()} * to all user objects in the response. * * @param res Response. * @param req Request. */ private void interceptResponse(GridRestResponse res, GridRestRequest req) { - ClientMessageInterceptor interceptor = config().getClientMessageInterceptor(); + ClientMessageInterceptor interceptor = config().getMessageInterceptor(); if (interceptor != null && res.getResponse() != null) { switch (req.command()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java index 8d55685..4e45c46 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java @@ -67,7 +67,7 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol { log = ctx.log(getClass()); - secretKey = ctx.config().getClientConnectionConfiguration().getRestSecretKey(); + secretKey = ctx.config().getClientConnectionConfiguration().getSecretKey(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index 6032244..8457618 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -167,8 +167,8 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { SSLContext sslCtx = null; - if (cfg.isRestTcpSslEnabled()) { - GridSslContextFactory factory = cfg.getRestTcpSslContextFactory(); + if (cfg.isSslEnabled()) { + GridSslContextFactory factory = cfg.getSslContextFactory(); if (factory == null) // Thrown SSL exception instead of IgniteCheckedException for writing correct warning message into log. @@ -177,9 +177,9 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { sslCtx = factory.createSslContext(); } - int lastPort = cfg.getRestTcpPort() + cfg.getRestPortRange() - 1; + int lastPort = cfg.getPort() + cfg.getPortRange() - 1; - for (int port0 = cfg.getRestTcpPort(); port0 <= lastPort; port0++) { + for (int port0 = cfg.getPort(); port0 <= lastPort; port0++) { if (startTcpServer(host, port0, lsnr, parser, sslCtx, cfg)) { port = port0; @@ -191,7 +191,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { } U.warn(log, "Failed to start TCP binary REST server (possibly all ports in range are in use) " + - "[firstPort=" + cfg.getRestTcpPort() + ", lastPort=" + lastPort + ", host=" + host + ']'); + "[firstPort=" + cfg.getPort() + ", lastPort=" + lastPort + ", host=" + host + ']'); } catch (SSLException e) { U.warn(log, "Failed to start " + name() + " protocol on port " + port + ": " + e.getMessage(), @@ -238,7 +238,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { * @throws IOException If failed to resolve REST host. */ private InetAddress resolveRestTcpHost(IgniteConfiguration cfg) throws IOException { - String host = cfg.getClientConnectionConfiguration().getRestTcpHost(); + String host = cfg.getClientConnectionConfiguration().getHost(); if (host == null) host = cfg.getLocalHost(); @@ -270,7 +270,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { sslFilter.directMode(true); - boolean auth = cfg.isRestTcpSslClientAuth(); + boolean auth = cfg.isSslClientAuth(); sslFilter.wantClientAuth(auth); @@ -289,20 +289,20 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { .port(port) .listener(lsnr) .logger(log) - .selectorCount(cfg.getRestTcpSelectorCount()) + .selectorCount(cfg.getSelectorCount()) .gridName(ctx.gridName()) - .tcpNoDelay(cfg.isRestTcpNoDelay()) - .directBuffer(cfg.isRestTcpDirectBuffer()) + .tcpNoDelay(cfg.isNoDelay()) + .directBuffer(cfg.isDirectBuffer()) .byteOrder(ByteOrder.nativeOrder()) - .socketSendBufferSize(cfg.getRestTcpSendBufferSize()) - .socketReceiveBufferSize(cfg.getRestTcpReceiveBufferSize()) - .sendQueueLimit(cfg.getRestTcpSendQueueLimit()) + .socketSendBufferSize(cfg.getSendBufferSize()) + .socketReceiveBufferSize(cfg.getReceiveBufferSize()) + .sendQueueLimit(cfg.getSendQueueLimit()) .filters(filters) .directMode(true) .messageWriter(msgWriter) .build(); - srv.idleTimeout(cfg.getRestIdleTimeout()); + srv.idleTimeout(cfg.getIdleTimeout()); srv.start(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 dea5009..0bfa504 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 = ClientConnectionConfiguration.DFLT_REST_IDLE_TIMEOUT; + private volatile long idleTimeout = ClientConnectionConfiguration.DFLT_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 ClientConnectionConfiguration#DFLT_REST_IDLE_TIMEOUT}. + * {@link ClientConnectionConfiguration#DFLT_IDLE_TIMEOUT}. * * @return Idle timeout in milliseconds. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java index b279a88..86b4106 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java @@ -74,8 +74,8 @@ public class VisorExecutorServiceConfiguration implements Serializable { ClientConnectionConfiguration cc = c.getClientConnectionConfiguration(); if (cc != null) { - cfg.restExecutorService(compactClass(cc.getRestExecutorService())); - cfg.restExecutorServiceShutdown(cc.isRestExecutorServiceShutdown()); + cfg.restExecutorService(compactClass(cc.getExecutorService())); + cfg.restExecutorServiceShutdown(cc.isExecutorServiceShutdown()); } return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java index 37ce00d..a3185d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java @@ -75,13 +75,13 @@ public class VisorRestConfiguration implements Serializable { cfg.restEnabled(restEnabled); if (restEnabled) { - cfg.tcpSslEnabled(clnCfg.isRestTcpSslEnabled()); - cfg.jettyPath(clnCfg.getRestJettyPath()); + cfg.tcpSslEnabled(clnCfg.isSslEnabled()); + cfg.jettyPath(clnCfg.getJettyPath()); cfg.jettyHost(getProperty(IGNITE_JETTY_HOST)); cfg.jettyPort(intValue(IGNITE_JETTY_PORT, null)); - cfg.tcpHost(clnCfg.getRestTcpHost()); - cfg.tcpPort(clnCfg.getRestTcpPort()); - cfg.tcpSslContextFactory(compactClass(clnCfg.getRestTcpSslContextFactory())); + cfg.tcpHost(clnCfg.getHost()); + cfg.tcpPort(clnCfg.getPort()); + cfg.tcpSslContextFactory(compactClass(clnCfg.getSslContextFactory())); } return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java index 68eee85..60b8da1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java @@ -155,7 +155,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); - clientCfg.setClientMessageInterceptor(interceptor); + clientCfg.setMessageInterceptor(interceptor); cfg.setClientConnectionConfiguration(clientCfg); @@ -169,7 +169,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe TestContextFactory ctxFactory = new TestContextFactory(); - clientCfg.setRestTcpSslContextFactory(ctxFactory); + clientCfg.setSslContextFactory(ctxFactory); lifecycleAwares.add(ctxFactory); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java index 73561fe..56c00fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTcpCommunicationBenchmark.java @@ -573,7 +573,7 @@ package org.apache.ignite.loadtests.communication; // GridTcpCommunicationSpi spi = new GridTcpCommunicationSpi(); // // spi.setSharedMemoryPort(-1); -// spi.setTcpNoDelay(true); +// spi.setNoDelay(true); // spi.setLocalAddress("127.0.0.1"); // // return spi; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/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 d8c3900..b1d2a0e 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 @@ -107,7 +107,7 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest if (cfg.getClientConnectionConfiguration() == null) cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); - cfg.getClientConnectionConfiguration().setRestTcpPort(restPort++); + cfg.getClientConnectionConfiguration().setPort(restPort++); } cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java index 11523ba..067a48c 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java @@ -122,7 +122,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter { } }, log); - String jettyPath = config().getRestJettyPath(); + String jettyPath = config().getJettyPath(); final URL cfgUrl; @@ -154,7 +154,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter { int initPort = connector.getPort(); - int lastPort = initPort + config().getRestPortRange() - 1; + int lastPort = initPort + config().getPortRange() - 1; for (port = initPort; port <= lastPort; port++) { connector.setPort(port); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/818daa15/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b07d1f0..325d46b 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -88,10 +88,10 @@ public class IgniteNode implements BenchmarkServer { if (args.restTcpPort() != 0) { ClientConnectionConfiguration ccc = new ClientConnectionConfiguration(); - ccc.setRestTcpPort(args.restTcpPort()); + ccc.setPort(args.restTcpPort()); if (args.restTcpHost() != null) - ccc.setRestTcpHost(args.restTcpHost()); + ccc.setHost(args.restTcpHost()); c.setClientConnectionConfiguration(ccc); }
