Repository: ignite Updated Branches: refs/heads/ignite-10189 d9d62bea3 -> 83f786943
IGNITE-10189 WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83f78694 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83f78694 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83f78694 Branch: refs/heads/ignite-10189 Commit: 83f786943f6812daf91fb774393ff9499ff7058f Parents: d9d62be Author: Alexey Kuznetsov <[email protected]> Authored: Wed Dec 5 16:22:39 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Dec 5 16:22:39 2018 +0700 ---------------------------------------------------------------------- .../ignite/internal/commandline/Arguments.java | 20 ++++++------------- .../internal/commandline/CommandHandler.java | 21 +++++--------------- 2 files changed, 11 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/83f78694/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java index ff04fc3..abd27bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java @@ -71,10 +71,10 @@ public class Arguments { */ private String walArgs; - /** Ping timeout for grid client. See {@link GridClientConfiguration#pingTimeout}. */ + /** Ping timeout for grid client. See {@link GridClientConfiguration#getPingTimeout()}. */ private long pingTimeout; - /** Ping interval for grid client. See {@link GridClientConfiguration#pingInterval}. */ + /** Ping interval for grid client. See {@link GridClientConfiguration#getPingInterval()}. */ private long pingInterval; /** SSL Protocol. */ @@ -116,8 +116,8 @@ public class Arguments { * @param cacheArgs --cache subcommand arguments. * @param walAct WAL action. * @param walArgs WAL args. - * @param pingTimeout Ping timeout. See {@link GridClientConfiguration#pingTimeout}. - * @param pingInterval Ping interval. See {@link GridClientConfiguration#pingInterval}. + * @param pingTimeout Ping timeout. See {@link GridClientConfiguration#getPingTimeout()}. + * @param pingInterval Ping interval. See {@link GridClientConfiguration#getPingInterval()}. * @param autoConfirmation Auto confirmation flag. * @param sslProtocol SSL Protocol. * @param sslCipherSuites SSL cipher suites. @@ -156,7 +156,6 @@ public class Arguments { this.autoConfirmation = autoConfirmation; - this.sslEnable = sslEnable; this.sslProtocol = sslProtocol; this.sslCipherSuites = sslCipherSuites; @@ -262,7 +261,7 @@ public class Arguments { } /** - * See {@link GridClientConfiguration#pingTimeout}. + * See {@link GridClientConfiguration#getPingInterval()}. * * @return Ping timeout. */ @@ -271,7 +270,7 @@ public class Arguments { } /** - * See {@link GridClientConfiguration#pingInterval}. + * See {@link GridClientConfiguration#getPingInterval()}. * * @return Ping interval. */ @@ -287,13 +286,6 @@ public class Arguments { } /** - * @return {@code true} if SSL should be used. - */ - public boolean isSslEnable() { - return sslEnable; - } - - /** * @return SSL protocol */ public String sslProtocol() { http://git-wip-us.apache.org/repos/asf/ignite/blob/83f78694/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java index 076d322..49800d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java @@ -201,9 +201,6 @@ public class CommandHandler { // SSL configuration section /** */ - private static final String CMD_SSL_ENABLED = "--ssl_enabled"; - - /** */ private static final String CMD_SSL_PROTOCOL = "--ssl-protocol"; /** */ @@ -247,7 +244,6 @@ public class CommandHandler { AUX_COMMANDS.add(CMD_PING_INTERVAL); AUX_COMMANDS.add(CMD_PING_TIMEOUT); - AUX_COMMANDS.add(CMD_SSL_ENABLED); AUX_COMMANDS.add(CMD_SSL_PROTOCOL); AUX_COMMANDS.add(CMD_SSL_CIPHER_SUITES); @@ -370,7 +366,6 @@ public class CommandHandler { private static final String COMMON_OPTIONS = String.join(" ", op(CMD_HOST, "HOST_OR_IP"), op(CMD_PORT, "PORT"), op(CMD_USER, "USER"), op(CMD_PASSWORD, "PASSWORD"), op(CMD_PING_INTERVAL, "PING_INTERVAL"), op(CMD_PING_TIMEOUT, "PING_TIMEOUT"), - op(CMD_SSL_ENABLED), op(CMD_SSL_PROTOCOL, "SSL_PROTOCOL[, SSL_PROTOCOL_2, ...]"), op(CMD_SSL_CIPHER_SUITES, "SSL_CIPHER_1[, SSL_CIPHER_2, ...]"), op(CMD_SSL_KEY_ALGORITHM, "SSL_KEY_ALGORITHM"), @@ -1834,8 +1829,6 @@ public class CommandHandler { VisorTxTaskArg txArgs = null; - boolean sslEnable = false; - String sslProtocol = SslContextFactory.DFLT_SSL_PROTOCOL; String sslCipherSuites = ""; @@ -1966,10 +1959,6 @@ public class CommandHandler { break; - case CMD_SSL_ENABLED: - sslEnable = true; - - break; case CMD_SSL_PROTOCOL: sslProtocol = nextArg("Expected SSL protocol"); @@ -2041,7 +2030,7 @@ public class CommandHandler { txArgs, cacheArgs, walAct, walArgs, pingTimeout, pingInterval, autoConfirmation, - sslEnable, sslProtocol, sslCipherSuites, + sslProtocol, sslCipherSuites, sslKeyAlgorithm, sslKeyStorePath, sslKeyStorePassword, sslKeyStoreType, sslTrustStorePath, sslTrustStorePassword, sslTrustStoreType); } @@ -2587,8 +2576,8 @@ public class CommandHandler { log(i("PING_TIMEOUT=" + DFLT_PING_TIMEOUT, 2)); log(i("SSL_PROTOCOL=" + SslContextFactory.DFLT_SSL_PROTOCOL, 2)); log(i("SSL_KEY_ALGORITHM=" + SslContextFactory.DFLT_KEY_ALGORITHM, 2)); - log(i("SSL_KEY_STORE_TYPE=" + SslContextFactory.DFLT_STORE_TYPE, 2)); - log(i("SSL_TRUST_STORE_TYPE=" + SslContextFactory.DFLT_STORE_TYPE, 2)); + log(i("KEY_STORE_TYPE=" + SslContextFactory.DFLT_STORE_TYPE, 2)); + log(i("TRUST_STORE_TYPE=" + SslContextFactory.DFLT_STORE_TYPE, 2)); nl(); log("Exit codes:"); @@ -2647,7 +2636,7 @@ public class CommandHandler { if (!F.isEmpty(args.sslKeyStorePath())) { GridSslBasicContextFactory factory = new GridSslBasicContextFactory(); - List<String> sslProtocols = split(args.getSslProtocol(), ","); + List<String> sslProtocols = split(args.sslProtocol(), ","); String sslProtocol = F.isEmpty(sslProtocols) ? SslContextFactory.DFLT_SSL_PROTOCOL : sslProtocols.get(0); @@ -2669,7 +2658,7 @@ public class CommandHandler { factory.setKeyStoreType(args.sslKeyStoreType()); - if (args.sslTrustStorePath() == null) + if (F.isEmpty(args.sslTrustStorePath())) factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager()); else { factory.setTrustStoreFilePath(args.sslTrustStorePath());
