Repository: kafka Updated Branches: refs/heads/trunk 8d8e3aaa6 -> 99cfb99aa
KAFKA-3435: Remove `Unstable` annotation from new Java Consumer Author: Grant Henke <[email protected]> Reviewers: Gwen Shapira Closes #1113 from granthenke/remove-unstable Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/99cfb99a Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/99cfb99a Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/99cfb99a Branch: refs/heads/trunk Commit: 99cfb99aa161007f2ceae33945d11b968d932175 Parents: 8d8e3aa Author: Grant Henke <[email protected]> Authored: Tue Mar 22 11:53:12 2016 -0700 Committer: Gwen Shapira <[email protected]> Committed: Tue Mar 22 11:53:12 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/kafka/clients/consumer/Consumer.java | 5 ++--- .../org/apache/kafka/clients/consumer/KafkaConsumer.java | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/99cfb99a/clients/src/main/java/org/apache/kafka/clients/consumer/Consumer.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/Consumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/Consumer.java index 0862c32..ef80606 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/Consumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/Consumer.java @@ -3,9 +3,9 @@ * 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. @@ -29,7 +29,6 @@ import java.util.regex.Pattern; * @see KafkaConsumer * @see MockConsumer */ [email protected] public interface Consumer<K, V> extends Closeable { /** http://git-wip-us.apache.org/repos/asf/kafka/blob/99cfb99a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java index c36b7f1..1031252 100644 --- a/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java +++ b/clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java @@ -165,11 +165,11 @@ import java.util.regex.Pattern; * In this example the client is subscribing to the topics <i>foo</i> and <i>bar</i> as part of a group of consumers * called <i>test</i> as described above. * <p> - * The broker will automatically detect failed processes in the <i>test</i> group by using a heartbeat mechanism. The - * consumer will automatically ping the cluster periodically, which lets the cluster know that it is alive. Note that - * the consumer is single-threaded, so periodic heartbeats can only be sent when {@link #poll(long)} is called. As long as - * the consumer is able to do this it is considered alive and retains the right to consume from the partitions assigned - * to it. If it stops heartbeating by failing to call {@link #poll(long)} for a period of time longer than <code>session.timeout.ms</code> + * The broker will automatically detect failed processes in the <i>test</i> group by using a heartbeat mechanism. The + * consumer will automatically ping the cluster periodically, which lets the cluster know that it is alive. Note that + * the consumer is single-threaded, so periodic heartbeats can only be sent when {@link #poll(long)} is called. As long as + * the consumer is able to do this it is considered alive and retains the right to consume from the partitions assigned + * to it. If it stops heartbeating by failing to call {@link #poll(long)} for a period of time longer than <code>session.timeout.ms</code> * then it will be considered dead and its partitions will be assigned to another process. * <p> * The deserializer settings specify how to turn bytes into objects. For example, by specifying string deserializers, we @@ -452,7 +452,6 @@ import java.util.regex.Pattern; * commit. * */ [email protected] public class KafkaConsumer<K, V> implements Consumer<K, V> { private static final Logger log = LoggerFactory.getLogger(KafkaConsumer.class);
