This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1ae31c39ed NIFI-14117 PublishKafka sends default attribute as key if
custom attribute not specified (#9608)
1ae31c39ed is described below
commit 1ae31c39ed05f21ddf0329fb93f6e6e895a36cb6
Author: greyp9 <[email protected]>
AuthorDate: Mon Jan 6 16:45:20 2025 -0500
NIFI-14117 PublishKafka sends default attribute as key if custom attribute
not specified (#9608)
Signed-off-by: David Handermann <[email protected]>
---
.../kafka/processors/PublishKafkaDefaultKeyIT.java | 79 ++++++++++++++++++++++
.../producer/key/AttributeKeyFactory.java | 5 +-
2 files changed, 82 insertions(+), 2 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/PublishKafkaDefaultKeyIT.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/PublishKafkaDefaultKeyIT.java
new file mode 100644
index 0000000000..3211ad8142
--- /dev/null
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-3-integration/src/test/java/org/apache/nifi/kafka/processors/PublishKafkaDefaultKeyIT.java
@@ -0,0 +1,79 @@
+/*
+ * 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.nifi.kafka.processors;
+
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.header.Header;
+import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@TestMethodOrder(MethodOrderer.MethodName.class)
+public class PublishKafkaDefaultKeyIT extends AbstractPublishKafkaIT {
+ private static final String TEST_KEY_ATTRIBUTE = "kafka.key";
+ private static final String TEST_KEY_VALUE = "some-key-value";
+ private static final String TEST_RECORD_VALUE = "value-" +
System.currentTimeMillis();
+
+ @Test
+ public void test_1_KafkaTestContainerProduceOne() throws
InitializationException {
+ final TestRunner runner =
TestRunners.newTestRunner(PublishKafka.class);
+ runner.setValidateExpressionUsage(false);
+ runner.setProperty(PublishKafka.CONNECTION_SERVICE,
addKafkaConnectionService(runner));
+ runner.setProperty(PublishKafka.TOPIC_NAME, getClass().getName());
+ runner.setProperty(PublishKafka.ATTRIBUTE_HEADER_PATTERN, "a.*");
+
+ final Map<String, String> attributes = new HashMap<>();
+ attributes.put("a1", "valueA1");
+ attributes.put("b1", "valueB1");
+ attributes.put(TEST_KEY_ATTRIBUTE, TEST_KEY_VALUE);
+
+ runner.enqueue(TEST_RECORD_VALUE, attributes);
+ runner.run();
+ runner.assertAllFlowFilesTransferred(PublishKafka.REL_SUCCESS, 1);
+ }
+
+ @Test
+ public void test_2_KafkaTestContainerConsumeOne() {
+ try (KafkaConsumer<String, String> consumer = new
KafkaConsumer<>(getKafkaConsumerProperties())) {
+
consumer.subscribe(Collections.singletonList(getClass().getName()));
+ final ConsumerRecords<String, String> records =
consumer.poll(DURATION_POLL);
+ assertEquals(1, records.count());
+ final ConsumerRecord<String, String> record =
records.iterator().next();
+ assertEquals(TEST_KEY_VALUE, record.key());
+ assertEquals(TEST_RECORD_VALUE, record.value());
+ final List<Header> headers =
Arrays.asList(record.headers().toArray());
+ assertEquals(1, headers.size());
+ final Header header = record.headers().iterator().next();
+ assertEquals("a1", header.key());
+ assertEquals("valueA1", new String(header.value(),
StandardCharsets.UTF_8));
+ }
+ }
+}
diff --git
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/producer/key/AttributeKeyFactory.java
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/producer/key/AttributeKeyFactory.java
index 43745fcc13..d1a64258ed 100644
---
a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/producer/key/AttributeKeyFactory.java
+++
b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-processors/src/main/java/org/apache/nifi/kafka/processors/producer/key/AttributeKeyFactory.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.kafka.processors.producer.key;
+import org.apache.nifi.kafka.shared.attribute.KafkaFlowFileAttribute;
import org.apache.nifi.serialization.record.Record;
import java.io.UnsupportedEncodingException;
@@ -29,13 +30,13 @@ public class AttributeKeyFactory implements KeyFactory {
public AttributeKeyFactory(final String keyAttribute,
final String keyAttributeEncoding) {
- this.keyAttribute = keyAttribute;
+ this.keyAttribute = (keyAttribute == null) ?
KafkaFlowFileAttribute.KAFKA_KEY : keyAttribute;
this.keyAttributeEncoding =
Optional.ofNullable(keyAttributeEncoding).orElse(StandardCharsets.UTF_8.name());
}
@Override
public byte[] getKey(final Map<String, String> attributes, final Record
record) throws UnsupportedEncodingException {
- final String keyAttributeValue = (keyAttribute == null) ? null :
attributes.get(keyAttribute);
+ final String keyAttributeValue = attributes.get(keyAttribute);
return (keyAttributeValue == null) ? null :
keyAttributeValue.getBytes(keyAttributeEncoding);
}
}
