From ec683605d4a3a8f99712255ef8ff30f5f5418c0a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Dec 2020 09:53:53 +0100 Subject: [PATCH] Polish "Allow to configure Kafka Listener's onlyLogRecordMetadata" See gh-24582 --- .../ConcurrentKafkaListenerContainerFactoryConfigurer.java | 2 +- .../boot/autoconfigure/kafka/KafkaProperties.java | 6 +++--- .../boot/autoconfigure/kafka/KafkaPropertiesTests.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java index 09a45bdb8f..47b12837bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/ConcurrentKafkaListenerContainerFactoryConfigurer.java @@ -189,7 +189,7 @@ public class ConcurrentKafkaListenerContainerFactoryConfigurer { map.from(properties::getMonitorInterval).as(Duration::getSeconds).as(Number::intValue) .to(container::setMonitorInterval); map.from(properties::getLogContainerConfig).to(container::setLogContainerConfig); - map.from(properties::getOnlyLogRecordMetadata).to(container::setOnlyLogRecordMetadata); + map.from(properties::isOnlyLogRecordMetadata).to(container::setOnlyLogRecordMetadata); map.from(properties::isMissingTopicsFatal).to(container::setMissingTopicsFatal); map.from(this.transactionManager).to(container::setTransactionManager); map.from(this.rebalanceListener).to(container::setConsumerRebalanceListener); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java index 83fb5aa5a1..e0cd916be8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java @@ -917,7 +917,7 @@ public class KafkaProperties { * Whether to suppress the entire record from being written to the log when * retries are being attempted. */ - private Boolean onlyLogRecordMetadata; + private boolean onlyLogRecordMetadata; /** * Whether the container should fail to start if at least one of the configured @@ -1021,11 +1021,11 @@ public class KafkaProperties { this.logContainerConfig = logContainerConfig; } - public Boolean getOnlyLogRecordMetadata() { + public boolean isOnlyLogRecordMetadata() { return this.onlyLogRecordMetadata; } - public void setOnlyLogRecordMetadata(Boolean onlyLogRecordMetadata) { + public void setOnlyLogRecordMetadata(boolean onlyLogRecordMetadata) { this.onlyLogRecordMetadata = onlyLogRecordMetadata; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java index 87361f7859..31ce0f4003 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaPropertiesTests.java @@ -47,6 +47,7 @@ class KafkaPropertiesTests { void listenerDefaultValuesAreConsistent() { ContainerProperties container = new ContainerProperties("test"); Listener listenerProperties = new KafkaProperties().getListener(); + assertThat(listenerProperties.isOnlyLogRecordMetadata()).isEqualTo(container.isOnlyLogRecordMetadata()); assertThat(listenerProperties.isMissingTopicsFatal()).isEqualTo(container.isMissingTopicsFatal()); }