Repository: kafka Updated Branches: refs/heads/trunk 03817d5a2 -> a81ad2582
KAFKA-3563: Maintain MessageAndMetadata constructor compatibility Author: Grant Henke <[email protected]> Reviewers: Ismael Juma <[email protected]>, Ashish Singh <[email protected]>, Ewen Cheslack-Postava <[email protected]> Closes #1226 from granthenke/message_constructor Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/a81ad258 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a81ad258 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a81ad258 Branch: refs/heads/trunk Commit: a81ad2582ee0e533d335fe0dc5c5cc885dbf645d Parents: 03817d5 Author: Grant Henke <[email protected]> Authored: Mon Apr 18 14:10:26 2016 -0700 Committer: Ewen Cheslack-Postava <[email protected]> Committed: Mon Apr 18 14:10:26 2016 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/consumer/ConsumerIterator.scala | 6 +++--- core/src/main/scala/kafka/message/MessageAndMetadata.scala | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/a81ad258/core/src/main/scala/kafka/consumer/ConsumerIterator.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/consumer/ConsumerIterator.scala b/core/src/main/scala/kafka/consumer/ConsumerIterator.scala index 0735651..df98db7 100755 --- a/core/src/main/scala/kafka/consumer/ConsumerIterator.scala +++ b/core/src/main/scala/kafka/consumer/ConsumerIterator.scala @@ -104,10 +104,10 @@ class ConsumerIterator[K, V](private val channel: BlockingQueue[FetchedDataChunk currentTopicInfo.partitionId, item.message, item.offset, - item.message.timestamp, - item.message.timestampType, keyDecoder, - valueDecoder) + valueDecoder, + item.message.timestamp, + item.message.timestampType) } def clearCurrentChunk() { http://git-wip-us.apache.org/repos/asf/kafka/blob/a81ad258/core/src/main/scala/kafka/message/MessageAndMetadata.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/message/MessageAndMetadata.scala b/core/src/main/scala/kafka/message/MessageAndMetadata.scala index ac9ef77..5c09caf 100755 --- a/core/src/main/scala/kafka/message/MessageAndMetadata.scala +++ b/core/src/main/scala/kafka/message/MessageAndMetadata.scala @@ -25,10 +25,10 @@ case class MessageAndMetadata[K, V](topic: String, partition: Int, private val rawMessage: Message, offset: Long, + keyDecoder: Decoder[K], valueDecoder: Decoder[V], timestamp: Long = Message.NoTimestamp, - timestampType: TimestampType = TimestampType.CREATE_TIME, - keyDecoder: Decoder[K], valueDecoder: Decoder[V]) { - + timestampType: TimestampType = TimestampType.CREATE_TIME) { + /** * Return the decoded message key and payload */
