chia7712 commented on code in PR #18695: URL: https://github.com/apache/kafka/pull/18695#discussion_r2011905649
########## tools/src/test/java/org/apache/kafka/tools/consumer/CoordinatorRecordMessageFormatterTest.java: ########## @@ -0,0 +1,68 @@ +/* + * 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.tools.consumer; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.common.MessageFormatter; +import org.apache.kafka.common.header.internals.RecordHeaders; +import org.apache.kafka.common.record.TimestampType; + +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Optional; +import java.util.stream.Stream; + +import static java.util.Collections.emptyMap; +import static org.junit.jupiter.api.Assertions.assertEquals; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public abstract class CoordinatorRecordMessageFormatterTest { + private static final String TOPIC = "TOPIC"; + + protected abstract CoordinatorRecordMessageFormatter formatter(); + protected abstract Stream<Arguments> parameters(); + + @ParameterizedTest + @MethodSource("parameters") + public void testMessageFormatter(byte[] keyBuffer, byte[] valueBuffer, String expectedOutput) { Review Comment: Could you please add unit test for `UnknownRecordTypeException`? ########## tools/src/test/java/org/apache/kafka/tools/consumer/CoordinatorRecordMessageFormatterTest.java: ########## @@ -0,0 +1,68 @@ +/* + * 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.tools.consumer; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.common.MessageFormatter; +import org.apache.kafka.common.header.internals.RecordHeaders; +import org.apache.kafka.common.record.TimestampType; + +import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Optional; +import java.util.stream.Stream; + +import static java.util.Collections.emptyMap; +import static org.junit.jupiter.api.Assertions.assertEquals; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) Review Comment: Is it used to speedup those tests? ########## tools/src/main/java/org/apache/kafka/tools/consumer/CoordinatorRecordMessageFormatter.java: ########## @@ -31,44 +34,50 @@ import static java.nio.charset.StandardCharsets.UTF_8; -public abstract class ApiMessageFormatter implements MessageFormatter { - +public abstract class CoordinatorRecordMessageFormatter implements MessageFormatter { private static final String TYPE = "type"; private static final String VERSION = "version"; private static final String DATA = "data"; private static final String KEY = "key"; private static final String VALUE = "value"; - static final String UNKNOWN = "unknown"; + + private final CoordinatorRecordSerde serde; + + public CoordinatorRecordMessageFormatter(CoordinatorRecordSerde serde) { + this.serde = serde; + } @Override public void writeTo(ConsumerRecord<byte[], byte[]> consumerRecord, PrintStream output) { + if (Objects.isNull(consumerRecord.key())) return; + ObjectNode json = new ObjectNode(JsonNodeFactory.instance); + try { + CoordinatorRecord record = serde.deserialize( + ByteBuffer.wrap(consumerRecord.key()), + consumerRecord.value() != null ? ByteBuffer.wrap(consumerRecord.value()) : null + ); + + if (!isRecordTypeAllowed(record.key().apiKey())) return; - byte[] key = consumerRecord.key(); - if (Objects.nonNull(key)) { - short keyVersion = ByteBuffer.wrap(key).getShort(); - JsonNode dataNode = readToKeyJson(ByteBuffer.wrap(key)); + json + .putObject(KEY) + .put(TYPE, record.key().apiKey()) Review Comment: `ShareGroupStateMessageFormatter` use "version" rather than "type", but I guess we fix it in the follow-up by refactoring `ShareGroupStateMessageFormatter`? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
