From d9946a7ffc1c5e8265a62bd6868e6b0af3e977f4 Mon Sep 17 00:00:00 2001 From: Joel Hamill <11722533+joel-hamill@users.noreply.github.com> Date: Wed, 30 Nov 2022 08:54:39 -0800 Subject: [PATCH] MINOR: Fix config documentation formatting (#12921) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewers: José Armando García Sancio --- .../common/config/internals/BrokerSecurityConfigs.java | 8 ++++---- .../main/java/org/apache/kafka/streams/StreamsConfig.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java b/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java index 8b7a9649c2c..e4e83387544 100644 --- a/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java +++ b/clients/src/main/java/org/apache/kafka/common/config/internals/BrokerSecurityConfigs.java @@ -61,10 +61,10 @@ public class BrokerSecurityConfigs { public static final String SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES_DOC = "A list of rules for mapping from principal " + "names to short names (typically operating system usernames). The rules are evaluated in order and the " + "first rule that matches a principal name is used to map it to a short name. Any later rules in the list are " + - "ignored. By default, principal names of the form {username}/{hostname}@{REALM} are mapped to {username}. " + - "For more details on the format please see security authorization and acls. " + - "Note that this configuration is ignored if an extension of KafkaPrincipalBuilder is provided by the " + - "" + PRINCIPAL_BUILDER_CLASS_CONFIG + " configuration."; + "ignored. By default, principal names of the form {username}/{hostname}@{REALM} are mapped " + + "to {username}. For more details on the format please see " + + "security authorization and acls. Note that this configuration is ignored if an extension of " + + "KafkaPrincipalBuilder is provided by the " + PRINCIPAL_BUILDER_CLASS_CONFIG + " configuration."; public static final List DEFAULT_SASL_KERBEROS_PRINCIPAL_TO_LOCAL_RULES = Collections.singletonList("DEFAULT"); public static final String SSL_CLIENT_AUTH_DOC = "Configures kafka broker to request client authentication." diff --git a/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java b/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java index 89d90c15af3..9fabf3c4298 100644 --- a/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java +++ b/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java @@ -481,7 +481,7 @@ public class StreamsConfig extends AbstractConfig { @SuppressWarnings("WeakerAccess") public static final String CLIENT_ID_CONFIG = CommonClientConfigs.CLIENT_ID_CONFIG; private static final String CLIENT_ID_DOC = "An ID prefix string used for the client IDs of internal consumer, producer and restore-consumer," + - " with pattern '-StreamThread--'."; + " with pattern <client.id>-StreamThread-<threadSequenceNumber$gt;-<consumer|producer|restore-consumer>."; /** {@code commit.interval.ms} */ @SuppressWarnings("WeakerAccess") @@ -543,7 +543,7 @@ public class StreamsConfig extends AbstractConfig { /** {@code default key.serde} */ @SuppressWarnings("WeakerAccess") public static final String DEFAULT_KEY_SERDE_CLASS_CONFIG = "default.key.serde"; - private static final String DEFAULT_KEY_SERDE_CLASS_DOC = " Default serializer / deserializer class for key that implements the org.apache.kafka.common.serialization.Serde interface. " + private static final String DEFAULT_KEY_SERDE_CLASS_DOC = "Default serializer / deserializer class for key that implements the org.apache.kafka.common.serialization.Serde interface. " + "Note when windowed serde class is used, one needs to set the inner serde class that implements the org.apache.kafka.common.serialization.Serde interface via '" + DEFAULT_WINDOWED_KEY_SERDE_INNER_CLASS + "' or '" + DEFAULT_WINDOWED_VALUE_SERDE_INNER_CLASS + "' as well";