This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new a8f6fc9cc4c KAFKA-18631 Remove ZkConfigs (#18693)
a8f6fc9cc4c is described below
commit a8f6fc9cc4cf1db27f90145296d9d597995081ba
Author: Chung, Ming-Yen <[email protected]>
AuthorDate: Sun Jan 26 04:37:49 2025 +0800
KAFKA-18631 Remove ZkConfigs (#18693)
Reviewers: Chia-Ping Tsai <[email protected]>
---
checkstyle/import-control.xml | 1 -
.../kafka/api/PlaintextAdminIntegrationTest.scala | 4 +-
.../kafka/server/DynamicBrokerConfigTest.scala | 4 +-
.../scala/unit/kafka/server/KafkaConfigTest.scala | 20 +--
.../kafka/server/config/AbstractKafkaConfig.java | 1 -
.../org/apache/kafka/server/config/ZkConfigs.java | 149 ---------------------
6 files changed, 6 insertions(+), 173 deletions(-)
diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index 34f5220a868..5129d174223 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -635,7 +635,6 @@
<allow pkg="org.apache.kafka.metadata" />
<allow pkg="org.eclipse.jetty.client"/>
<allow class="org.apache.kafka.storage.internals.log.CleanerConfig" />
- <allow class="org.apache.kafka.server.config.ZkConfigs" />
</subpackage>
</subpackage>
diff --git
a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
index e54b24cc08a..8c39756a57e 100644
---
a/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
+++
b/core/src/test/scala/integration/kafka/api/PlaintextAdminIntegrationTest.scala
@@ -3704,8 +3704,8 @@ class PlaintextAdminIntegrationTest extends
BaseAdminIntegrationTest {
new AlterConfigOp(new ConfigEntry("kafka.log.LogCleaner",
LogLevelConfig.ERROR_LOG_LEVEL), AlterConfigOp.OpType.SET)
).asJavaCollection
alterBrokerLoggers(alterLogCleanerLoggerEntry)
- val changedZKLoggerConfig = describeBrokerLoggers()
- assertEquals(LogLevelConfig.ERROR_LOG_LEVEL,
changedZKLoggerConfig.get("kafka.log.LogCleaner").value())
+ val changedBrokerLoggerConfig = describeBrokerLoggers()
+ assertEquals(LogLevelConfig.ERROR_LOG_LEVEL,
changedBrokerLoggerConfig.get("kafka.log.LogCleaner").value())
// properly test various set operations and one delete
val alterLogLevelsEntries = Seq(
diff --git
a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
index 3e77c76d9b4..61aacbf0f1a 100755
--- a/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
+++ b/core/src/test/scala/unit/kafka/server/DynamicBrokerConfigTest.scala
@@ -404,8 +404,8 @@ class DynamicBrokerConfigTest {
// in an AlterConfigs request. Validation should fail with an exception if
any of the configs are invalid.
assertThrows(classOf[ConfigException], () =>
config.dynamicConfig.validate(props, perBrokerConfig = true))
- // DynamicBrokerConfig#updateBrokerConfig is used to update configs from
ZooKeeper during
- // startup and when configs are updated in ZK. Update should apply valid
configs and ignore
+ // DynamicBrokerConfig#updateBrokerConfig is used to update configs from
broker during
+ // startup and when configs are updated in broker. Update should apply
valid configs and ignore
// invalid ones.
config.dynamicConfig.updateBrokerConfig(0, props)
validProps.foreach { case (name, value) => assertEquals(value,
config.originals.get(name)) }
diff --git a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
index f937ea6c81d..d6739a22cf7 100755
--- a/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
+++ b/core/src/test/scala/unit/kafka/server/KafkaConfigTest.scala
@@ -38,7 +38,7 @@ import
org.apache.kafka.coordinator.transaction.{TransactionLogConfig, Transacti
import org.apache.kafka.network.SocketServerConfigs
import org.apache.kafka.raft.QuorumConfig
import org.apache.kafka.server.common.MetadataVersion
-import org.apache.kafka.server.config.{DelegationTokenManagerConfigs,
KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs,
ServerTopicConfigSynonyms, ZkConfigs}
+import org.apache.kafka.server.config.{DelegationTokenManagerConfigs,
KRaftConfigs, QuotaConfig, ReplicationConfigs, ServerConfigs, ServerLogConfigs,
ServerTopicConfigSynonyms}
import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig
import org.apache.kafka.server.metrics.MetricConfigs
import org.apache.kafka.storage.internals.log.CleanerConfig
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.function.Executable
import scala.jdk.CollectionConverters._
class KafkaConfigTest {
-
+
def createDefaultConfig(): Properties = {
val props = new Properties()
props.setProperty(KRaftConfigs.PROCESS_ROLES_CONFIG, "broker,controller")
@@ -799,21 +799,6 @@ class KafkaConfigTest {
KafkaConfig.configNames.foreach { name =>
name match {
- case ZkConfigs.ZK_SSL_CLIENT_ENABLE_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_boolean")
- case ZkConfigs.ZK_CLIENT_CNXN_SOCKET_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_KEY_STORE_LOCATION_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_KEY_STORE_PASSWORD_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_KEY_STORE_TYPE_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_TRUST_STORE_LOCATION_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_TRUST_STORE_PASSWORD_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_TRUST_STORE_TYPE_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_PROTOCOL_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_ENABLED_PROTOCOLS_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_CIPHER_SUITES_CONFIG => //ignore string
- case ZkConfigs.ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG =>
//ignore string
- case ZkConfigs.ZK_SSL_CRL_ENABLE_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_boolean")
- case ZkConfigs.ZK_SSL_OCSP_ENABLE_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_boolean")
-
case ServerConfigs.BROKER_ID_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_number")
case ServerConfigs.NUM_IO_THREADS_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_number", "0")
case ServerConfigs.BACKGROUND_THREADS_CONFIG =>
assertPropertyInvalid(baseProperties, name, "not_a_number", "0")
@@ -1180,7 +1165,6 @@ class KafkaConfigTest {
defaults.setProperty(KRaftConfigs.PROCESS_ROLES_CONFIG, "broker")
defaults.setProperty(QuorumConfig.QUORUM_BOOTSTRAP_SERVERS_CONFIG,
"CONTROLLER://localhost:9092")
defaults.setProperty(KRaftConfigs.CONTROLLER_LISTENER_NAMES_CONFIG,
"CONTROLLER")
- // For ZkConnectionTimeoutMs
defaults.setProperty(ServerConfigs.BROKER_ID_GENERATION_ENABLE_CONFIG,
"false")
defaults.setProperty(ServerConfigs.RESERVED_BROKER_MAX_ID_CONFIG, "1")
defaults.setProperty(ServerConfigs.BROKER_ID_CONFIG, "1")
diff --git
a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java
b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java
index da9b1cf65fc..7b01aa5813b 100644
---
a/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java
+++
b/server/src/main/java/org/apache/kafka/server/config/AbstractKafkaConfig.java
@@ -44,7 +44,6 @@ import java.util.Map;
public abstract class AbstractKafkaConfig extends AbstractConfig {
public static final ConfigDef CONFIG_DEF = Utils.mergeConfigs(List.of(
RemoteLogManagerConfig.configDef(),
- ZkConfigs.CONFIG_DEF,
ServerConfigs.CONFIG_DEF,
KRaftConfigs.CONFIG_DEF,
SocketServerConfigs.CONFIG_DEF,
diff --git a/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java
b/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java
deleted file mode 100644
index b3b1b06911c..00000000000
--- a/server/src/main/java/org/apache/kafka/server/config/ZkConfigs.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.kafka.server.config;
-
-
-import org.apache.kafka.common.config.ConfigDef;
-
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static org.apache.kafka.common.config.ConfigDef.Importance.LOW;
-import static org.apache.kafka.common.config.ConfigDef.Importance.MEDIUM;
-import static org.apache.kafka.common.config.ConfigDef.Type.BOOLEAN;
-import static org.apache.kafka.common.config.ConfigDef.Type.LIST;
-import static org.apache.kafka.common.config.ConfigDef.Type.PASSWORD;
-import static org.apache.kafka.common.config.ConfigDef.Type.STRING;
-
-public final class ZkConfigs {
- /** ********* Zookeeper Configuration ***********/
- public static final String ZK_SSL_CLIENT_ENABLE_CONFIG =
"zookeeper.ssl.client.enable";
- public static final String ZK_CLIENT_CNXN_SOCKET_CONFIG =
"zookeeper.clientCnxnSocket";
- public static final String ZK_SSL_KEY_STORE_LOCATION_CONFIG =
"zookeeper.ssl.keystore.location";
- public static final String ZK_SSL_KEY_STORE_PASSWORD_CONFIG =
"zookeeper.ssl.keystore.password";
- public static final String ZK_SSL_KEY_STORE_TYPE_CONFIG =
"zookeeper.ssl.keystore.type";
- public static final String ZK_SSL_TRUST_STORE_LOCATION_CONFIG =
"zookeeper.ssl.truststore.location";
- public static final String ZK_SSL_TRUST_STORE_PASSWORD_CONFIG =
"zookeeper.ssl.truststore.password";
- public static final String ZK_SSL_TRUST_STORE_TYPE_CONFIG =
"zookeeper.ssl.truststore.type";
- public static final String ZK_SSL_PROTOCOL_CONFIG =
"zookeeper.ssl.protocol";
- public static final String ZK_SSL_ENABLED_PROTOCOLS_CONFIG =
"zookeeper.ssl.enabled.protocols";
- public static final String ZK_SSL_CIPHER_SUITES_CONFIG =
"zookeeper.ssl.cipher.suites";
- public static final String ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG
= "zookeeper.ssl.endpoint.identification.algorithm";
- public static final String ZK_SSL_CRL_ENABLE_CONFIG =
"zookeeper.ssl.crl.enable";
- public static final String ZK_SSL_OCSP_ENABLE_CONFIG =
"zookeeper.ssl.ocsp.enable";
-
- public static final String ZK_SSL_CLIENT_ENABLE_DOC;
- public static final String ZK_CLIENT_CNXN_SOCKET_DOC;
- public static final String ZK_SSL_KEY_STORE_LOCATION_DOC;
- public static final String ZK_SSL_KEY_STORE_PASSWORD_DOC;
- public static final String ZK_SSL_KEY_STORE_TYPE_DOC;
- public static final String ZK_SSL_TRUST_STORE_LOCATION_DOC;
- public static final String ZK_SSL_TRUST_STORE_PASSWORD_DOC;
- public static final String ZK_SSL_TRUST_STORE_TYPE_DOC;
- public static final String ZK_SSL_PROTOCOL_DOC;
- public static final String ZK_SSL_ENABLED_PROTOCOLS_DOC;
- public static final String ZK_SSL_CIPHER_SUITES_DOC;
- public static final String ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC;
- public static final String ZK_SSL_CRL_ENABLE_DOC;
- public static final String ZK_SSL_OCSP_ENABLE_DOC;
-
- // a map from the Kafka config to the corresponding ZooKeeper Java system
property
- public static final Map<String, String>
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP;
-
- public static final boolean ZK_SSL_CLIENT_ENABLE = false;
- public static final String ZK_SSL_PROTOCOL = "TLSv1.2";
- public static final String ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM =
"HTTPS";
- public static final boolean ZK_SSL_CRL_ENABLE = false;
- public static final boolean ZK_SSL_OCSP_ENABLE = false;
-
- // See ZKClientConfig.SECURE_CLIENT
- private static final String SECURE_CLIENT = "zookeeper.client.secure";
- // See ZKClientConfig.ZOOKEEPER_CLIENT_CNXN_SOCKET
- private static final String ZOOKEEPER_CLIENT_CNXN_SOCKET =
"zookeeper.clientCnxnSocket";
-
- static {
-
- ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP = Map.ofEntries(
- Map.entry(ZK_SSL_CLIENT_ENABLE_CONFIG, SECURE_CLIENT),
- Map.entry(ZK_CLIENT_CNXN_SOCKET_CONFIG,
ZOOKEEPER_CLIENT_CNXN_SOCKET),
- Map.entry(ZK_SSL_KEY_STORE_LOCATION_CONFIG,
"zookeeper.ssl.keyStore.location"),
- Map.entry(ZK_SSL_KEY_STORE_PASSWORD_CONFIG,
"zookeeper.ssl.keyStore.password"),
- Map.entry(ZK_SSL_KEY_STORE_TYPE_CONFIG,
"zookeeper.ssl.keyStore.type"),
- Map.entry(ZK_SSL_TRUST_STORE_LOCATION_CONFIG,
"zookeeper.ssl.trustStore.location"),
- Map.entry(ZK_SSL_TRUST_STORE_PASSWORD_CONFIG,
"zookeeper.ssl.trustStore.password"),
- Map.entry(ZK_SSL_TRUST_STORE_TYPE_CONFIG,
"zookeeper.ssl.trustStore.type"),
- Map.entry(ZK_SSL_PROTOCOL_CONFIG, "zookeeper.ssl.protocol"),
- Map.entry(ZK_SSL_ENABLED_PROTOCOLS_CONFIG,
"zookeeper.ssl.enabledProtocols"),
- Map.entry(ZK_SSL_CIPHER_SUITES_CONFIG,
"zookeeper.ssl.ciphersuites"),
- Map.entry(ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG,
"zookeeper.ssl.hostnameVerification"),
- Map.entry(ZK_SSL_CRL_ENABLE_CONFIG, "zookeeper.ssl.crl"),
- Map.entry(ZK_SSL_OCSP_ENABLE_CONFIG, "zookeeper.ssl.ocsp")
- );
-
- ZK_SSL_CLIENT_ENABLE_DOC = "Set client to use TLS when connecting to
ZooKeeper." +
- " An explicit value overrides any value set via the
<code>zookeeper.client.secure</code> system property (note the different
name)." +
- " Defaults to false if neither is set; when true, <code>" +
ZK_CLIENT_CNXN_SOCKET_CONFIG + "</code> must be set (typically to
<code>org.apache.zookeeper.ClientCnxnSocketNetty</code>); other values to set
may include " +
- ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.keySet().stream().filter(x ->
!x.equals(ZK_SSL_CLIENT_ENABLE_CONFIG) &&
!x.equals(ZK_CLIENT_CNXN_SOCKET_CONFIG)).sorted().collect(Collectors.joining("</code>,
<code>", "<code>", "</code>"));
- ZK_CLIENT_CNXN_SOCKET_DOC = "Typically set to
<code>org.apache.zookeeper.ClientCnxnSocketNetty</code> when using TLS
connectivity to ZooKeeper." +
- " Overrides any explicit value set via the same-named <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_CLIENT_CNXN_SOCKET_CONFIG) +
"</code> system property.";
- ZK_SSL_KEY_STORE_LOCATION_DOC = "Keystore location when using a
client-side certificate with TLS connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_KEY_STORE_LOCATION_CONFIG) +
"</code> system property (note the camelCase).";
- ZK_SSL_KEY_STORE_PASSWORD_DOC = "Keystore password when using a
client-side certificate with TLS connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_KEY_STORE_PASSWORD_CONFIG) +
"</code> system property (note the camelCase)." +
- " Note that ZooKeeper does not support a key password different
from the keystore password, so be sure to set the key password in the keystore
to be identical to the keystore password; otherwise the connection attempt to
Zookeeper will fail.";
- ZK_SSL_KEY_STORE_TYPE_DOC = "Keystore type when using a client-side
certificate with TLS connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_KEY_STORE_TYPE_CONFIG) +
"</code> system property (note the camelCase)." +
- " The default value of <code>null</code> means the type will be
auto-detected based on the filename extension of the keystore.";
- ZK_SSL_TRUST_STORE_LOCATION_DOC = "Truststore location when using TLS
connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_TRUST_STORE_LOCATION_CONFIG) +
"</code> system property (note the camelCase).";
- ZK_SSL_TRUST_STORE_PASSWORD_DOC = "Truststore password when using TLS
connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_TRUST_STORE_PASSWORD_CONFIG) +
"</code> system property (note the camelCase).";
- ZK_SSL_TRUST_STORE_TYPE_DOC = "Truststore type when using TLS
connectivity to ZooKeeper." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_TRUST_STORE_TYPE_CONFIG) +
"</code> system property (note the camelCase)." +
- " The default value of <code>null</code> means the type will be
auto-detected based on the filename extension of the truststore.";
- ZK_SSL_PROTOCOL_DOC = "Specifies the protocol to be used in ZooKeeper
TLS negotiation." +
- " An explicit value overrides any value set via the same-named
<code>" + ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_PROTOCOL_CONFIG) +
"</code> system property.";
- ZK_SSL_ENABLED_PROTOCOLS_DOC = "Specifies the enabled protocol(s) in
ZooKeeper TLS negotiation (csv)." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_ENABLED_PROTOCOLS_CONFIG) +
"</code> system property (note the camelCase)." +
- " The default value of <code>null</code> means the enabled
protocol will be the value of the <code>" + ZK_SSL_PROTOCOL_CONFIG + "</code>
configuration property.";
- ZK_SSL_CIPHER_SUITES_DOC = "Specifies the enabled cipher suites to be
used in ZooKeeper TLS negotiation (csv)." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_CIPHER_SUITES_CONFIG) +
"</code> system property (note the single word \"ciphersuites\")." +
- " The default value of <code>null</code> means the list of enabled
cipher suites is determined by the Java runtime being used.";
- ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC = "Specifies whether to
enable hostname verification in the ZooKeeper TLS negotiation process, with
(case-insensitively) \"https\" meaning ZooKeeper hostname verification is
enabled and an explicit blank value meaning it is disabled (disabling it is
only recommended for testing purposes)." +
- " An explicit value overrides any \"true\" or \"false\" value set
via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG)
+ "</code> system property (note the different name and values; true implies
https and false implies blank).";
- ZK_SSL_CRL_ENABLE_DOC = "Specifies whether to enable Certificate
Revocation List in the ZooKeeper TLS protocols." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_CRL_ENABLE_CONFIG) + "</code>
system property (note the shorter name).";
- ZK_SSL_OCSP_ENABLE_DOC = "Specifies whether to enable Online
Certificate Status Protocol in the ZooKeeper TLS protocols." +
- " Overrides any explicit value set via the <code>" +
ZK_SSL_CONFIG_TO_SYSTEM_PROPERTY_MAP.get(ZK_SSL_OCSP_ENABLE_CONFIG) + "</code>
system property (note the shorter name).";
- }
-
- public static final ConfigDef CONFIG_DEF = new ConfigDef()
- .define(ZK_SSL_CLIENT_ENABLE_CONFIG, BOOLEAN,
ZK_SSL_CLIENT_ENABLE, MEDIUM, ZK_SSL_CLIENT_ENABLE_DOC)
- .define(ZK_CLIENT_CNXN_SOCKET_CONFIG, STRING, null, MEDIUM,
ZK_CLIENT_CNXN_SOCKET_DOC)
- .define(ZK_SSL_KEY_STORE_LOCATION_CONFIG, STRING, null, MEDIUM,
ZK_SSL_KEY_STORE_LOCATION_DOC)
- .define(ZK_SSL_KEY_STORE_PASSWORD_CONFIG, PASSWORD, null, MEDIUM,
ZK_SSL_KEY_STORE_PASSWORD_DOC)
- .define(ZK_SSL_KEY_STORE_TYPE_CONFIG, STRING, null, MEDIUM,
ZK_SSL_KEY_STORE_TYPE_DOC)
- .define(ZK_SSL_TRUST_STORE_LOCATION_CONFIG, STRING, null, MEDIUM,
ZK_SSL_TRUST_STORE_LOCATION_DOC)
- .define(ZK_SSL_TRUST_STORE_PASSWORD_CONFIG, PASSWORD, null,
MEDIUM, ZK_SSL_TRUST_STORE_PASSWORD_DOC)
- .define(ZK_SSL_TRUST_STORE_TYPE_CONFIG, STRING, null, MEDIUM,
ZK_SSL_TRUST_STORE_TYPE_DOC)
- .define(ZK_SSL_PROTOCOL_CONFIG, STRING, ZK_SSL_PROTOCOL, LOW,
ZK_SSL_PROTOCOL_DOC)
- .define(ZK_SSL_ENABLED_PROTOCOLS_CONFIG, LIST, null, LOW,
ZK_SSL_ENABLED_PROTOCOLS_DOC)
- .define(ZK_SSL_CIPHER_SUITES_CONFIG, LIST, null, LOW,
ZK_SSL_CIPHER_SUITES_DOC)
- .define(ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG, STRING,
ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM, LOW,
ZK_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_DOC)
- .define(ZK_SSL_CRL_ENABLE_CONFIG, BOOLEAN, ZK_SSL_CRL_ENABLE, LOW,
ZK_SSL_CRL_ENABLE_DOC)
- .define(ZK_SSL_OCSP_ENABLE_CONFIG, BOOLEAN, ZK_SSL_OCSP_ENABLE,
LOW, ZK_SSL_OCSP_ENABLE_DOC);
-}
