Repository: kafka Updated Branches: refs/heads/trunk ebed7ce36 -> f79db1a42
KAFKA-3749; fix "BOOSTRAP_SERVERS_DOC" typo Author: manuzhang <[email protected]> Reviewers: Guozhang Wang <[email protected]>, Ewen Cheslack-Postava <[email protected]>, Ismael Juma <[email protected]> Closes #1420 from manuzhang/KAFKA-3749 Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/f79db1a4 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/f79db1a4 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/f79db1a4 Branch: refs/heads/trunk Commit: f79db1a4234b4af75a2d027c86df62d77ba3d29e Parents: ebed7ce Author: manuzhang <[email protected]> Authored: Fri May 27 10:25:38 2016 +0100 Committer: Ismael Juma <[email protected]> Committed: Fri May 27 10:25:38 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/kafka/clients/CommonClientConfigs.java | 7 ++++++- .../org/apache/kafka/clients/consumer/ConsumerConfig.java | 2 +- .../org/apache/kafka/clients/producer/ProducerConfig.java | 2 +- core/src/main/scala/kafka/admin/AdminClient.scala | 2 +- .../src/main/java/org/apache/kafka/streams/StreamsConfig.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/f79db1a4/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java b/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java index 2f1fe93..750b8a1 100644 --- a/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java +++ b/clients/src/main/java/org/apache/kafka/clients/CommonClientConfigs.java @@ -29,10 +29,15 @@ public class CommonClientConfigs { */ public static final String BOOTSTRAP_SERVERS_CONFIG = "bootstrap.servers"; - public static final String BOOSTRAP_SERVERS_DOC = "A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. The client will make use of all servers irrespective of which servers are specified here for bootstrapping—this list only impacts the initial hosts used to discover the full set of servers. This list should be in the form " + public static final String BOOTSTRAP_SERVERS_DOC = "A list of host/port pairs to use for establishing the initial connection to the Kafka cluster. The client will make use of all servers irrespective of which servers are specified here for bootstrapping—this list only impacts the initial hosts used to discover the full set of servers. This list should be in the form " + "<code>host1:port1,host2:port2,...</code>. Since these servers are just used for the initial connection to " + "discover the full cluster membership (which may change dynamically), this list need not contain the full set of " + "servers (you may want more than one, though, in case a server is down)."; + /** + * @deprecated This will be removed in a future release. Please use {@link #BOOTSTRAP_SERVERS_DOC} + */ + @Deprecated + public static final String BOOSTRAP_SERVERS_DOC = BOOTSTRAP_SERVERS_DOC; public static final String METADATA_MAX_AGE_CONFIG = "metadata.max.age.ms"; public static final String METADATA_MAX_AGE_DOC = "The period of time in milliseconds after which we force a refresh of metadata even if we haven't seen any partition leadership changes to proactively discover any new brokers or partitions."; http://git-wip-us.apache.org/repos/asf/kafka/blob/f79db1a4/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java index 6523d18..e58f2fd 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java @@ -191,7 +191,7 @@ public class ConsumerConfig extends AbstractConfig { CONFIG = new ConfigDef().define(BOOTSTRAP_SERVERS_CONFIG, Type.LIST, Importance.HIGH, - CommonClientConfigs.BOOSTRAP_SERVERS_DOC) + CommonClientConfigs.BOOTSTRAP_SERVERS_DOC) .define(GROUP_ID_CONFIG, Type.STRING, "", Importance.HIGH, GROUP_ID_DOC) .define(SESSION_TIMEOUT_MS_CONFIG, Type.INT, http://git-wip-us.apache.org/repos/asf/kafka/blob/f79db1a4/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java index 4d121b9..e505f71 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java @@ -217,7 +217,7 @@ public class ProducerConfig extends AbstractConfig { + "received by the producer before they are published to the Kafka cluster. By default, there are no interceptors."; static { - CONFIG = new ConfigDef().define(BOOTSTRAP_SERVERS_CONFIG, Type.LIST, Importance.HIGH, CommonClientConfigs.BOOSTRAP_SERVERS_DOC) + CONFIG = new ConfigDef().define(BOOTSTRAP_SERVERS_CONFIG, Type.LIST, Importance.HIGH, CommonClientConfigs.BOOTSTRAP_SERVERS_DOC) .define(BUFFER_MEMORY_CONFIG, Type.LONG, 32 * 1024 * 1024L, atLeast(0L), Importance.HIGH, BUFFER_MEMORY_DOC) .define(RETRIES_CONFIG, Type.INT, 0, between(0, Integer.MAX_VALUE), Importance.HIGH, RETRIES_DOC) .define(ACKS_CONFIG, http://git-wip-us.apache.org/repos/asf/kafka/blob/f79db1a4/core/src/main/scala/kafka/admin/AdminClient.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/admin/AdminClient.scala b/core/src/main/scala/kafka/admin/AdminClient.scala index ef76ffc..ebb5026 100644 --- a/core/src/main/scala/kafka/admin/AdminClient.scala +++ b/core/src/main/scala/kafka/admin/AdminClient.scala @@ -182,7 +182,7 @@ object AdminClient { CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, Type.LIST, Importance.HIGH, - CommonClientConfigs.BOOSTRAP_SERVERS_DOC) + CommonClientConfigs.BOOTSTRAP_SERVERS_DOC) .define( CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, ConfigDef.Type.STRING, http://git-wip-us.apache.org/repos/asf/kafka/blob/f79db1a4/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java ---------------------------------------------------------------------- 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 efccd7a..95e55c9 100644 --- a/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java +++ b/streams/src/main/java/org/apache/kafka/streams/StreamsConfig.java @@ -122,7 +122,7 @@ public class StreamsConfig extends AbstractConfig { .define(BOOTSTRAP_SERVERS_CONFIG, // required with no default value Type.LIST, Importance.HIGH, - CommonClientConfigs.BOOSTRAP_SERVERS_DOC) + CommonClientConfigs.BOOTSTRAP_SERVERS_DOC) .define(CLIENT_ID_CONFIG, Type.STRING, "",
